Browse Source

qemu-io: Fix warnings from static code analysis

Smatch complains about several global symbols which should be local.

Add the missing 'static' attributes and move the 'extern' declaration
of variable qemuio_misalign to qemu-io.h. This variable also changes
the type from 'int' to 'bool' which better fits documents its use.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Stefan Weil 11 years ago
parent
commit
f988388025
3 changed files with 6 additions and 5 deletions
  1. 2 0
      include/qemu-io.h
  2. 1 1
      qemu-io-cmds.c
  3. 3 4
      qemu-io.c

+ 2 - 0
include/qemu-io.h

@@ -38,6 +38,8 @@ typedef struct cmdinfo {
     helpfunc_t  help;
     helpfunc_t  help;
 } cmdinfo_t;
 } cmdinfo_t;
 
 
+extern bool qemuio_misalign;
+
 bool qemuio_command(BlockDriverState *bs, const char *cmd);
 bool qemuio_command(BlockDriverState *bs, const char *cmd);
 
 
 void qemuio_add_command(const cmdinfo_t *ci);
 void qemuio_add_command(const cmdinfo_t *ci);

+ 1 - 1
qemu-io-cmds.c

@@ -16,7 +16,7 @@
 
 
 #define CMD_NOFILE_OK   0x01
 #define CMD_NOFILE_OK   0x01
 
 
-int qemuio_misalign;
+bool qemuio_misalign;
 
 
 static cmdinfo_t *cmdtab;
 static cmdinfo_t *cmdtab;
 static int ncmds;
 static int ncmds;

+ 3 - 4
qemu-io.c

@@ -24,10 +24,9 @@
 
 
 #define CMD_NOFILE_OK   0x01
 #define CMD_NOFILE_OK   0x01
 
 
-char *progname;
+static char *progname;
 
 
-BlockDriverState *qemuio_bs;
-extern int qemuio_misalign;
+static BlockDriverState *qemuio_bs;
 
 
 /* qemu-io commands passed using -c */
 /* qemu-io commands passed using -c */
 static int ncmdline;
 static int ncmdline;
@@ -408,7 +407,7 @@ int main(int argc, char **argv)
             readonly = 1;
             readonly = 1;
             break;
             break;
         case 'm':
         case 'm':
-            qemuio_misalign = 1;
+            qemuio_misalign = true;
             break;
             break;
         case 'g':
         case 'g':
             growable = 1;
             growable = 1;