From 88a9103b3c31a3ecbd70669a53d82dc5a947dfe8 Mon Sep 17 00:00:00 2001 From: Damien George Date: Fri, 27 Nov 2015 12:05:11 +0000 Subject: [PATCH] py/binary: Make use of MP_ALIGN. --- py/binary.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/py/binary.c b/py/binary.c index 71ef3f04d..c9ce0585d 100644 --- a/py/binary.c +++ b/py/binary.c @@ -185,7 +185,7 @@ mp_obj_t mp_binary_get_val(char struct_type, char val_type, byte **ptr) { size_t size = mp_binary_get_size(struct_type, val_type, &align); if (struct_type == '@') { // Make pointer aligned - p = (byte*)(((mp_uint_t)p + align - 1) & ~((mp_uint_t)align - 1)); + p = (byte*)MP_ALIGN(p, (size_t)align); #if MP_ENDIANNESS_LITTLE struct_type = '<'; #else @@ -250,7 +250,7 @@ void mp_binary_set_val(char struct_type, char val_type, mp_obj_t val_in, byte ** size_t size = mp_binary_get_size(struct_type, val_type, &align); if (struct_type == '@') { // Make pointer aligned - p = (byte*)(((mp_uint_t)p + align - 1) & ~((mp_uint_t)align - 1)); + p = (byte*)MP_ALIGN(p, (size_t)align); if (MP_ENDIANNESS_LITTLE) { struct_type = '<'; } else {