Import ITS#2007 and ITS#2009 bug fixes from HEAD

[openldap] / servers / slapd / charray.c

diff --git a/servers/slapd/charray.c b/servers/slapd/charray.c
index 927d7e3ad9896eeb91691e5e9b4dccd2baf0d31e..46bff0714af508f3ff9819c9bafd00528180d9b8 100644 (file)
--- a/servers/slapd/charray.c
+++ b/servers/slapd/charray.c
@@ -211,38 +211,3 @@ charray_strcasecmp( const char **a1, const char **a2 )
 
        return 0;
 }
-
-/* strcopy is like strcpy except it returns a pointer to the trailing NUL of
- * the result string. This allows fast construction of catenated strings
- * without the overhead of strlen/strcat.
- */
-char *
-slap_strcopy(
-       char *a,
-       const char *b
-)
-{
-       if (!a || !b)
-               return a;
-       
-       while (*a++ = *b++) ;
-       return a-1;
-}
-
-/* strncopy is like strcpy except it returns a pointer to the trailing NUL of
- * the result string. This allows fast construction of catenated strings
- * without the overhead of strlen/strcat.
- */
-char *
-slap_strncopy(
-       char *a,
-       const char *b,
-       size_t n
-)
-{
-       if (!a || !b || n == 0)
-               return a;
-       
-       while ((*a++ = *b++) && n-- > 0) ;
-       return a-1;
-}