From 3b9ca940256c8a8583f058a0604159958e172241 Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Thu, 21 Jun 2012 14:46:03 +0100 Subject: [PATCH] Fix unused parameters / functions in virsh on Win32 The vshPrintRaw function is not used on Win32, and neither is the 'msg' parameter of vshAskReedit. Change the nesting of #ifdef WIN32 conditionals to address this Signed-off-by: Daniel P. Berrange --- tools/virsh.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 75147efd62..567a5f6a08 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -649,6 +649,7 @@ vshReconnect(vshControl *ctl) ctl->useSnapshotOld = false; } +#ifndef WIN32 static void vshPrintRaw(vshControl *ctl, ...) { @@ -678,7 +679,6 @@ vshPrintRaw(vshControl *ctl, ...) static int vshAskReedit(vshControl *ctl, const char *msg) { -#ifndef WIN32 int c = -1; struct termios ttyattr; @@ -714,12 +714,16 @@ vshAskReedit(vshControl *ctl, const char *msg) vshPrint(ctl, "\r\n"); return c; -#else +} +#else /* WIN32 */ +static int +vshAskReedit(vshControl *ctl, const char *msg ATTRIBUTE_UNUSED) +{ vshDebug(ctl, VSH_ERR_WARNING, "%s", _("This function is not " "supported on WIN32 platform")); return 0; -#endif } +#endif /* WIN32 */ /* --------------- * Commands -- GitLab