From bf6f03209494cc43dff717bd78c84bc59b03e76c Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Sat, 27 Jun 2015 10:13:02 +0200 Subject: lib/util: let strlen_m_term[_null]() use strlen_m_ext_term[_null]() Signed-off-by: Stefan Metzmacher Reviewed-by: Guenther Deschner --- lib/util/charset/util_str.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) (limited to 'lib/util/charset') diff --git a/lib/util/charset/util_str.c b/lib/util/charset/util_str.c index 70ecf6e029a..33466ec5030 100644 --- a/lib/util/charset/util_str.c +++ b/lib/util/charset/util_str.c @@ -308,11 +308,7 @@ _PUBLIC_ size_t strlen_m(const char *s) **/ _PUBLIC_ size_t strlen_m_term(const char *s) { - if (!s) { - return 0; - } - - return strlen_m(s) + 1; + return strlen_m_ext_term(s, CH_UNIX, CH_UTF16LE); } /* @@ -322,16 +318,7 @@ _PUBLIC_ size_t strlen_m_term(const char *s) _PUBLIC_ size_t strlen_m_term_null(const char *s) { - size_t len; - if (!s) { - return 0; - } - len = strlen_m(s); - if (len == 0) { - return 0; - } - - return len+1; + return strlen_m_ext_term_null(s, CH_UNIX, CH_UTF16LE); } /** -- cgit v1.2.1