X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=string_rep.c;h=28b074648ea0c550cda47dc26e5f024ee8d211a1;hb=373937ba4ad87e9fa55dbf89644182050ed1b75a;hp=19c59da827e89f72370bd3da57f28ba011a24eb8;hpb=6d30fa5c7d03437d992a80234c88d8eb6431b35e;p=cparser diff --git a/string_rep.c b/string_rep.c index 19c59da..28b0746 100644 --- a/string_rep.c +++ b/string_rep.c @@ -13,11 +13,14 @@ static inline size_t wstrlen(const string_t *string) return result; } -size_t get_string_len(string_encoding_t const enc, string_t const *const str) +size_t get_string_len(string_t const *const str) { - switch (enc) { - case STRING_ENCODING_CHAR: return str->size; - case STRING_ENCODING_WIDE: return wstrlen(str); + switch (str->encoding) { + case STRING_ENCODING_CHAR: + case STRING_ENCODING_UTF8: return str->size; + case STRING_ENCODING_CHAR16: + case STRING_ENCODING_CHAR32: + case STRING_ENCODING_WIDE: return wstrlen(str); } panic("invalid string encoding"); }