]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
reorder test to silence cppcheck
authorMark Andrews <marka@isc.org>
Thu, 15 Feb 2018 03:50:36 +0000 (14:50 +1100)
committerMark Andrews <marka@isc.org>
Fri, 16 Feb 2018 06:13:43 +0000 (17:13 +1100)
bin/dig/dig.c

index 5b724f45ec28abc5fd258c42cbb651d2e74089d2..06d1bb8cb2fdb3972f19592b7eaff7b17d26626e 100644 (file)
@@ -1859,8 +1859,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");
@@ -2051,7 +2050,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");
                        }
@@ -2121,7 +2120,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");
                }