From: Peter Krempa Date: Mon, 12 Nov 2018 14:30:21 +0000 (+0100) Subject: util: error: Fix error message strings to play well with additional info X-Git-Tag: v5.0.0-rc1~100 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=759bb2110e252c0cc4ede56a777843b4668b67ed;p=thirdparty%2Flibvirt.git util: error: Fix error message strings to play well with additional info Additional information for an error message is either in form of a string or empty. Fix two offenders. One used %d as the format modifier and the second one always expected a string. Thankfully, neither of the offenders are currently in effect. Signed-off-by: Peter Krempa Reviewed-by: Erik Skultety --- diff --git a/src/util/virerror.c b/src/util/virerror.c index 88e6ecef82..ce0679b23e 100644 --- a/src/util/virerror.c +++ b/src/util/virerror.c @@ -975,7 +975,10 @@ virErrorMsg(virErrorNumber error, const char *info) errmsg = _("POST operation failed"); break; case VIR_ERR_HTTP_ERROR: - errmsg = _("got unknown HTTP error code %d"); + if (info != NULL) + errmsg = _("got unknown HTTP error code %s"); + else + errmsg = _("got unknown HTTP error code"); break; case VIR_ERR_UNKNOWN_HOST: if (info != NULL) @@ -1002,7 +1005,10 @@ virErrorMsg(virErrorNumber error, const char *info) errmsg = _("could not connect to Xen Store %s"); break; case VIR_ERR_XEN_CALL: - errmsg = _("failed Xen syscall %s"); + if (info == NULL) + errmsg = _("failed Xen syscall"); + else + errmsg = _("failed Xen syscall %s"); break; case VIR_ERR_OS_TYPE: if (info == NULL)