summaryrefslogtreecommitdiff
path: root/source3/lib
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-03-22 20:57:36 +1100
committerAndrew Bartlett <abartlet@samba.org>2011-03-23 12:49:39 +1100
commit1d22c3919d08b4d18a1d021a407a98cb1402d7d7 (patch)
tree6d3a53bb42ca0d1886ff135d41f6a67ae6173c9e /source3/lib
parent1923b78209aaa2aa926dedd19e6c97fb449c48c8 (diff)
downloadsamba-1d22c3919d08b4d18a1d021a407a98cb1402d7d7.tar.gz
samba-1d22c3919d08b4d18a1d021a407a98cb1402d7d7.tar.bz2
samba-1d22c3919d08b4d18a1d021a407a98cb1402d7d7.zip
s3-safe_str: Futher simplify the macros by removing indirection
Now that we don't need to pass in the function name and string, another level of indirection can be safely removed, and the operation of these macros made much clearer. Andrew Bartlett
Diffstat (limited to 'source3/lib')
-rw-r--r--source3/lib/util_str.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/lib/util_str.c b/source3/lib/util_str.c
index a1dfc70707..f14d7dea92 100644
--- a/source3/lib/util_str.c
+++ b/source3/lib/util_str.c
@@ -573,10 +573,10 @@ char *safe_strcat_fn(char *dest,
characters. Don't change it !
**/
-char *alpha_strcpy_fn(char *dest,
- const char *src,
- const char *other_safe_chars,
- size_t maxlength)
+char *alpha_strcpy(char *dest,
+ const char *src,
+ const char *other_safe_chars,
+ size_t maxlength)
{
size_t len, i;
@@ -614,7 +614,7 @@ char *alpha_strcpy_fn(char *dest,
Like strncpy but always null terminates. Make sure there is room!
The variable n should always be one less than the available size.
**/
-char *StrnCpy_fn(char *dest,const char *src,size_t n)
+char *StrnCpy(char *dest,const char *src,size_t n)
{
char *d = dest;