X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Ffree.c;h=2a9392947e7d59ae84583d8f84f47cd558a45548;hb=c3e28a5488a8011ef0352f48fca85c48679205ba;hp=120e1605b0cf5fa7e54f90eb070ec7e590ade7e8;hpb=403f4479bc9f9a864122d4aeecf7284408918302;p=openldap
diff --git a/libraries/libldap/free.c b/libraries/libldap/free.c
index 120e1605b0..2a9392947e 100644
--- a/libraries/libldap/free.c
+++ b/libraries/libldap/free.c
@@ -1,12 +1,23 @@
+/* free.c */
/* $OpenLDAP$ */
-/*
- * 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.
+/* 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
*/
@@ -16,7 +27,6 @@
#include
#include
-#include
#include
#include
@@ -61,42 +71,6 @@ ldap_strdup( LDAP_CONST char *p )
return LDAP_STRDUP( p );
}
-void
-ldap_getfilter_free( LDAPFiltDesc *lfdp )
-{
- 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 );
-}
-
/*
* free a null-terminated array of pointers to mod structures. the
* structures are freed, not the array itself, unless the freemods