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/objstr.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/objstr.c')
| -rw-r--r-- | py/objstr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/py/objstr.c b/py/objstr.c index 30153813d..ed9ab4e45 100644 --- a/py/objstr.c +++ b/py/objstr.c @@ -1704,7 +1704,7 @@ STATIC mp_obj_t str_count(size_t n_args, const mp_obj_t *args) { // if needle_len is zero then we count each gap between characters as an occurrence if (needle_len == 0) { - return MP_OBJ_NEW_SMALL_INT(unichar_charlen((const char*)start, end - start) + 1); + return MP_OBJ_NEW_SMALL_INT(utf8_charlen(start, end - start) + 1); } // count the occurrences |