UNICODE cleanup (see lib/util_unistr.c).

[nivanova/samba-autobuild/.git] / source3 / rpc_parse / parse_misc.c

diff --git a/source3/rpc_parse/parse_misc.c b/source3/rpc_parse/parse_misc.c
index 7c3f4469087a2fcce5ff5b044fc244cc07d8522e..04a9ba4544d4ccc77c7ee309bafd3e4e794a7b67 100644 (file)
--- a/source3/rpc_parse/parse_misc.c
+++ b/source3/rpc_parse/parse_misc.c
@@ -328,8 +328,7 @@ creates a UNISTR structure.
 ********************************************************************/
 void make_unistr(UNISTR *str, char *buf)
 {
-       /* store the string (null-terminated copy) */
-       str_to_unistr16(str->buffer, buf);
+       ascii_to_unistr(str->buffer, buf, sizeof(str->buffer));
 }
 
 /*******************************************************************
@@ -371,8 +370,8 @@ void make_buffer3_str(BUFFER3 *str, char *buf, int len)
        str->buf_max_len = len * 2;
        str->buf_len     = len * 2;
 
-       /* store the string (null-terminated 8 bit chars into 16 bit chars) */
-       str_to_unistr8(str->buffer, buf);
+       /* store the string (little endian buffer) */
+       ascii_to_unibuf(str->buffer, buf, str->buf_len);
 }
 
 /*******************************************************************
@@ -572,8 +571,8 @@ void make_unistr2(UNISTR2 *str, const char *buf, int len)
        str->undoc       = 0;
        str->uni_str_len = len;
 
-       /* store the string (null-terminated 8 bit chars into 16 bit chars) */
-       str_to_unistr16((str->buffer), buf);
+       /* store the string (wide chars) */
+       ascii_to_unistr(str->buffer, buf, len);
 }
 
 /*******************************************************************