diff options
Diffstat (limited to 'source3/include/safe_string.h')
-rw-r--r-- | source3/include/safe_string.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/source3/include/safe_string.h b/source3/include/safe_string.h index 439a0cf760..c030acf8fd 100644 --- a/source3/include/safe_string.h +++ b/source3/include/safe_string.h @@ -86,16 +86,8 @@ size_t __unsafe_string_function_usage_here_char__(void); #define CHECK_STRING_SIZE(d, len) (sizeof(d) != (len) && sizeof(d) != sizeof(char *)) -#define push_pstring_base(dest, src, pstring_base) \ - (CHECK_STRING_SIZE(pstring_base, sizeof(pstring)) \ - ? __unsafe_string_function_usage_here_size_t__() \ - : push_ascii(dest, src, sizeof(pstring)-PTR_DIFF(dest,pstring_base)-1, STR_TERMINATE)) - #else /* HAVE_COMPILER_WILL_OPTIMIZE_OUT_FNS */ -#define push_pstring_base(dest, src, pstring_base) \ - push_ascii(dest, src, sizeof(pstring)-PTR_DIFF(dest,pstring_base)-1, STR_TERMINATE) - #endif /* HAVE_COMPILER_WILL_OPTIMIZE_OUT_FNS */ #define safe_strcpy_base(dest, src, base, size) \ @@ -105,8 +97,6 @@ size_t __unsafe_string_function_usage_here_char__(void); but the best we can do in C) and may tag with function name/number to record the last 'clobber region' on that string */ -#define pstrcpy(d,s) safe_strcpy((d), (s),sizeof(pstring)-1) -#define pstrcat(d,s) safe_strcat((d), (s),sizeof(pstring)-1) #define fstrcpy(d,s) safe_strcpy((d),(s),sizeof(fstring)-1) #define fstrcat(d,s) safe_strcat((d),(s),sizeof(fstring)-1) #define nstrcpy(d,s) safe_strcpy((d), (s),sizeof(nstring)-1) |