X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Ffilterentry.c;h=f10ff2232d27e5ae99f7ac646719352a61f394cc;hb=2bfe79fe884565801600e309d1fcbefa41fb0f4b;hp=b201fd469d23b2205beab079e27673ec1afa6d0b;hpb=e7e8ec90b61c67b8dae11e0a5f6642187e78e57c;p=openldap

diff --git a/servers/slapd/filterentry.c b/servers/slapd/filterentry.c
index b201fd469d..f10ff2232d 100644
--- a/servers/slapd/filterentry.c
+++ b/servers/slapd/filterentry.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2005 The OpenLDAP Foundation.
+ * Copyright 1998-2006 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -158,7 +158,7 @@ static int test_mra_filter(
 	void		*memctx;
 	BER_MEMFREE_FN	*memfree;
 #ifdef LDAP_COMP_MATCH
-	int i, num_attr_vals;
+	int i, num_attr_vals = 0;
 #endif
 
 	if ( op == NULL ) {
@@ -444,7 +444,7 @@ static int test_mra_filter(
 				int		ret;
 				const char	*text;
 
-				assert( ad );
+				assert( ad != NULL );
 
 				if ( mra->ma_desc ) {
 					/* have a mra type? check for subtype */
@@ -588,7 +588,7 @@ test_ava_filter(
 		}
 
 		mr = slap_schema.si_ad_entryDN->ad_type->sat_equality;
-		assert( mr );
+		assert( mr != NULL );
 
 		rc = value_match( &match, slap_schema.si_ad_entryDN, mr,
 			SLAP_MR_EXT, &e->e_nname, &ava->aa_value, &text );