[libvirt] [PATCH 3/7] maint: avoid static zero init in tools
C guarantees that static variables are zero-initialized. Some older
compilers (and also gcc -fno-zero-initialized-in-bss) create larger
binaries if you explicitly zero-initialize a static variable.
* tools/virsh-console.c (got_signal): Drop unused variable.
* tools/virsh-domain.c: Fix initialization.
* tools/virsh.c: Likewise.
* tools/virt-host-validate-common.c (virHostMsgWantEscape):
Likewise.
Signed-off-by: Eric Blake <eblake(a)redhat.com>
---
tools/virsh-console.c | 5 +----
tools/virsh-domain.c | 2 +-
tools/virsh.c | 4 ++--
tools/virt-host-validate-common.c | 4 ++--
4 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/tools/virsh-console.c b/tools/virsh-console.c
index 9838a56..c245df7 100644
--- a/tools/virsh-console.c
+++ b/tools/virsh-console.c
@@ -1,7 +1,7 @@
/*
* virsh-console.c: A dumb serial console client
*
- * Copyright (C) 2007-2008, 2010-2013 Red Hat, Inc.
+ * Copyright (C) 2007-2008, 2010-2014 Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -81,11 +81,9 @@ struct virConsole {
};
-static int got_signal = 0;
static void
virConsoleHandleSignal(int sig ATTRIBUTE_UNUSED)
{
- got_signal = 1;
}
@@ -336,7 +334,6 @@ vshRunConsole(vshControl *ctl,
/* Trap all common signals so that we can safely restore the original
* terminal settings on STDIN before the process exits - people don't like
* being left with a messed up terminal ! */
- got_signal = 0;
sigaction(SIGQUIT, &sighandler, &old_sigquit);
sigaction(SIGTERM, &sighandler, &old_sigterm);
sigaction(SIGINT, &sighandler, &old_sigint);
diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index 94ae3d3..da9f041 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -1582,7 +1582,7 @@ vshPrintJobProgress(const char *label, unsigned long long
remaining,
fflush(stderr);
}
-static volatile sig_atomic_t intCaught = 0;
+static volatile sig_atomic_t intCaught;
static void vshCatchInt(int sig ATTRIBUTE_UNUSED,
siginfo_t *siginfo ATTRIBUTE_UNUSED,
diff --git a/tools/virsh.c b/tools/virsh.c
index 589f3b4..036b517 100644
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -316,7 +316,7 @@ vshReportError(vshControl *ctl)
/*
* Detection of disconnections and automatic reconnection support
*/
-static int disconnected = 0; /* we may have been disconnected */
+static int disconnected; /* we may have been disconnected */
/*
* vshCatchDisconnect:
@@ -2985,7 +2985,7 @@ static char *
vshReadlineOptionsGenerator(const char *text, int state)
{
static int list_index, len;
- static const vshCmdDef *cmd = NULL;
+ static const vshCmdDef *cmd;
const char *name;
if (!state) {
diff --git a/tools/virt-host-validate-common.c b/tools/virt-host-validate-common.c
index 496324e..92a19c5 100644
--- a/tools/virt-host-validate-common.c
+++ b/tools/virt-host-validate-common.c
@@ -1,7 +1,7 @@
/*
* virt-host-validate-common.c: Sanity check helper APIs
*
- * Copyright (C) 2012 Red Hat, Inc.
+ * Copyright (C) 2012, 2014 Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -66,7 +66,7 @@ void virHostMsgCheck(const char *prefix,
static bool virHostMsgWantEscape(void)
{
static bool detectTty = true;
- static bool wantEscape = false;
+ static bool wantEscape;
if (detectTty) {
if (isatty(STDOUT_FILENO))
wantEscape = true;
--
1.9.3