reorder test to silence cppcheck

diff --git a/bin/dig/dig.c b/bin/dig/dig.c
index f3f63874f39c766bfa0db2e112766e6f241d7471..ea3b8b38782d04ea0203cb8671bab4cfa435c421 100644 (file)
--- a/bin/dig/dig.c
+++ b/bin/dig/dig.c
@@ -1665,8 +1665,7 @@ parse_args(isc_boolean_t is_batchfile, isc_boolean_t config_only,
                                bargc = 1;
                                input = batchline;
                                bargv[bargc] = next_token(&input, " \t\r\n");
-                               while ((bargv[bargc] != NULL) &&
-                                      (bargc < 62)) {
+                               while ((bargc < 62) && (bargv[bargc] != NULL)) {
                                        bargc++;
                                        bargv[bargc] =
                                                next_token(&input, " \t\r\n");
@@ -1857,7 +1856,7 @@ parse_args(isc_boolean_t is_batchfile, isc_boolean_t config_only,
                                goto next_line;
                        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");
                        }
@@ -1927,7 +1926,7 @@ query_finished(void) {
                bargc = 1;
                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");
                }