From 79892762596c40de89f6a9e7b94170ba35728331 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Wed, 10 Dec 2008 16:35:00 +0000 Subject: [PATCH] avoid format string warnings * src/openvz_conf.c (openvzGetNodeCPUs): Add "%s" arg before _(...). * src/uml_driver.c (umlDomainBlockPeek): Likewise. --- ChangeLog | 6 ++++++ src/openvz_conf.c | 2 +- src/uml_driver.c | 6 +++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6d964ae007..6060eb06dc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed Dec 10 17:33:49 +0100 2008 Jim Meyering + + avoid format string warnings + * src/openvz_conf.c (openvzGetNodeCPUs): Add "%s" arg before _(...). + * src/uml_driver.c (umlDomainBlockPeek): Likewise. + Tue Dec 9 2008 22:35:43 +0100 Jim Meyering fix just-broken "virsh start" and "virsh pool-start" commands diff --git a/src/openvz_conf.c b/src/openvz_conf.c index fc4ef20025..1361c53e82 100644 --- a/src/openvz_conf.c +++ b/src/openvz_conf.c @@ -466,7 +466,7 @@ openvzGetNodeCPUs(void) if (virNodeInfoPopulate(NULL, &nodeinfo) < 0) { openvzError(NULL, VIR_ERR_INTERNAL_ERROR, - _("Cound not read nodeinfo")); + "%s", _("Cound not read nodeinfo")); return 0; } diff --git a/src/uml_driver.c b/src/uml_driver.c index 9c0d9c4c1c..408096e636 100644 --- a/src/uml_driver.c +++ b/src/uml_driver.c @@ -1764,13 +1764,13 @@ umlDomainBlockPeek (virDomainPtr dom, if (!vm) { umlReportError (dom->conn, dom, NULL, VIR_ERR_INVALID_DOMAIN, - _("no domain with matching uuid")); + "%s", _("no domain with matching uuid")); goto cleanup; } if (!path || path[0] == '\0') { umlReportError(dom->conn, dom, NULL, VIR_ERR_INVALID_ARG, - _("NULL or empty path")); + "%s", _("NULL or empty path")); goto cleanup; } @@ -1807,7 +1807,7 @@ umlDomainBlockPeek (virDomainPtr dom, ret = 0; } else { umlReportError (dom->conn, dom, NULL, VIR_ERR_INVALID_ARG, - _("invalid path")); + "%s", _("invalid path")); } cleanup: -- GitLab