sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-09-07 21:44:22 +03:00
Code Activity

lib/util: let strlen_m_term[_null]() use strlen_m_ext_term[_null]()

Browse Source 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Guenther Deschner <gd@samba.org>
This commit is contained in:
Stefan Metzmacher
2015-06-27 10:13:02 +02:00
committed by Günther Deschner
parent cd8bcecf18
commit bf6f032094
1 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/util/charset/util_str.c
View File

@@ -308,11 +308,7 @@ _PUBLIC_ size_t strlen_m(const char *s)
**/ **/
_PUBLIC_ size_t strlen_m_term(const char *s) _PUBLIC_ size_t strlen_m_term(const char *s)
{ {
if (!s) { return strlen_m_ext_term(s, CH_UNIX, CH_UTF16LE);
return 0;
}
return strlen_m(s) + 1;
} }
/* /*
@@ -322,16 +318,7 @@ _PUBLIC_ size_t strlen_m_term(const char *s)
_PUBLIC_ size_t strlen_m_term_null(const char *s) _PUBLIC_ size_t strlen_m_term_null(const char *s)
{ {
size_t len; return strlen_m_ext_term_null(s, CH_UNIX, CH_UTF16LE);
if (!s) {
return 0;
}
len = strlen_m(s);
if (len == 0) {
return 0;
}
return len+1;
} }
/** /**