From: Mark Andrews <marka@isc.org>
Date: Thu, 15 Feb 2018 04:53:47 +0000 (+1100)
Subject: reorder test to silence cppcheck
X-Git-Tag: v9.12.1rc1~5^2~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf53ca27d5a84b31d5aeea8ca40f803ce901e034;p=thirdparty%2Fbind9.git

reorder test to silence cppcheck
---

diff --git a/bin/tools/mdig.c b/bin/tools/mdig.c
index 8dbc49ab6c3..e685a884b58 100644
--- a/bin/tools/mdig.c
+++ b/bin/tools/mdig.c
@@ -1872,7 +1872,7 @@ parse_args(isc_boolean_t is_batchfile, int argc, char **argv)
 				continue;
 			input = batchline;
 			bargv[bargc] = next_token(&input, " \t\r\n");
-			while ((bargv[bargc] != NULL) && (bargc < 14)) {
+			while ((bargc < 14) && (bargv[bargc] != NULL)) {
 				bargc++;
 				bargv[bargc] = next_token(&input, " \t\r\n");
 			}