External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-12 17:19:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix up NLS warnings.

Browse Source 
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 <clalance@redhat.com>
This commit is contained in:
Chris Lalancette 2009-11-03 13:30:47 +01:00
parent 9231aa7d95
commit 991be60403
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/conf/domain_conf.c
View File

@ -1813,7 +1813,7 @@ virDomainWatchdogDefParseXML(virConnectPtr conn,
model = virXMLPropString (node, "model"); model = virXMLPropString (node, "model");
if (model == NULL) { if (model == NULL) {
virDomainReportError (conn, VIR_ERR_INTERNAL_ERROR, virDomainReportError (conn, VIR_ERR_INTERNAL_ERROR, "%s",
_("watchdog must contain model name")); _("watchdog must contain model name"));
goto error; goto error;
} }

2
src/lxc/lxc_driver.c
View File

@ -1858,7 +1858,7 @@ static int lxcSetSchedulerParameters(virDomainPtr domain,
for (i = 0; i < nparams; i++) { for (i = 0; i < nparams; i++) {
virSchedParameterPtr param = &params[i]; virSchedParameterPtr param = &params[i];
if (param->type != VIR_DOMAIN_SCHED_FIELD_ULLONG) { 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'")); _("invalid type for cpu_shares tunable, expected a 'ullong'"));
goto cleanup; goto cleanup;
} }

6
src/qemu/qemu_driver.c
View File

@ -5299,7 +5299,7 @@ static int qemuSetSchedulerParameters(virDomainPtr dom,
if (STREQ(param->field, "cpu_shares")) { if (STREQ(param->field, "cpu_shares")) {
int rc; int rc;
if (param->type != VIR_DOMAIN_SCHED_FIELD_ULLONG) { 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'")); _("invalid type for cpu_shares tunable, expected a 'ullong'"));
goto cleanup; goto cleanup;
} }
@ -6463,7 +6463,7 @@ static int doTunnelSendAll(virDomainPtr dom,
break; break;
if (virStreamSend(st, buffer, nbytes) < 0) { 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")); _("Failed to write migration data to remote libvirtd"));
return -1; return -1;
} }
@ -6685,7 +6685,7 @@ static int doNonTunnelMigrate(virDomainPtr dom,
goto cleanup; goto cleanup;
if (uri_out == NULL) { 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")); _("domainMigratePrepare2 did not set uri"));
} }

2
src/storage/storage_backend.c
View File

@ -568,7 +568,7 @@ virStorageBackendCreateQemuImg(virConnectPtr conn,
return -1; return -1;
} }
if (enc->nsecrets > 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")); _("too many secrets for qcow encryption"));
return -1; return -1;
} }