TonBERRY/micropython
3
0
Fork 0
Code Pull Requests Activity

py: Change qstr_* functions to use size_t as the type for str len arg.

Browse Source
This commit is contained in:
Damien George
2015-11-27 12:23:18 +00:00
parent 4e7107a572
commit c3f64d9799
9 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
py/objstr.h
View File

@@ -45,17 +45,17 @@ typedef struct _mp_obj_str_t {
// use this macro to extract the string length
#define GET_STR_LEN(str_obj_in, str_len) \
mp_uint_t str_len; if (MP_OBJ_IS_QSTR(str_obj_in)) \
size_t str_len; if (MP_OBJ_IS_QSTR(str_obj_in)) \
{ str_len = qstr_len(MP_OBJ_QSTR_VALUE(str_obj_in)); } else { str_len = ((mp_obj_str_t*)str_obj_in)->len; }
// use this macro to extract the string data and length
#if MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_C
const byte *mp_obj_str_get_data_no_check(mp_obj_t self_in, mp_uint_t *len);
const byte *mp_obj_str_get_data_no_check(mp_obj_t self_in, size_t *len);
#define GET_STR_DATA_LEN(str_obj_in, str_data, str_len) \
mp_uint_t str_len; const byte *str_data = mp_obj_str_get_data_no_check(str_obj_in, &str_len);
size_t str_len; const byte *str_data = mp_obj_str_get_data_no_check(str_obj_in, &str_len);
#else
#define GET_STR_DATA_LEN(str_obj_in, str_data, str_len) \
const byte *str_data; mp_uint_t str_len; if (MP_OBJ_IS_QSTR(str_obj_in)) \
const byte *str_data; size_t str_len; if (MP_OBJ_IS_QSTR(str_obj_in)) \
{ str_data = qstr_data(MP_OBJ_QSTR_VALUE(str_obj_in), &str_len); } \
else { str_len = ((mp_obj_str_t*)str_obj_in)->len; str_data = ((mp_obj_str_t*)str_obj_in)->data; }
#endif