From: Evan Hunt <each@isc.org>
Date: Fri, 26 Apr 2013 17:59:50 +0000 (-0700)
Subject: [master] minor code cleanup in rrl.c:expand_entries()
X-Git-Tag: v9.10.0a1~400
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=5cedb1e345e3dae492423a73f0bc9b117608f704;p=thirdparty%2Fbind9.git

[master] minor code cleanup in rrl.c:expand_entries()

 from RT #33137
---

diff --git a/lib/dns/rrl.c b/lib/dns/rrl.c
index 3a6abfa4621..6419dfeadf7 100644
--- a/lib/dns/rrl.c
+++ b/lib/dns/rrl.c
@@ -203,12 +203,12 @@ expand_entries(dns_rrl_t *rrl, int new) {
 	double rate;
 	int i;
 
-	if (rrl->num_entries+new >= rrl->max_entries && rrl->max_entries != 0) {
-		if (rrl->num_entries >= rrl->max_entries)
-			return (ISC_R_SUCCESS);
+	if (rrl->num_entries + new >= rrl->max_entries &&
+	    rrl->max_entries != 0)
+	{
 		new = rrl->max_entries - rrl->num_entries;
 		if (new <= 0)
-			return (ISC_R_NOMEMORY);
+			return (ISC_R_SUCCESS);
 	}
 
 	/*