From 1d22c3919d08b4d18a1d021a407a98cb1402d7d7 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 22 Mar 2011 20:57:36 +1100 Subject: 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 --- source3/libsmb/clistr.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'source3/libsmb') 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) -- cgit