diff options
| author | Stefan Metzmacher <metze@samba.org> | 2015-06-27 10:13:02 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2015-07-03 02:00:28 +0200 |
| commit | bf6f03209494cc43dff717bd78c84bc59b03e76c (patch) | |
| tree | 18d3d11b7281b573cc062589eeae640ff8162e4b /lib/util/charset | |
| parent | cd8bcecf18544b907c1927aa716057216f948dac (diff) | |
| download | samba-bf6f03209494cc43dff717bd78c84bc59b03e76c.tar.gz | |
lib/util: let strlen_m_term[_null]() use strlen_m_ext_term[_null]()
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Guenther Deschner <gd@samba.org>
Diffstat (limited to 'lib/util/charset')
| -rw-r--r-- | lib/util/charset/util_str.c | 17 |
1 files changed, 2 insertions, 15 deletions
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); } /** |