ITS#4840 fix typo

[openldap] / libraries / libldap / free.c

diff --git a/libraries/libldap/free.c b/libraries/libldap/free.c
index d0e47686e5e11259a543149644e094a53aab87e1..2a9392947e7d59ae84583d8f84f47cd558a45548 100644 (file)
--- a/libraries/libldap/free.c
+++ b/libraries/libldap/free.c
@@ -1,61 +1,74 @@
-/*
- *  Copyright (c) 1994 The Regents of the University of Michigan.
- *  All rights reserved.
+/* free.c */
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2007 The OpenLDAP Foundation.
+ * All rights reserved.
  *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* Portions Copyright (c) 1994 The Regents of the University of Michigan.
+ * All rights reserved.
+ */
+
+/*
  *  free.c - some free routines are included here to avoid having to
  *           link in lots of extra code when not using certain features
  */
 
 #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_getfilter_free( LDAPFiltDesc *lfdp )
+ldap_memfree( void *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;
-           free( fip->lfi_filter );
-           free( fip->lfi_desc );
-           free( fip );
-       }
-       nextflp = flp->lfl_next;
-       free( flp->lfl_pattern );
-       free( flp->lfl_delims );
-       free( flp->lfl_tag );
-       free( flp );
-    }
-
-    if ( lfdp->lfd_curvalcopy != NULL ) {
-       free( lfdp->lfd_curvalcopy );
-    }
-    if ( lfdp->lfd_curvalwords != NULL ) {
-       free( lfdp->lfd_curvalwords );
-    }
-    if ( lfdp->lfd_filtprefix != NULL ) {
-       free( lfdp->lfd_filtprefix );
-    }
-    if ( lfdp->lfd_filtsuffix != NULL ) {
-       free( lfdp->lfd_filtsuffix );
-    }
-
-    free( lfdp );
+       LDAP_FREE( p );
+}
+
+void
+ldap_memvfree( void **v )
+{
+       LDAP_VFREE( v );
+}
+
+void *
+ldap_memalloc( ber_len_t s )
+{
+       return LDAP_MALLOC( s );
+}
+
+void *
+ldap_memcalloc( ber_len_t n, ber_len_t s )
+{
+       return LDAP_CALLOC( n, s );
+}
+
+void *
+ldap_memrealloc( void* p, ber_len_t s )
+{
+       return LDAP_REALLOC( p, s );
+}
+
+char *
+ldap_strdup( LDAP_CONST char *p )
+{
+       return LDAP_STRDUP( p );
 }
 
 /*
@@ -74,13 +87,21 @@ 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 );
+       if ( freemods ) {
+               LDAP_FREE( (char *) mods );
+       }
 }