s3-safe_str: Futher simplify the macros by removing indirection

Now that we don't need to pass in the function name and string,
another level of indirection can be safely removed, and the operation
of these macros made much clearer.

Andrew Bartlett

1 files changed, 13 insertions, 13 deletions

diff --git a/source3/libsmb/clistr.c b/source3/libsmb/clistr.c
index 8856e03dd0..373cce590d 100644
--- a/source3/libsmb/clistr.c
+++ b/source3/libsmb/clistr.c
@@ -58,21 +58,21 @@ size_t clistr_pull_fn(const char *inbuf,
 			      src_len, flags);
 }
 
-size_t clistr_pull_talloc_fn(TALLOC_CTX *ctx,
-				const char *base,
-				uint16_t flags2,
-				char **pp_dest,
-				const void *src,
-				int src_len,
-				int flags)
+size_t clistr_pull_talloc(TALLOC_CTX *ctx,
+			  const char *base,
+			  uint16_t flags2,
+			  char **pp_dest,
+			  const void *src,
+			  int src_len,
+			  int flags)
 {
 	return pull_string_talloc_fn(ctx,
-					base,
-					flags2,
-					pp_dest,
-					src,
-					src_len,
-					flags);
+				     base,
+				     flags2,
+				     pp_dest,
+				     src,
+				     src_len,
+				     flags);
 }
 
 size_t clistr_align_out(struct cli_state *cli, const void *p, int flags)