TonBERRY/micropython
3
0
Fork 0
Code Pull Requests Activity

py/binary: Make return type of mp_binary_get_size size_t instead of int.

Browse Source 
Fixes sign-compare warning.
This commit is contained in:
Kaspar Schleiser
2015-05-10 13:04:38 +02:00
committed by Damien George
parent b5cef5c7ea
commit f5dd6f7f37
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
py/binary.c
View File

@@ -40,8 +40,8 @@
#define alignof(type) offsetof(struct { char c; type t; }, t)
#endif
int mp_binary_get_size(char struct_type, char val_type, mp_uint_t *palign) {
int size = 0;
size_t mp_binary_get_size(char struct_type, char val_type, mp_uint_t *palign) {
size_t size = 0;
int align = 1;
switch (struct_type) {
case '<': case '>':
@@ -179,7 +179,7 @@ mp_obj_t mp_binary_get_val(char struct_type, char val_type, byte **ptr) {
byte *p = *ptr;
mp_uint_t align;
int size = mp_binary_get_size(struct_type, val_type, &align);
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));
@@ -244,7 +244,7 @@ void mp_binary_set_val(char struct_type, char val_type, mp_obj_t val_in, byte **
byte *p = *ptr;
mp_uint_t align;
int size = mp_binary_get_size(struct_type, val_type, &align);
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));