The definition of pstrcpy_base(), and the preceeding comments, were given

twice (probably a cut/paste error).
The definition of pstrcpy_base(), and the preceeding comments, were given
twice (probably a cut/paste error).
(This used to be commit 5306f6f7c88234d51c4ff13d5451d3489de6b00e)

1 files changed, 3 insertions, 9 deletions

diff --git a/source3/include/safe_string.h b/source3/include/safe_string.h
index f26a5785cb..a6b352b02e 100644
--- a/source3/include/safe_string.h
+++ b/source3/include/safe_string.h
@@ -122,21 +122,15 @@ size_t __unsafe_string_function_usage_here_char__(void);
 #define safe_strcpy_base(dest, src, base, size) \
     safe_strcpy(dest, src, size-PTR_DIFF(dest,base)-1)
 
-/* String copy functions - macro hell below adds 'type checking' (limited, but the best we can
-   do in C) and may tag with function name/number to record the last 'clobber region' on
-   that string */
+/* String copy functions - macro hell below adds 'type checking'
+   (limited, 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)
 
-/* the addition of the DEVELOPER checks in safe_strcpy means we must
- * update a lot of code. To make this a little easier here are some
- * functions that provide the lengths with less pain */
-#define pstrcpy_base(dest, src, pstring_base) \
-    safe_strcpy(dest, src, sizeof(pstring)-PTR_DIFF(dest,pstring_base)-1)
-
 
 /* Inside the _fn variants of these is a call to clobber_region(), -
  * which might destroy the stack on a buggy function.  We help the