openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

avoid "not a string literal..." warnings 

* src/qemu_conf.c (qemudParseInterfaceXML): Add "%s".
(qemudBuildCommandLine, qemudGenerateXML): Likewise.
This commit is contained in:
Jim Meyering 2008-05-13 09:15:11 +00:00
parent 773d59e86d
commit e830d52573
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Tue May 13 10:55:43 CEST 2008 Jim Meyering <meyering@redhat.com>
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 <dlesko@linux.vnet.ibm.com> Mon May 12 23:32:21 PST 2008 David L. Leskovec <dlesko@linux.vnet.ibm.com>
* qemud/qemud.c: get siginfo with signals, distribute to drivers that * qemud/qemud.c: get siginfo with signals, distribute to drivers that

10
src/qemu_conf.c
View File

@ -1006,7 +1006,7 @@ static int qemudParseInterfaceXML(virConnectPtr conn,
(model[i] >= 'a' && model[i] <= 'z') || (model[i] >= 'a' && model[i] <= 'z') ||
(model[i] >= 'A' && model[i] <= 'Z') || model[i] == '_'; (model[i] >= 'A' && model[i] <= 'Z') || model[i] == '_';
if (!char_ok) { 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")); _("Model name contains invalid characters"));
goto error; goto error;
} }
@ -2751,9 +2751,9 @@ int qemudBuildCommandLine(virConnectPtr conn,
while(sound && size > 0) { while(sound && size > 0) {
const char *model = qemudSoundModelToString(sound->model); const char *model = qemudSoundModelToString(sound->model);
if (!model) { if (!model) {
qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
_("invalid sound model")); "%s", _("invalid sound model"));
goto error; goto error;
} }
strncat(modstr, model, size); strncat(modstr, model, size);
size -= strlen(model); size -= strlen(model);
@ -3988,7 +3988,7 @@ char *qemudGenerateXML(virConnectPtr conn,
const char *model = qemudSoundModelToString(sound->model); const char *model = qemudSoundModelToString(sound->model);
if (!model) { if (!model) {
qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
_("invalid sound model")); "%s", _("invalid sound model"));
goto cleanup; goto cleanup;
} }
virBufferVSprintf(&buf, " <sound model='%s'/>\n", model); virBufferVSprintf(&buf, " <sound model='%s'/>\n", model);