s3: remove unused rpcstr_pull and rpcstr_pull_talloc.

Guenther
(cherry picked from commit 1a0db7a957682782bd915526c69c0779e7b8335f)

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 89f76676430bb7f710b90f7c5778ec4e38e32a28..b7f03007072055bfa1df7de6e29039a86d2f35dd 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1576,12 +1576,6 @@ void load_case_tables(void);
 void init_valid_table(void);
 size_t dos_PutUniCode(char *dst,const char *src, size_t len, bool null_terminate);
 char *skip_unibuf(char *src, size_t len);
-int rpcstr_pull(char* dest, void *src, int dest_len, int src_len, int flags);
-int rpcstr_pull_talloc(TALLOC_CTX *ctx,
-                       char **dest,
-                       void *src,
-                       int src_len,
-                       int flags);
 int rpcstr_push(void *dest, const char *src, size_t dest_len, int flags);
 int rpcstr_push_talloc(TALLOC_CTX *ctx, smb_ucs2_t **dest, const char *src);
 smb_ucs2_t toupper_w(smb_ucs2_t val);

diff --git a/source3/lib/util_unistr.c b/source3/lib/util_unistr.c
index 7d80b3cdea26ed396a4f308dd285630d53dcc2c3..f53ef94d69eca4b5b8c016b6c9ed75bfbe08457c 100644 (file)
--- a/source3/lib/util_unistr.c
+++ b/source3/lib/util_unistr.c
@@ -256,41 +256,6 @@ char *skip_unibuf(char *src, size_t len)
        return src;
 }
 
-/* Copy a string from little-endian or big-endian unicode source (depending
- * on flags) to internal samba format destination
- */ 
-
-int rpcstr_pull(char* dest, void *src, int dest_len, int src_len, int flags)
-{
-       if (!src) {
-               dest[0] = 0;
-               return 0;
-       }
-       if(dest_len==-1) {
-               dest_len=MAXUNI-3;
-       }
-       return pull_ucs2(NULL, dest, src, dest_len, src_len, flags|STR_UNICODE|STR_NOALIGN);
-}
-
-/* Copy a string from little-endian or big-endian unicode source (depending
- * on flags) to internal samba format destination. Allocates on talloc ctx.
- */
-
-int rpcstr_pull_talloc(TALLOC_CTX *ctx,
-                       char **dest,
-                       void *src,
-                       int src_len,
-                       int flags)
-{
-       return pull_ucs2_base_talloc(ctx,
-                       NULL,
-                       dest,
-                       src,
-                       src_len,
-                       flags|STR_UNICODE|STR_NOALIGN);
-
-}
-
 /* Converts a string from internal samba format to unicode
  */