We shouldn't detach a thread that we want to join with...

[openldap] / servers / slapd / charray.c

diff --git a/servers/slapd/charray.c b/servers/slapd/charray.c
index e3b4d37feb673e60821ed43169280dc15dc3e347..26a669cd60e1e7ddcbb014372f60a49099e0ce01 100644 (file)
--- a/servers/slapd/charray.c
+++ b/servers/slapd/charray.c
@@ -1,9 +1,12 @@
 /* charray.c - routines for dealing with char * arrays */
 
+#include "portable.h"
+
 #include <stdio.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/socket.h>
+
+#include <ac/string.h>
+#include <ac/socket.h>
+
 #include "slap.h"
 
 void
@@ -99,7 +102,7 @@ charray_dup( char **a )
        new = (char **) ch_malloc( (i + 1) * sizeof(char *) );
 
        for ( i = 0; a[i] != NULL; i++ ) {
-               new[i] = strdup( a[i] );
+               new[i] = ch_strdup( a[i] );
        }
        new[i] = NULL;
 
@@ -107,14 +110,14 @@ charray_dup( char **a )
 }
 
 char **
-str2charray( char *str_in, char *brkstr )
+str2charray( char *str, char *brkstr )
 {
        char    **res;
        char    *s;
        int     i;
 
        /* protect the input string from strtok */
-       char *str = strdup( str_in );
+       str = ch_strdup( str );
 
        i = 1;
        for ( s = str; *s; s++ ) {
@@ -127,7 +130,7 @@ str2charray( char *str_in, char *brkstr )
        i = 0;
        for ( s = strtok( str, brkstr ); s != NULL; s = strtok( NULL,
            brkstr ) ) {
-               res[i++] = strdup( s );
+               res[i++] = ch_strdup( s );
        }
        res[i] = NULL;