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

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;