changeset 85:8e59962f1e58

Small bugfix and cosmetics
author Sebastien Decugis <sdecugis@nict.go.jp>
date Tue, 15 Jul 2008 10:45:28 +0900
parents 2e9d4fc2adc5
children 7dce32fd436b
files waaad/message.c
diffstat 1 files changed, 3 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/waaad/message.c	Tue Jul 15 10:44:18 2008 +0900
+++ b/waaad/message.c	Tue Jul 15 10:45:28 2008 +0900
@@ -1160,8 +1160,7 @@
 	_mpr_stat_avps( rule->rule_avp, _data->sentinel, &count, &first, &last);
 	{
 		dict_avp_data_t avpdata;
-		int _ret = 0;
-		_ret = dict_getval(rule->rule_avp, &avpdata);
+		ret = dict_getval(rule->rule_avp, &avpdata);
 		
 		TRACE_DEBUG(FULL, "Checking rule: p:%d(%d) m/M/t:%2d/%2d/%d. Counted %d (first: %d, last:%d) of AVP '%s'", 
 					rule->rule_position,
@@ -1172,11 +1171,12 @@
 					count, 
 					first, 
 					last,
-					(_ret == 0) ? avpdata.avp_name : "???"
+					(ret == 0) ? avpdata.avp_name : "???"
 				);
 	}
 	
 	/* Now check the rule is not conflicting */
+	ret = 0;
 	
 	/* Check the "min" value */
 	if ((min = rule->rule_min) == -1) {
@@ -1230,7 +1230,6 @@
 	}
 	
 	/* We found no conflict, this rule is respected */
-	ret = 0;
 	
 end:
 	if (ret == EBADMSG) {
"Welcome to our mercurial repository"