External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 03:12:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

virsh: avoid mingw compiler warnings

Browse Source 
Compilation on mingw was warning about %lld use in fprintf, and
in the gnulib strptime module about dead labels.

* tools/virsh.c (vshPrint): Change redirect.
(vshPrintExtra): Allow use within vshPrint.  Avoid fprintf on
arbitrary formats, since we aren't using gnulib module; instead,
use virVasprintf to pre-format.
(vshError): Likewise.
* .gnulib: Update to latest, for mingw strptime warning fix.
Reported by Matthias Bolte.
This commit is contained in:
Eric Blake 2011-02-11 17:17:12 -07:00
parent 3a97fa28e4
commit 92f0ed0353
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gnulib

@ -1 +1 @@
Subproject commit 4cce65cb2f10936f13760625f39d532564984fde
Subproject commit ecb020f2b046790d76d05d377ca1e864e2bc9fdc

21
tools/virsh.c
View File

@ -325,7 +325,7 @@ static void vshDebug(vshControl *ctl, int level, const char *format, ...)
ATTRIBUTE_FMT_PRINTF(3, 4);
/* XXX: add batch support */
#define vshPrint(_ctl, ...) fprintf(stdout, __VA_ARGS__)
#define vshPrint(_ctl, ...) vshPrintExtra(NULL, __VA_ARGS__)
static const char *vshDomainStateToString(int state);
static const char *vshDomainVcpuStateToString(int state);
@ -11574,13 +11574,20 @@ static void
vshPrintExtra(vshControl *ctl, const char *format, ...)
{
va_list ap;
char *str;
if (ctl->quiet == TRUE)
if (ctl && ctl->quiet == TRUE)
return;
va_start(ap, format);
vfprintf(stdout, format, ap);
if (virVasprintf(&str, format, ap) < 0) {
vshError(ctl, "%s", _("Out of memory"));
va_end(ap);
return;
}
va_end(ap);
fprintf(stdout, "%s", str);
VIR_FREE(str);
}
@ -11588,6 +11595,7 @@ static void
vshError(vshControl *ctl, const char *format, ...)
{
va_list ap;
char *str;
if (ctl != NULL) {
va_start(ap, format);
@ -11598,10 +11606,13 @@ vshError(vshControl *ctl, const char *format, ...)
fputs(_("error: "), stderr);
va_start(ap, format);
vfprintf(stderr, format, ap);
/* We can't recursively call vshError on an OOM situation, so ignore
failure here. */
ignore_value(virVasprintf(&str, format, ap));
va_end(ap);
fputc('\n', stderr);
fprintf(stderr, "%s\n", NULLSTR(str));
VIR_FREE(str);
}
/*