From 2647a615ce2e4fda29d78b6d23b62fa6e97dba1e Mon Sep 17 00:00:00 2001
From: Kurt Zeilenga <kurt@openldap.org>
Date: Sat, 18 Sep 2004 06:04:57 +0000
Subject: [PATCH] value_match cleanup

---
 servers/slapd/filterentry.c   | 32 +++++++++++++++-----------------
 servers/slapd/matchedValues.c | 31 +++++++++++++------------------
 2 files changed, 28 insertions(+), 35 deletions(-)

diff --git a/servers/slapd/filterentry.c b/servers/slapd/filterentry.c
index 1717019aa8..9092a5951b 100644
--- a/servers/slapd/filterentry.c
+++ b/servers/slapd/filterentry.c
@@ -403,7 +403,7 @@ test_ava_filter(
 
 	if ( ava->aa_desc == slap_schema.si_ad_entryDN ) {
 		MatchingRule *mr;
-		int rc, ret;
+		int rc, match;
 		const char *text;
 
 		if( type != LDAP_FILTER_EQUALITY &&
@@ -416,11 +416,11 @@ test_ava_filter(
 		mr = slap_schema.si_ad_entryDN->ad_type->sat_equality;
 		assert( mr );
 
-		rc = value_match( &ret, slap_schema.si_ad_entryDN, mr, 0,
+		rc = value_match( &match, slap_schema.si_ad_entryDN, mr, 0,
 			&e->e_nname, &ava->aa_value, &text );
 
 		if( rc != LDAP_SUCCESS ) return rc;
-		if( ret == 0 ) return LDAP_COMPARE_TRUE;
+		if( match == 0 ) return LDAP_COMPARE_TRUE;
 		return LDAP_COMPARE_FALSE;
 	}
 
@@ -466,30 +466,29 @@ test_ava_filter(
 		}
 
 		for ( bv = a->a_nvals; bv->bv_val != NULL; bv++ ) {
-			int ret;
-			int tmprc;
+			int ret, match;
 			const char *text;
 
-			tmprc = value_match( &ret, a->a_desc, mr, 0,
+			ret = value_match( &match, a->a_desc, mr, 0,
 				bv, &ava->aa_value, &text );
 
-			if( tmprc != LDAP_SUCCESS ) {
-				rc = tmprc;
+			if( ret != LDAP_SUCCESS ) {
+				rc = ret;
 				break;
 			}
 
 			switch ( type ) {
 			case LDAP_FILTER_EQUALITY:
 			case LDAP_FILTER_APPROX:
-				if ( ret == 0 ) return LDAP_COMPARE_TRUE;
+				if ( match == 0 ) return LDAP_COMPARE_TRUE;
 				break;
 
 			case LDAP_FILTER_GE:
-				if ( ret >= 0 ) return LDAP_COMPARE_TRUE;
+				if ( match >= 0 ) return LDAP_COMPARE_TRUE;
 				break;
 
 			case LDAP_FILTER_LE:
-				if ( ret <= 0 ) return LDAP_COMPARE_TRUE;
+				if ( match <= 0 ) return LDAP_COMPARE_TRUE;
 				break;
 			}
 		}
@@ -656,18 +655,17 @@ test_substrings_filter(
 		}
 
 		for ( bv = a->a_nvals; bv->bv_val != NULL; bv++ ) {
-			int ret;
-			int tmprc;
+			int ret, match;
 			const char *text;
 
-			tmprc = value_match( &ret, a->a_desc, mr, 0,
+			ret = value_match( &match, a->a_desc, mr, 0,
 				bv, f->f_sub, &text );
 
-			if( tmprc != LDAP_SUCCESS ) {
-				rc = tmprc;
+			if( ret != LDAP_SUCCESS ) {
+				rc = ret;
 				break;
 			}
-			if ( ret == 0 ) return LDAP_COMPARE_TRUE;
+			if ( match == 0 ) return LDAP_COMPARE_TRUE;
 		}
 	}
 
diff --git a/servers/slapd/matchedValues.c b/servers/slapd/matchedValues.c
index c025d1866a..98df13d80f 100644
--- a/servers/slapd/matchedValues.c
+++ b/servers/slapd/matchedValues.c
@@ -172,37 +172,36 @@ test_ava_vrFilter(
 
 		bv = a->a_nvals;
 		for ( j=0; bv->bv_val != NULL; bv++, j++ ) {
-			int ret;
-			int rc;
+			int rc, match;
 			const char *text;
 
-			rc = value_match( &ret, a->a_desc, mr, 0,
+			rc = value_match( &match, a->a_desc, mr, 0,
 				bv, &ava->aa_value, &text );
 			if( rc != LDAP_SUCCESS ) return rc;
 
 			switch ( type ) {
 			case LDAP_FILTER_EQUALITY:
 			case LDAP_FILTER_APPROX:
-				if ( ret == 0 ) {
+				if ( match == 0 ) {
 					(*e_flags)[i][j] = 1;
 				}
 				break;
 	
 			case LDAP_FILTER_GE:
-				if ( ret >= 0 ) {
+				if ( match >= 0 ) {
 					(*e_flags)[i][j] = 1;
 				}
 				break;
 	
 			case LDAP_FILTER_LE:
-				if ( ret <= 0 ) {
+				if ( match <= 0 ) {
 					(*e_flags)[i][j] = 1;
 				}
 				break;
 			}
 		}
 	}
-	return( LDAP_SUCCESS );
+	return LDAP_SUCCESS;
 }
 
 static int
@@ -247,18 +246,15 @@ test_substrings_vrFilter(
 
 		bv = a->a_nvals;
 		for ( j = 0; bv->bv_val != NULL; bv++, j++ ) {
-			int ret;
-			int rc;
+			int rc, match;
 			const char *text;
 
-			rc = value_match( &ret, a->a_desc, mr, 0,
+			rc = value_match( &match, a->a_desc, mr, 0,
 				bv, vrf->vrf_sub, &text );
 
-			if( rc != LDAP_SUCCESS ) {
-				return rc;
-			}
+			if( rc != LDAP_SUCCESS ) return rc;
 
-			if ( ret == 0 ) {
+			if ( match == 0 ) {
 				(*e_flags)[i][j] = 1;
 			}
 		}
@@ -309,15 +305,14 @@ test_mra_vrFilter(
 		}
 					
 		for ( j = 0; bv->bv_val != NULL; bv++, j++ ) {
-			int ret;
-			int rc;
+			int rc, match;
 			const char *text;
 
-			rc = value_match( &ret, a->a_desc, mra->ma_rule, 0,
+			rc = value_match( &match, a->a_desc, mra->ma_rule, 0,
 				bv, &assertedValue, &text );
 			if( rc != LDAP_SUCCESS ) return rc;
 
-			if ( ret == 0 ) {
+			if ( match == 0 ) {
 				(*e_flags)[i][j] = 1;
 			}
 		}
-- 
2.39.5