diff options
| author | Damien George <damien.p.george@gmail.com> | 2015-11-27 12:23:18 +0000 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2015-11-29 14:25:04 +0000 |
| commit | c3f64d9799cdf8af88087eebe6628e83d658405c (patch) | |
| tree | 66be85a413d652243c384e43e84a417e40284ff6 /py/objstr.h | |
| parent | 4e7107a572b55321f3f483f0293dd19b4f752c9b (diff) | |
| download | micropython-c3f64d9799cdf8af88087eebe6628e83d658405c.tar.gz micropython-c3f64d9799cdf8af88087eebe6628e83d658405c.zip | |
py: Change qstr_* functions to use size_t as the type for str len arg.
Diffstat (limited to 'py/objstr.h')
| -rw-r--r-- | py/objstr.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/py/objstr.h b/py/objstr.h index ec89400714..2c2bdbaee3 100644 --- a/py/objstr.h +++ b/py/objstr.h @@ -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 |