diff options
author | Damien George <damien.p.george@gmail.com> | 2018-02-14 18:19:22 +1100 |
---|---|---|
committer | Damien George <damien.p.george@gmail.com> | 2018-02-14 18:19:22 +1100 |
commit | 19aee9438a7a8cf8539536dab5147aedb6b16bb3 (patch) | |
tree | c2300b20c7915eb222b3c20fcb61720aa5a78ef3 /py/modbuiltins.c | |
parent | 49e0dd54e650295fcb46b2a47ae08f369e5cfdac (diff) |
py/unicode: Clean up utf8 funcs and provide non-utf8 inline versions.
This patch provides inline versions of the utf8 helper functions for the
case when unicode is disabled (MICROPY_PY_BUILTINS_STR_UNICODE set to 0).
This saves code size.
The unichar_charlen function is also renamed to utf8_charlen to match the
other utf8 helper functions, and the signature of this function is adjusted
for consistency (const char* -> const byte*, mp_uint_t -> size_t).
Diffstat (limited to 'py/modbuiltins.c')
-rw-r--r-- | py/modbuiltins.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/py/modbuiltins.c b/py/modbuiltins.c index e6f82df6f..6b8886804 100644 --- a/py/modbuiltins.c +++ b/py/modbuiltins.c @@ -346,7 +346,7 @@ STATIC mp_obj_t mp_builtin_ord(mp_obj_t o_in) { const char *str = mp_obj_str_get_data(o_in, &len); #if MICROPY_PY_BUILTINS_STR_UNICODE if (MP_OBJ_IS_STR(o_in)) { - len = unichar_charlen(str, len); + len = utf8_charlen((const byte*)str, len); if (len == 1) { return mp_obj_new_int(utf8_get_char((const byte*)str)); } |