diff options
| author | Martin Pool <mbp@samba.org> | 2002-01-16 02:42:07 +0000 |
|---|---|---|
| committer | Martin Pool <mbp@samba.org> | 2002-01-16 02:42:07 +0000 |
| commit | fed604bfa368a2bb1fed414e368d491e4c7d7005 (patch) | |
| tree | 06157b6c9fda86e3ec5ecd1448ab6534eb7ec19c /source3/include/safe_string.h | |
| parent | 978f1ba98d91851a04facef76b9ea9adaf4add3e (diff) | |
| download | samba-fed604bfa368a2bb1fed414e368d491e4c7d7005.tar.gz samba-fed604bfa368a2bb1fed414e368d491e4c7d7005.tar.bz2 samba-fed604bfa368a2bb1fed414e368d491e4c7d7005.zip | |
Roll back PSTRING_SANCTIFY patch; just leave non-controversial type
and constness changes.
(This used to be commit cee0ec72746122c962e6c5278a736266a7f2c424)
Diffstat (limited to 'source3/include/safe_string.h')
| -rw-r--r-- | source3/include/safe_string.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/source3/include/safe_string.h b/source3/include/safe_string.h index c4f44c0a34..a086d7495c 100644 --- a/source3/include/safe_string.h +++ b/source3/include/safe_string.h @@ -1,6 +1,5 @@ /* Unix SMB/Netbios implementation. - Version 1.9. Safe string handling routines. Copyright (C) Andrew Tridgell 1994-1998 @@ -37,10 +36,10 @@ #endif /* sprintf */ #define sprintf __ERROR__XX__NEVER_USE_SPRINTF__; -#define pstrcpy(d,s) safe_strcpy(PSTR_MUTABLE(d), (s),sizeof(pstring)-1) -#define pstrcat(d,s) safe_strcat(PSTR_MUTABLE(d), (s),sizeof(pstring)-1) -#define fstrcpy(d,s) safe_strcpy(FSTR_MUTABLE(d),(s),sizeof(fstring)-1) -#define fstrcat(d,s) safe_strcat(FSTR_MUTABLE(d),(s),sizeof(fstring)-1) +#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 wpstrcpy(d,s) safe_strcpy_w((d),(s),sizeof(wpstring)) #define wpstrcat(d,s) safe_strcat_w((d),(s),sizeof(wpstring)) |