X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Ffree.c;h=2a9392947e7d59ae84583d8f84f47cd558a45548;hb=c3e28a5488a8011ef0352f48fca85c48679205ba;hp=d7a13228e6db9c5245e2fd95313aa4233533fd03;hpb=42e0d83cb3a1a1c5b25183f1ab74ce7edbe25de7;p=openldap
diff --git a/libraries/libldap/free.c b/libraries/libldap/free.c
index d7a13228e6..2a9392947e 100644
--- a/libraries/libldap/free.c
+++ b/libraries/libldap/free.c
@@ -1,69 +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 .
+ *
+ * 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
+ * .
+ */
+/* 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
*/
-#ifndef lint
-static char copyright[] = "@(#) Copyright (c) 1994 The Regents of the University of Michigan.\nAll rights reserved.\n";
-#endif
-
+#include "portable.h"
#include
-#include
-#include
-#ifdef MACOS
-#include
-#include "macos.h"
-#else /* MACOS */
-#ifdef DOS
-#include
-#include "msdos.h"
-#else /* DOS */
-#include
-#include
-#endif /* DOS */
-#endif /* MACOS */
-
-#include "lber.h"
-#include "ldap.h"
+#include
+
+#include
+#include
+#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 );
}
/*
@@ -82,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 );
+ }
}