From 980064b76d774680febc5d201a1aacc4b9fa8b86 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 24 Mar 2011 11:42:40 +1100
Subject: lib: remove unused pieces of string_wrappers.h

---
 lib/util/string_wrappers.h |  6 ------
 source3/include/proto.h    |  2 +-
 source3/libsmb/clistr.c    | 14 +++++++-------
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/lib/util/string_wrappers.h b/lib/util/string_wrappers.h
index 31d0a92252..75718e942b 100644
--- a/lib/util/string_wrappers.h
+++ b/lib/util/string_wrappers.h
@@ -29,8 +29,6 @@ char * __unsafe_string_function_usage_here__(void);
 
 size_t __unsafe_string_function_usage_here_size_t__(void);
 
-size_t __unsafe_string_function_usage_here_char__(void);
-
 #ifdef HAVE_COMPILER_WILL_OPTIMIZE_OUT_FNS
 
 /* if the compiler will optimize out function calls, then use this to tell if we are
@@ -87,9 +85,6 @@ size_t __unsafe_string_function_usage_here_char__(void);
     ? __unsafe_string_function_usage_here_size_t__() \
     : push_string_check_fn(dest, src, dest_len, flags))
 
-#define pull_string_talloc(ctx, base_ptr, smb_flags2, dest, src, src_len, flags) \
-    pull_string_talloc_fn(ctx, base_ptr, smb_flags2, dest, src, src_len, flags)
-
 #define clistr_push(cli, dest, src, dest_len, flags) \
     (CHECK_STRING_SIZE(dest, dest_len) \
     ? __unsafe_string_function_usage_here_size_t__() \
@@ -121,7 +116,6 @@ size_t __unsafe_string_function_usage_here_char__(void);
 #define safe_strcpy safe_strcpy_fn
 #define safe_strcat safe_strcat_fn
 #define push_string_check push_string_check_fn
-#define pull_string_talloc pull_string_talloc_fn
 #define clistr_push clistr_push_fn
 #define clistr_pull clistr_pull_fn
 #define srvstr_push srvstr_push_fn
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 8e1bcc6417..3c454460f2 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -461,7 +461,7 @@ size_t pull_string_fn(const void *base_ptr,
 			size_t dest_len,
 			size_t src_len,
 			int flags);
-size_t pull_string_talloc_fn(TALLOC_CTX *ctx,
+size_t pull_string_talloc(TALLOC_CTX *ctx,
 			const void *base_ptr,
 			uint16 smb_flags2,
 			char **ppdest,
diff --git a/source3/libsmb/clistr.c b/source3/libsmb/clistr.c
index 373cce590d..944479c2a8 100644
--- a/source3/libsmb/clistr.c
+++ b/source3/libsmb/clistr.c
@@ -66,13 +66,13 @@ size_t clistr_pull_talloc(TALLOC_CTX *ctx,
 			  int src_len,
 			  int flags)
 {
-	return pull_string_talloc_fn(ctx,
-				     base,
-				     flags2,
-				     pp_dest,
-				     src,
-				     src_len,
-				     flags);
+	return pull_string_talloc(ctx,
+				  base,
+				  flags2,
+				  pp_dest,
+				  src,
+				  src_len,
+				  flags);
 }
 
 size_t clistr_align_out(struct cli_state *cli, const void *p, int flags)
-- 
cgit