commit 9ac523169d183158a968969e8c9d42060322bdd8
author Ed Tanous <edtanous@google.com> Wed Jul 26 12:18:47 2023 -0700
committer Ed Tanous <ed@tanous.net> Thu Jul 27 22:58:36 2023 +0000
tree 5996de15f1992db4c8507d52df8e78d48079111f
parent ba2a636306cb350754227da24f9b5af20bfeaf18

Fix variableScope warnings

cppcheck flags that these variables can be declared at lower scopes.
Not sure if that's desired here, but up to the maintainer.

Change-Id: I06a4bed89401450a03c92489b0c9ce54511b6621
Signed-off-by: Ed Tanous <edtanous@google.com>

nbd-proxy.c

diff --git a/nbd-proxy.c b/nbd-proxy.c
index 92dfb75..e6d12f3 100644
--- a/nbd-proxy.c
+++ b/nbd-proxy.c
@@ -14,7 +14,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-
+// NOLINTBEGIN
 #define _GNU_SOURCE
 
 #include "config.h"
@@ -345,7 +345,6 @@
 static int wait_for_nbd_client(struct ctx* ctx)
 {
     struct pollfd pollfds[2];
-    int rc;
 
     pollfds[0].fd = ctx->sock;
     pollfds[0].events = POLLIN;
@@ -355,6 +354,7 @@
     for (;;)
     {
         errno = 0;
+        int rc;
         rc = poll(pollfds, 2, -1);
         if (rc < 0)
         {
@@ -390,7 +390,7 @@
 
 static int run_state_hook(struct ctx* ctx, const char* action, bool wait)
 {
-    int status, rc, fd;
+    int status, rc;
     pid_t pid;
 
     /* if the hook isn't present or executable, that's not necessarily
@@ -413,6 +413,7 @@
         if (!argv0)
             argv0 = state_hook_path;
 
+        int fd;
         fd = open("/dev/null", O_RDWR | O_CLOEXEC);
         if (fd < 0)
             exit(EXIT_FAILURE);
@@ -759,7 +760,7 @@
 {
     struct config* config;
     struct stat statbuf;
-    int i, rc;
+    int rc;
 
     config = NULL;
 
@@ -776,7 +777,7 @@
     else
     {
         /* find a matching config... */
-        for (i = 0; i < ctx->n_configs; i++)
+        for (int i = 0; i < ctx->n_configs; i++)
         {
             if (!strcmp(ctx->configs[i].name, name))
             {
@@ -930,3 +931,5 @@
     free(ctx->buf);
     return rc ? EXIT_FAILURE : EXIT_SUCCESS;
 }
+
+// NOLINTEND