main: rework preprocessor invocation

[cparser] / string_rep.c

diff --git a/string_rep.c b/string_rep.c
index 19c59da..28b0746 100644 (file)
--- 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");
 }