summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2007-08-11 09:53:42 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:29:28 -0500
commit02c21aa207be1316f4fcbb5d42b851bcf9abeb50 (patch)
tree0cbf425a98b76ba6d3ef6ad147ac9c59dcb955be /source3
parent23998e1da83c77c16ff4d33529b8dab38005b001 (diff)
downloadsamba-02c21aa207be1316f4fcbb5d42b851bcf9abeb50.tar.gz
samba-02c21aa207be1316f4fcbb5d42b851bcf9abeb50.tar.bz2
samba-02c21aa207be1316f4fcbb5d42b851bcf9abeb50.zip
r24321: Attempt to fix the "hape" cc build
(This used to be commit 4e819aea0b783110d3b7a27105c588403e79eac9)
Diffstat (limited to 'source3')
-rw-r--r--source3/include/safe_string.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/include/safe_string.h b/source3/include/safe_string.h
index 69a5a5eb93..7a60ad695e 100644
--- a/source3/include/safe_string.h
+++ b/source3/include/safe_string.h
@@ -162,7 +162,7 @@ size_t __unsafe_string_function_usage_here_char__(void);
#define overmalloc_safe_strcpy(dest,src,maxlength) safe_strcpy_fn(SAFE_STRING_FUNCTION_NAME, SAFE_STRING_LINE,dest,src,maxlength)
#define safe_strcpy(dest,src,maxlength) safe_strcpy_fn2(SAFE_STRING_FUNCTION_NAME, SAFE_STRING_LINE,dest,src,maxlength)
#define safe_strcat(dest,src,maxlength) safe_strcat_fn2(SAFE_STRING_FUNCTION_NAME, SAFE_STRING_LINE,dest,src,maxlength)
-#define push_string(base_ptr, dest, src, dest_len, flags) push_string_fn2(SAFE_STRING_FUNCTION_NAME, SAFE_STRING_LINE, base_ptr, dest, src, dest_len, flags)
+#define push_string(base_ptr, dest, src, dest_len, flags) push_string_fn2(SAFE_STRING_FUNCTION_NAME, SAFE_STRING_LINE, base_ptr, 0, dest, src, dest_len, flags)
#define pull_string(base_ptr, smb_flags2, dest, src, dest_len, src_len, flags) pull_string_fn2(SAFE_STRING_FUNCTION_NAME, SAFE_STRING_LINE, base_ptr, smb_flags2, dest, src, dest_len, src_len, flags)
#define pull_string_talloc(ctx, base_ptr, smb_flags2, dest, src, src_len, flags) pull_string_talloc_fn2(SAFE_STRING_FUNCTION_NAME, SAFE_STRING_LINE, ctx, base_ptr, smb_flags2, dest, src, src_len, flags)
#define clistr_push(cli, dest, src, dest_len, flags) clistr_push_fn2(SAFE_STRING_FUNCTION_NAME, SAFE_STRING_LINE, cli, dest, src, dest_len, flags)
@@ -188,10 +188,10 @@ size_t __unsafe_string_function_usage_here_char__(void);
? __unsafe_string_function_usage_here__() \
: safe_strcat_fn(fn_name, fn_line, (d), (s), (max_len)))
-#define push_string_fn2(fn_name, fn_line, base_ptr, dest, src, dest_len, flags) \
+#define push_string_fn2(fn_name, fn_line, base_ptr, flags2, dest, src, dest_len, flags) \
(CHECK_STRING_SIZE(dest, dest_len) \
? __unsafe_string_function_usage_here_size_t__() \
- : push_string_fn(fn_name, fn_line, base_ptr, 0, dest, src, dest_len, flags))
+ : push_string_fn(fn_name, fn_line, base_ptr, flags2, dest, src, dest_len, flags))
#define pull_string_fn2(fn_name, fn_line, base_ptr, smb_flags2, dest, src, dest_len, src_len, flags) \
(CHECK_STRING_SIZE(dest, dest_len) \