From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51641) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WNgpw-0008Qv-Lj for qemu-devel@nongnu.org; Wed, 12 Mar 2014 06:56:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WNgpr-0004hp-QV for qemu-devel@nongnu.org; Wed, 12 Mar 2014 06:56:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:32422) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WNgpr-0004hh-HN for qemu-devel@nongnu.org; Wed, 12 Mar 2014 06:56:31 -0400 From: Stefan Hajnoczi Date: Wed, 12 Mar 2014 11:29:27 +0100 Message-Id: <1394620172-25071-20-git-send-email-stefanha@redhat.com> In-Reply-To: <1394620172-25071-1-git-send-email-stefanha@redhat.com> References: <1394620172-25071-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL 19/24] qemu-io: Fix warnings from static code analysis List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Anthony Liguori From: Stefan Weil 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 Acked-by: Stefan Hajnoczi Signed-off-by: Stefan Hajnoczi --- include/qemu-io.h | 2 ++ qemu-io-cmds.c | 2 +- qemu-io.c | 7 +++---- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/include/qemu-io.h b/include/qemu-io.h index 7e7c07c..5d6006f 100644 --- a/include/qemu-io.h +++ b/include/qemu-io.h @@ -38,6 +38,8 @@ typedef struct cmdinfo { helpfunc_t help; } cmdinfo_t; +extern bool qemuio_misalign; + bool qemuio_command(BlockDriverState *bs, const char *cmd); void qemuio_add_command(const cmdinfo_t *ci); diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c index f1de24c..fb1db53 100644 --- a/qemu-io-cmds.c +++ b/qemu-io-cmds.c @@ -16,7 +16,7 @@ #define CMD_NOFILE_OK 0x01 -int qemuio_misalign; +bool qemuio_misalign; static cmdinfo_t *cmdtab; static int ncmds; diff --git a/qemu-io.c b/qemu-io.c index fc38608..2d119c2 100644 --- a/qemu-io.c +++ b/qemu-io.c @@ -24,10 +24,9 @@ #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 */ static int ncmdline; @@ -408,7 +407,7 @@ int main(int argc, char **argv) readonly = 1; break; case 'm': - qemuio_misalign = 1; + qemuio_misalign = true; break; case 'g': growable = 1; -- 1.8.5.3