s3-rpc_parse: remove unused UNISTR2 struct and init function.

Guenther

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 5de6ebf33ee620b6bec9791bd2b6855c69161b44..d82c202656a42de53cbeac6f9bfe820d570c1a89 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5653,7 +5653,6 @@ bool smb_io_system_time(const char *desc, prs_struct *ps, int depth, SYSTEMTIME
 bool make_systemtime(SYSTEMTIME *systime, struct tm *unixtime);
 bool smb_io_uuid(const char *desc, struct GUID *uuid, 
                 prs_struct *ps, int depth);
-void init_unistr2(UNISTR2 *str, const char *buf, enum unistr2_term_codes flags);
 
 /* The following definitions come from rpc_parse/parse_prs.c  */
 

diff --git a/source3/include/rpc_misc.h b/source3/include/rpc_misc.h
index 797e1926db34d9433cf6dead0ed2bee21203d292..b4c3a6190e68f0935f45458dc7f5e4701866106d 100644 (file)
--- a/source3/include/rpc_misc.h
+++ b/source3/include/rpc_misc.h
@@ -107,16 +107,6 @@ typedef struct {           /* UNISTR - unicode string size and buffer */
                                   little-endian. ***MUST*** be null-terminated */
 } UNISTR;
 
-typedef struct {               /* UNISTR2 - unicode string size (in 
-                                  uint16 unicode chars) and buffer */
-       uint32 uni_max_len;
-       uint32 offset;
-       uint32 uni_str_len;
-       uint16 *buffer;         /* unicode characters. ***MUST*** be little-endian. 
-                                 **must** be null-terminated and the uni_str_len 
-                                 should include the NULL character */
-} UNISTR2;
-
 /*
  * I'm really wondering how many different time formats
  * I will have to cope with

diff --git a/source3/rpc_parse/parse_misc.c b/source3/rpc_parse/parse_misc.c
index 1ea4ecf46f8eb5b53dc0376e9855cea8a70a9760..34611a48fd40973d3f7756dfb6b5a5cfd1841b8d 100644 (file)
--- a/source3/rpc_parse/parse_misc.c
+++ b/source3/rpc_parse/parse_misc.c
@@ -127,59 +127,3 @@ bool smb_io_uuid(const char *desc, struct GUID *uuid,
 
        return True;
 }
-
-/*******************************************************************
- Inits a UNISTR2 structure.
-********************************************************************/
-
-void init_unistr2(UNISTR2 *str, const char *buf, enum unistr2_term_codes flags)
-{
-       size_t len = 0;
-       uint32 num_chars = 0;
-
-       if (buf) {
-               /* We always null terminate the copy. */
-               len = strlen(buf) + 1;
-               if ( flags == UNI_STR_DBLTERMINATE )
-                       len++;
-       }
-
-       if (buf == NULL || len == 0) {
-               /* no buffer -- nothing to do */
-               str->uni_max_len = 0;
-               str->offset = 0;
-               str->uni_str_len = 0;
-
-               return;
-       }
-       
-
-       str->buffer = TALLOC_ZERO_ARRAY(talloc_tos(), uint16, len);
-       if (str->buffer == NULL) {
-               smb_panic("init_unistr2: malloc fail");
-               return;
-       }
-
-       /* Ensure len is the length in *bytes* */
-       len *= sizeof(uint16);
-
-       /*
-        * The UNISTR2 must be initialized !!!
-        * jfm, 7/7/2001.
-        */
-       if (buf) {
-               rpcstr_push((char *)str->buffer, buf, len, STR_TERMINATE);
-               num_chars = strlen_w(str->buffer);
-               if (flags == UNI_STR_TERMINATE || flags == UNI_MAXLEN_TERMINATE) {
-                       num_chars++;
-               }
-               if ( flags == UNI_STR_DBLTERMINATE )
-                       num_chars += 2;
-       }
-
-       str->uni_max_len = num_chars;
-       str->offset = 0;
-       str->uni_str_len = num_chars;
-       if ( num_chars && ((flags == UNI_MAXLEN_TERMINATE) || (flags == UNI_BROKEN_NON_NULL)) )
-               str->uni_max_len++;
-}