diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-01-26 18:14:41 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-01-26 18:14:41 +0100 |
| commit | cce04c606e7a91fcaf75c8efd7ca0cd4aa15ece9 (patch) | |
| tree | 62f598c7a01e072cc52d166364bc3d2a94e85242 /source3/include/safe_string.h | |
| parent | d30b6af9532c0ea4e9610b30d13e7a4d9b763834 (diff) | |
| parent | d8f15e4efc00b9d509ff5761e9ca8ff5c6f443f7 (diff) | |
| download | samba-cce04c606e7a91fcaf75c8efd7ca0cd4aa15ece9.tar.gz samba-cce04c606e7a91fcaf75c8efd7ca0cd4aa15ece9.tar.bz2 samba-cce04c606e7a91fcaf75c8efd7ca0cd4aa15ece9.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3/include/safe_string.h')
| -rw-r--r-- | source3/include/safe_string.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/include/safe_string.h b/source3/include/safe_string.h index c030acf8fd..a7230964c9 100644 --- a/source3/include/safe_string.h +++ b/source3/include/safe_string.h @@ -146,13 +146,13 @@ size_t __unsafe_string_function_usage_here_char__(void); clistr_push_fn2(SAFE_STRING_FUNCTION_NAME, SAFE_STRING_LINE, \ cli, dest, src, dest_len, flags) -#define clistr_pull(cli, dest, src, dest_len, src_len, flags) \ +#define clistr_pull(inbuf, dest, src, dest_len, src_len, flags) \ clistr_pull_fn2(SAFE_STRING_FUNCTION_NAME, SAFE_STRING_LINE, \ - cli, dest, src, dest_len, src_len, flags) + inbuf, dest, src, dest_len, src_len, flags) -#define clistr_pull_talloc(ctx, cli, pp_dest, src, src_len, flags) \ +#define clistr_pull_talloc(ctx, inbuf, pp_dest, src, src_len, flags) \ clistr_pull_talloc_fn(SAFE_STRING_FUNCTION_NAME, SAFE_STRING_LINE, \ - ctx, cli, pp_dest, src, src_len, flags) + ctx, inbuf, pp_dest, src, src_len, flags) #define srvstr_push(base_ptr, smb_flags2, dest, src, dest_len, flags) \ srvstr_push_fn2(SAFE_STRING_FUNCTION_NAME, SAFE_STRING_LINE, \ @@ -200,10 +200,10 @@ size_t __unsafe_string_function_usage_here_char__(void); ? __unsafe_string_function_usage_here_size_t__() \ : clistr_push_fn(fn_name, fn_line, cli, dest, src, dest_len, flags)) -#define clistr_pull_fn2(fn_name, fn_line, cli, dest, src, dest_len, srclen, flags) \ +#define clistr_pull_fn2(fn_name, fn_line, inbuf, dest, src, dest_len, srclen, flags) \ (CHECK_STRING_SIZE(dest, dest_len) \ ? __unsafe_string_function_usage_here_size_t__() \ - : clistr_pull_fn(fn_name, fn_line, cli, dest, src, dest_len, srclen, flags)) + : clistr_pull_fn(fn_name, fn_line, inbuf, dest, src, dest_len, srclen, flags)) #define srvstr_push_fn2(fn_name, fn_line, base_ptr, smb_flags2, dest, src, dest_len, flags) \ (CHECK_STRING_SIZE(dest, dest_len) \ |