Diff for /servers/slapd/filter.c between versions 1.134.2.13 and 1.134.2.14

version 1.134.2.13, 2008/09/06 01:01:02 version 1.134.2.14, 2008/11/08 00:28:43
Line 1 Line 1
 /* filter.c - routines for parsing and dealing with filters */  /* filter.c - routines for parsing and dealing with filters */
 /* $OpenLDAP: pkg/ldap/servers/slapd/filter.c,v 1.134.2.12 2008/02/18 22:25:47 hyc Exp $ */  /* $OpenLDAP: pkg/ldap/servers/slapd/filter.c,v 1.134.2.13 2008/09/06 01:01:02 quanah Exp $ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.  /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *   *
  * Copyright 1998-2008 The OpenLDAP Foundation.   * Copyright 1998-2008 The OpenLDAP Foundation.
Line 492  return_error: Line 492  return_error:
 }  }
   
 void  void
 filter_free_x( Operation *op, Filter *f )  filter_free_x( Operation *op, Filter *f, int freeme )
 {  {
         Filter  *p, *next;          Filter  *p, *next;
   
Line 531  filter_free_x( Operation *op, Filter *f Line 531  filter_free_x( Operation *op, Filter *f
         case LDAP_FILTER_NOT:          case LDAP_FILTER_NOT:
                 for ( p = f->f_list; p != NULL; p = next ) {                  for ( p = f->f_list; p != NULL; p = next ) {
                         next = p->f_next;                          next = p->f_next;
                         filter_free_x( op, p );                          filter_free_x( op, p, 1 );
                 }                  }
                 break;                  break;
   
Line 548  filter_free_x( Operation *op, Filter *f Line 548  filter_free_x( Operation *op, Filter *f
                 break;                  break;
         }          }
   
         op->o_tmpfree( f, op->o_tmpmemctx );          if ( freeme ) {
                   op->o_tmpfree( f, op->o_tmpmemctx );
           }
 }  }
   
 void  void
Line 560  filter_free( Filter *f ) Line 562  filter_free( Filter *f )
         op.o_hdr = &ohdr;          op.o_hdr = &ohdr;
         op.o_tmpmemctx = slap_sl_context( f );          op.o_tmpmemctx = slap_sl_context( f );
         op.o_tmpmfuncs = &slap_sl_mfuncs;          op.o_tmpmfuncs = &slap_sl_mfuncs;
         filter_free_x( &op, f );          filter_free_x( &op, f, 1 );
 }  }
   
 void  void

Removed from v.1.134.2.13  
changed lines
  Added in v.1.134.2.14


______________
© Copyright 1998-2020, OpenLDAP Foundation, info@OpenLDAP.org