s/<stdlib.h>/<ac/stdlib.h>/

[openldap] / libraries / libldap / free.c

diff --git a/libraries/libldap/free.c b/libraries/libldap/free.c
index d0e47686e5e11259a543149644e094a53aab87e1..428f11f8284e8479f1a51279a995a9ae9210d10e 100644 (file)
--- a/libraries/libldap/free.c
+++ b/libraries/libldap/free.c
@@ -1,4 +1,8 @@
 /*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
+/*  Portions
  *  Copyright (c) 1994 The Regents of the University of Michigan.
  *  All rights reserved.
  *
@@ -8,19 +12,47 @@
 
 #include "portable.h"
 
-#ifndef lint 
-static char copyright[] = "@(#) Copyright (c) 1994 The Regents of the University of Michigan.\nAll rights reserved.\n";
-#endif
-
 #include <stdio.h>
-#include <stdlib.h>
+#include <ac/stdlib.h>
 
 #include <ac/ctype.h>
 #include <ac/string.h>
 #include <ac/time.h>
 
-#include "lber.h"
-#include "ldap.h"
+#include "ldap-int.h"
+
+/*
+ * C-API deallocator
+ */
+void
+ldap_memfree( void *p )
+{
+       LDAP_FREE( p );
+}
+
+void
+ldap_memvfree( void **v )
+{
+       LDAP_VFREE( v );
+}
+
+void *
+ldap_memalloc( size_t s )
+{
+       return LDAP_MALLOC( s );
+}
+
+void *
+ldap_memcalloc( size_t n, size_t s )
+{
+       return LDAP_CALLOC( n, s );
+}
+
+void *
+ldap_memrealloc( void* p, size_t s )
+{
+       return LDAP_REALLOC( p, s );
+}
 
 void
 ldap_getfilter_free( LDAPFiltDesc *lfdp )
@@ -31,31 +63,31 @@ ldap_getfilter_free( LDAPFiltDesc *lfdp )
     for ( flp = lfdp->lfd_filtlist; flp != NULL; flp = nextflp ) {
        for ( fip = flp->lfl_ilist; fip != NULL; fip = nextfip ) {
            nextfip = fip->lfi_next;
-           free( fip->lfi_filter );
-           free( fip->lfi_desc );
-           free( fip );
+           LDAP_FREE( fip->lfi_filter );
+           LDAP_FREE( fip->lfi_desc );
+           LDAP_FREE( fip );
        }
        nextflp = flp->lfl_next;
-       free( flp->lfl_pattern );
-       free( flp->lfl_delims );
-       free( flp->lfl_tag );
-       free( flp );
+       LDAP_FREE( flp->lfl_pattern );
+       LDAP_FREE( flp->lfl_delims );
+       LDAP_FREE( flp->lfl_tag );
+       LDAP_FREE( flp );
     }
 
     if ( lfdp->lfd_curvalcopy != NULL ) {
-       free( lfdp->lfd_curvalcopy );
+       LDAP_FREE( lfdp->lfd_curvalcopy );
     }
     if ( lfdp->lfd_curvalwords != NULL ) {
-       free( lfdp->lfd_curvalwords );
+       LDAP_FREE( lfdp->lfd_curvalwords );
     }
     if ( lfdp->lfd_filtprefix != NULL ) {
-       free( lfdp->lfd_filtprefix );
+       LDAP_FREE( lfdp->lfd_filtprefix );
     }
     if ( lfdp->lfd_filtsuffix != NULL ) {
-       free( lfdp->lfd_filtsuffix );
+       LDAP_FREE( lfdp->lfd_filtsuffix );
     }
 
-    free( lfdp );
+    LDAP_FREE( lfdp );
 }
 
 /*
@@ -74,13 +106,20 @@ ldap_mods_free( LDAPMod **mods, int freemods )
 
        for ( i = 0; mods[i] != NULL; i++ ) {
                if ( mods[i]->mod_op & LDAP_MOD_BVALUES ) {
-                       ber_bvecfree( mods[i]->mod_bvalues );
-               } else {
-                       ldap_value_free( mods[i]->mod_values );
+                       if( mods[i]->mod_bvalues != NULL )
+                               ber_bvecfree( mods[i]->mod_bvalues );
+
+               } else if( mods[i]->mod_values != NULL ) {
+                       LDAP_VFREE( mods[i]->mod_values );
                }
-               free( (char *) mods[i] );
+
+               if ( mods[i]->mod_type != NULL ) {
+                       LDAP_FREE( mods[i]->mod_type );
+               }
+
+               LDAP_FREE( (char *) mods[i] );
        }
 
        if ( freemods )
-               free( (char *) mods );
+               LDAP_FREE( (char *) mods );
 }