summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher R. Hertel <crh@samba.org>2003-03-27 05:17:28 +0000
committerChristopher R. Hertel <crh@samba.org>2003-03-27 05:17:28 +0000
commit6387c98faf2e48c74059ea09f15aea1e942027e3 (patch)
tree1a54bbbaedac084242e2b4adacaa97647f2083f2
parentfa4b83ce922314892c90caaf5c7216be5e73ccd7 (diff)
downloadsamba-6387c98faf2e48c74059ea09f15aea1e942027e3.tar.gz
samba-6387c98faf2e48c74059ea09f15aea1e942027e3.tar.bz2
samba-6387c98faf2e48c74059ea09f15aea1e942027e3.zip
The definition of pstrcpy_base(), and the preceeding comments, were given
twice (probably a cut/paste error). (This used to be commit d9b799d8c35a7453e6ccb92b3fc4ec2ec510449a)
-rw-r--r--source3/include/safe_string.h12
1 files changed, 3 insertions, 9 deletions
diff --git a/source3/include/safe_string.h b/source3/include/safe_string.h
index f26a5785cb..df3633d91d 100644
--- a/source3/include/safe_string.h
+++ b/source3/include/safe_string.h
@@ -113,18 +113,12 @@ size_t __unsafe_string_function_usage_here_char__(void);
#endif /* HAVE_COMPILER_WILL_OPTIMIZE_OUT_FNS */
-/* 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)
-
#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)