On 11/03/2009 07:35 AM, Chris Lalancette wrote:
> When building with --disable-nls, I got a few messages like this:
>
> storage/storage_backend.c: In function 'virStorageBackendCreateQemuImg':
> storage/storage_backend.c:571: warning: format not a string literal and no
> format arguments
>
> Fix these up.
>
> Signed-off-by: Chris Lalancette <clala...@redhat.com>
> ---
> src/conf/domain_conf.c | 2 +-
> src/lxc/lxc_driver.c | 2 +-
> src/qemu/qemu_driver.c | 6 +++---
> src/storage/storage_backend.c | 2 +-
> 4 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
> index ba6b28d..a9c8573 100644
> --- a/src/conf/domain_conf.c
> +++ b/src/conf/domain_conf.c
> @@ -1813,7 +1813,7 @@ virDomainWatchdogDefParseXML(virConnectPtr conn,
>
> model = virXMLPropString (node, "model");
> if (model == NULL) {
> - virDomainReportError (conn, VIR_ERR_INTERNAL_ERROR,
> + virDomainReportError (conn, VIR_ERR_INTERNAL_ERROR, "%s",
> _("watchdog must contain model name"));
> goto error;
> }
> diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
> index 9a5c43a..1e984c5 100644
> --- a/src/lxc/lxc_driver.c
> +++ b/src/lxc/lxc_driver.c
> @@ -1858,7 +1858,7 @@ static int lxcSetSchedulerParameters(virDomainPtr
> domain,
> for (i = 0; i < nparams; i++) {
> virSchedParameterPtr param = ¶ms[i];
> if (param->type != VIR_DOMAIN_SCHED_FIELD_ULLONG) {
> - lxcError(NULL, domain, VIR_ERR_INVALID_ARG,
> + lxcError(NULL, domain, VIR_ERR_INVALID_ARG, "%s",
> _("invalid type for cpu_shares tunable, expected a
> 'ullong'"));
> goto cleanup;
> }
> diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
> index 38fe19e..7295641 100644
> --- a/src/qemu/qemu_driver.c
> +++ b/src/qemu/qemu_driver.c
> @@ -5299,7 +5299,7 @@ static int qemuSetSchedulerParameters(virDomainPtr dom,
> if (STREQ(param->field, "cpu_shares")) {
> int rc;
> if (param->type != VIR_DOMAIN_SCHED_FIELD_ULLONG) {
> - qemudReportError(dom->conn, dom, NULL, VIR_ERR_INVALID_ARG,
> + qemudReportError(dom->conn, dom, NULL, VIR_ERR_INVALID_ARG,
> "%s",
> _("invalid type for cpu_shares tunable,
> expected a 'ullong'"));
> goto cleanup;
> }
> @@ -6479,7 +6479,7 @@ static int doTunnelSendAll(virDomainPtr dom,
> break;
>
> if (virStreamSend(st, buffer, nbytes) < 0) {
> - qemudReportError(dom->conn, dom, NULL, VIR_ERR_OPERATION_FAILED,
> + qemudReportError(dom->conn, dom, NULL, VIR_ERR_OPERATION_FAILED,
> "%s",
> _("Failed to write migration data to remote
> libvirtd"));
> return -1;
> }
> @@ -6701,7 +6701,7 @@ static int doNonTunnelMigrate(virDomainPtr dom,
> goto cleanup;
>
> if (uri_out == NULL) {
> - qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
> + qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "%s",
> _("domainMigratePrepare2 did not set uri"));
> }
>
> diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c
> index 18a69be..bb926cd 100644
> --- a/src/storage/storage_backend.c
> +++ b/src/storage/storage_backend.c
> @@ -568,7 +568,7 @@ virStorageBackendCreateQemuImg(virConnectPtr conn,
> return -1;
> }
> if (enc->nsecrets > 1) {
> - virStorageReportError(conn, VIR_ERR_INVALID_STORAGE_VOL,
> + virStorageReportError(conn, VIR_ERR_INVALID_STORAGE_VOL, "%s",
> _("too many secrets for qcow encryption"));
> return -1;
> }
ACK
- Cole
--
Libvir-list mailing list
Libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
