From: Kurt Zeilenga <kurt@openldap.org>
Date: Sat, 24 Aug 2002 00:55:56 +0000 (+0000)
Subject: Zap
X-Git-Tag: NO_SLAP_OP_BLOCKS~1190
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e259c3c938a9c3654bdeb3edd167c2404db7ee97;p=openldap

Zap
---

diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in
index 4171610221..0cea35b4dc 100644
--- a/servers/slapd/Makefile.in
+++ b/servers/slapd/Makefile.in
@@ -9,7 +9,7 @@ XSRCS=version.c
 NT_SRCS = nt_svc.c
 NT_OBJS = nt_svc.o ../../libraries/liblutil/slapdmsg.res
 
-SRCS	= main.c daemon.c connection.c search.c filter.c add.c charray.c \
+SRCS	= main.c daemon.c connection.c search.c filter.c add.c \
 		attr.c entry.c config.c backend.c result.c operation.c \
 		dn.c compare.c modify.c delete.c modrdn.c ch_malloc.c \
 		value.c ava.c bind.c unbind.c abandon.c filterentry.c \
@@ -22,7 +22,7 @@ SRCS	= main.c daemon.c connection.c search.c filter.c add.c charray.c \
 		limits.c backglue.c operational.c matchedValues.c \
 		$(@PLAT@_SRCS)
 
-OBJS	= main.o daemon.o connection.o search.o filter.o add.o charray.o \
+OBJS	= main.o daemon.o connection.o search.o filter.o add.o \
 		attr.o entry.o config.o backend.o result.o operation.o \
 		dn.o compare.o modify.o delete.o modrdn.o ch_malloc.o \
 		value.o ava.o bind.o unbind.o abandon.o filterentry.o \
diff --git a/servers/slapd/charray.c b/servers/slapd/charray.c
deleted file mode 100644
index 46bff0714a..0000000000
--- a/servers/slapd/charray.c
+++ /dev/null
@@ -1,213 +0,0 @@
-/* charray.c - routines for dealing with char * arrays */
-/* $OpenLDAP$ */
-/*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
- */
-
-#include "portable.h"
-
-#include <stdio.h>
-
-#include <ac/string.h>
-#include <ac/socket.h>
-
-#include "slap.h"
-
-void
-charray_add(
-    char	***a,
-    const char	*s
-)
-{
-	int	n;
-
-	if ( *a == NULL ) {
-		*a = (char **) ch_malloc( 2 * sizeof(char *) );
-		n = 0;
-	} else {
-		for ( n = 0; *a != NULL && (*a)[n] != NULL; n++ ) {
-			;	/* NULL */
-		}
-
-		*a = (char **) ch_realloc( (char *) *a,
-		    (n + 2) * sizeof(char *) );
-	}
-
-	(*a)[n++] = ch_strdup(s);
-	(*a)[n] = NULL;
-}
-
-void
-charray_add_n(
-    char	***a,
-    const char	*s,
-    int         l
-)
-{
-	int	n;
-
-	if ( *a == NULL ) {
-		*a = (char **) ch_malloc( 2 * sizeof(char *) );
-		n = 0;
-	} else {
-		for ( n = 0; *a != NULL && (*a)[n] != NULL; n++ ) {
-			;	/* NULL */
-		}
-
-		*a = (char **) ch_realloc( (char *) *a,
-		    (n + 2) * sizeof(char *) );
-	}
-
-	(*a)[n] = (char *) ch_malloc( ( l + 1 ) * sizeof( char ) );
-	strncpy( (*a)[n], s, l );
-	(*a)[n][l] = '\0';
-	(*a)[++n] = NULL;
-}
-
-void
-charray_merge(
-    char	***a,
-    char	**s
-)
-{
-	int	i, n, nn;
-
-	for ( n = 0; *a != NULL && (*a)[n] != NULL; n++ ) {
-		;	/* NULL */
-	}
-	for ( nn = 0; s[nn] != NULL; nn++ ) {
-		;	/* NULL */
-	}
-
-	*a = (char **) ch_realloc( (char *) *a, (n + nn + 1) * sizeof(char *) );
-
-	for ( i = 0; i < nn; i++ ) {
-		(*a)[n + i] = ch_strdup(s[i]);
-	}
-	(*a)[n + nn] = NULL;
-}
-
-void
-charray_free( char **array )
-{
-	char	**a;
-
-	if ( array == NULL ) {
-		return;
-	}
-
-	for ( a = array; *a != NULL; a++ ) {
-		if ( *a != NULL ) {
-			free( *a );
-		}
-	}
-	free( (char *) array );
-}
-
-int
-charray_inlist(
-    char	**a,
-    const char	*s
-)
-{
-	int	i;
-
-	if( a == NULL ) return 0;
-
-	for ( i = 0; a[i] != NULL; i++ ) {
-		if ( strcasecmp( s, a[i] ) == 0 ) {
-			return( 1 );
-		}
-	}
-
-	return( 0 );
-}
-
-char **
-charray_dup( char **a )
-{
-	int	i;
-	char	**new;
-
-	for ( i = 0; a[i] != NULL; i++ )
-		;	/* NULL */
-
-	new = (char **) ch_malloc( (i + 1) * sizeof(char *) );
-
-	for ( i = 0; a[i] != NULL; i++ ) {
-		new[i] = ch_strdup( a[i] );
-	}
-	new[i] = NULL;
-
-	return( new );
-}
-
-
-char **
-str2charray( const char *str_in, const char *brkstr )
-{
-	char	*str;
-	char	**res;
-	char	*s;
-	char	*lasts;
-	int	i;
-
-	/* protect the input string from strtok */
-	str = ch_strdup( str_in );
-
-	i = 1;
-	for ( s = str; *s; s++ ) {
-		if ( strchr( brkstr, *s ) != NULL ) {
-			i++;
-		}
-	}
-
-	res = (char **) ch_malloc( (i + 1) * sizeof(char *) );
-	i = 0;
-
-	for ( s = ldap_pvt_strtok( str, brkstr, &lasts );
-		s != NULL;
-		s = ldap_pvt_strtok( NULL, brkstr, &lasts ) )
-	{
-		res[i++] = ch_strdup( s );
-	}
-
-	res[i] = NULL;
-
-	free( str );
-	return( res );
-}
-
-int
-charray_strcmp( const char **a1, const char **a2 )
-{
-	for ( ; a1[0] && a2[0]; a1++, a2++ ) {
-		if ( strcmp( a1[0], a2[0] ) ) {
-			return( !0 );
-		}
-	}
-
-	if ( a1[0] || a2[0] ) {
-		return( !0 );
-	}
-
-	return 0;
-}
-
-
-int
-charray_strcasecmp( const char **a1, const char **a2 )
-{
-	for ( ; a1[0] && a2[0]; a1++, a2++ ) {
-		if ( strcasecmp( a1[0], a2[0] ) ) {
-			return( !0 );
-		}
-	}
-
-	if ( a1[0] || a2[0] ) {
-		return( !0 );
-	}
-
-	return 0;
-}