blind fix of value_match when SLAP_NVALUES is set

[openldap] / libraries / libldap / free.c

diff --git a/libraries/libldap/free.c b/libraries/libldap/free.c
index 428f11f8284e8479f1a51279a995a9ae9210d10e..bbb411950c9bec931c9588e66223b05ecc33cd2d 100644 (file)
--- a/libraries/libldap/free.c
+++ b/libraries/libldap/free.c
@@ -1,5 +1,6 @@
+/* $OpenLDAP$ */
 /*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /*  Portions
@@ -15,7 +16,6 @@
 #include <stdio.h>
 #include <ac/stdlib.h>
 
-#include <ac/ctype.h>
 #include <ac/string.h>
 #include <ac/time.h>
 
@@ -37,57 +37,27 @@ ldap_memvfree( void **v )
 }
 
 void *
-ldap_memalloc( size_t s )
+ldap_memalloc( ber_len_t s )
 {
        return LDAP_MALLOC( s );
 }
 
 void *
-ldap_memcalloc( size_t n, size_t s )
+ldap_memcalloc( ber_len_t n, ber_len_t s )
 {
        return LDAP_CALLOC( n, s );
 }
 
 void *
-ldap_memrealloc( void* p, size_t s )
+ldap_memrealloc( void* p, ber_len_t s )
 {
        return LDAP_REALLOC( p, s );
 }
 
-void
-ldap_getfilter_free( LDAPFiltDesc *lfdp )
+char *
+ldap_strdup( LDAP_CONST char *p )
 {
-    LDAPFiltList       *flp, *nextflp;
-    LDAPFiltInfo       *fip, *nextfip;
-
-    for ( flp = lfdp->lfd_filtlist; flp != NULL; flp = nextflp ) {
-       for ( fip = flp->lfl_ilist; fip != NULL; fip = nextfip ) {
-           nextfip = fip->lfi_next;
-           LDAP_FREE( fip->lfi_filter );
-           LDAP_FREE( fip->lfi_desc );
-           LDAP_FREE( fip );
-       }
-       nextflp = flp->lfl_next;
-       LDAP_FREE( flp->lfl_pattern );
-       LDAP_FREE( flp->lfl_delims );
-       LDAP_FREE( flp->lfl_tag );
-       LDAP_FREE( flp );
-    }
-
-    if ( lfdp->lfd_curvalcopy != NULL ) {
-       LDAP_FREE( lfdp->lfd_curvalcopy );
-    }
-    if ( lfdp->lfd_curvalwords != NULL ) {
-       LDAP_FREE( lfdp->lfd_curvalwords );
-    }
-    if ( lfdp->lfd_filtprefix != NULL ) {
-       LDAP_FREE( lfdp->lfd_filtprefix );
-    }
-    if ( lfdp->lfd_filtsuffix != NULL ) {
-       LDAP_FREE( lfdp->lfd_filtsuffix );
-    }
-
-    LDAP_FREE( lfdp );
+       return LDAP_STRDUP( p );
 }
 
 /*
@@ -120,6 +90,7 @@ ldap_mods_free( LDAPMod **mods, int freemods )
                LDAP_FREE( (char *) mods[i] );
        }
 
-       if ( freemods )
+       if ( freemods ) {
                LDAP_FREE( (char *) mods );
+       }
 }