From e830d52573404c69254c5220cfa10f280365c846 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Tue, 13 May 2008 09:15:11 +0000 Subject: [PATCH] avoid "not a string literal..." warnings * src/qemu_conf.c (qemudParseInterfaceXML): Add "%s". (qemudBuildCommandLine, qemudGenerateXML): Likewise. --- ChangeLog | 6 ++++++ src/qemu_conf.c | 10 +++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 31686451fc..4ea1fb4c9f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Tue May 13 10:55:43 CEST 2008 Jim Meyering + + avoid "not a string literal..." warnings + * src/qemu_conf.c (qemudParseInterfaceXML): Add "%s". + (qemudBuildCommandLine, qemudGenerateXML): Likewise. + Mon May 12 23:32:21 PST 2008 David L. Leskovec * qemud/qemud.c: get siginfo with signals, distribute to drivers that diff --git a/src/qemu_conf.c b/src/qemu_conf.c index 2a29382e43..9772721591 100644 --- a/src/qemu_conf.c +++ b/src/qemu_conf.c @@ -1006,7 +1006,7 @@ static int qemudParseInterfaceXML(virConnectPtr conn, (model[i] >= 'a' && model[i] <= 'z') || (model[i] >= 'A' && model[i] <= 'Z') || model[i] == '_'; if (!char_ok) { - qemudReportError (conn, NULL, NULL, VIR_ERR_INVALID_ARG, + qemudReportError (conn, NULL, NULL, VIR_ERR_INVALID_ARG, "%s", _("Model name contains invalid characters")); goto error; } @@ -2751,9 +2751,9 @@ int qemudBuildCommandLine(virConnectPtr conn, while(sound && size > 0) { const char *model = qemudSoundModelToString(sound->model); if (!model) { - qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - _("invalid sound model")); - goto error; + qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + "%s", _("invalid sound model")); + goto error; } strncat(modstr, model, size); size -= strlen(model); @@ -3988,7 +3988,7 @@ char *qemudGenerateXML(virConnectPtr conn, const char *model = qemudSoundModelToString(sound->model); if (!model) { qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - _("invalid sound model")); + "%s", _("invalid sound model")); goto cleanup; } virBufferVSprintf(&buf, " \n", model); -- GitLab