External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

Fix compilation with configure --disable-nls

Browse Source
This commit is contained in:
Matthias Bolte 2009-12-21 22:16:25 +01:00
parent 434daaff9a
commit d4c1e5aeed
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cpu/cpu.c
View File

@ -48,7 +48,7 @@ cpuGetSubDriver(virConnectPtr conn,
if (arch == NULL) { if (arch == NULL) {
virCPUReportError(conn, VIR_ERR_INTERNAL_ERROR, virCPUReportError(conn, VIR_ERR_INTERNAL_ERROR,
_("undefined hardware architecture")); "%s", _("undefined hardware architecture"));
return NULL; return NULL;
} }
@ -130,7 +130,7 @@ cpuDecode(virConnectPtr conn,
if (cpu == NULL) { if (cpu == NULL) {
virCPUReportError(conn, VIR_ERR_INTERNAL_ERROR, virCPUReportError(conn, VIR_ERR_INTERNAL_ERROR,
_("invalid CPU definition")); "%s", _("invalid CPU definition"));
return -1; return -1;
} }

2
src/cpu/cpu_map.c
View File

@ -79,7 +79,7 @@ int cpuMapLoad(const char *arch,
if (arch == NULL) { if (arch == NULL) {
virCPUReportError(NULL, VIR_ERR_INTERNAL_ERROR, virCPUReportError(NULL, VIR_ERR_INTERNAL_ERROR,
_("undefined hardware architecture")); "%s", _("undefined hardware architecture"));
return -1; return -1;
} }

20
src/qemu/qemu_monitor_json.c
View File

@ -645,7 +645,7 @@ int qemuMonitorJSONGetBlockStatsInfo(qemuMonitorPtr mon,
devices = virJSONValueObjectGet(reply, "return"); devices = virJSONValueObjectGet(reply, "return");
if (!devices || devices->type != VIR_JSON_TYPE_ARRAY) { if (!devices || devices->type != VIR_JSON_TYPE_ARRAY) {
qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "%s",
_("blockstats reply was missing device list")); _("blockstats reply was missing device list"));
goto cleanup; goto cleanup;
} }
@ -655,13 +655,13 @@ int qemuMonitorJSONGetBlockStatsInfo(qemuMonitorPtr mon,
virJSONValuePtr stats; virJSONValuePtr stats;
const char *thisdev; const char *thisdev;
if (!dev || dev->type != VIR_JSON_TYPE_OBJECT) { if (!dev || dev->type != VIR_JSON_TYPE_OBJECT) {
qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "%s",
_("blockstats device entry was not in expected format")); _("blockstats device entry was not in expected format"));
goto cleanup; goto cleanup;
} }
if ((thisdev = virJSONValueObjectGetString(dev, "device")) == NULL) { if ((thisdev = virJSONValueObjectGetString(dev, "device")) == NULL) {
qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "%s",
_("blockstats device entry was not in expected format")); _("blockstats device entry was not in expected format"));
goto cleanup; goto cleanup;
} }
@ -672,7 +672,7 @@ int qemuMonitorJSONGetBlockStatsInfo(qemuMonitorPtr mon,
found = 1; found = 1;
if ((stats = virJSONValueObjectGet(dev, "stats")) == NULL || if ((stats = virJSONValueObjectGet(dev, "stats")) == NULL ||
stats->type != VIR_JSON_TYPE_OBJECT) { stats->type != VIR_JSON_TYPE_OBJECT) {
qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "%s",
_("blockstats stats entry was not in expected format")); _("blockstats stats entry was not in expected format"));
goto cleanup; goto cleanup;
} }
@ -919,13 +919,13 @@ qemuMonitorJSONGetMigrationStatusReply(virJSONValuePtr reply,
char *statusstr; char *statusstr;
if (!(ret = virJSONValueObjectGet(reply, "return"))) { if (!(ret = virJSONValueObjectGet(reply, "return"))) {
qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "%s",
_("info migration reply was missing return data")); _("info migration reply was missing return data"));
return -1; return -1;
} }
if (!(statusstr = virJSONValueObjectGetString(ret, "status"))) { if (!(statusstr = virJSONValueObjectGetString(ret, "status"))) {
qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "%s",
_("info migration reply was missing return status")); _("info migration reply was missing return status"));
return -1; return -1;
} }
@ -1214,25 +1214,25 @@ qemuMonitorJSONGetGuestAddress(virJSONValuePtr reply,
addr = virJSONValueObjectGet(reply, "return"); addr = virJSONValueObjectGet(reply, "return");
if (!addr || addr->type != VIR_JSON_TYPE_OBJECT) { if (!addr || addr->type != VIR_JSON_TYPE_OBJECT) {
qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "%s",
_("pci_add reply was missing device address")); _("pci_add reply was missing device address"));
return -1; return -1;
} }
if (virJSONValueObjectGetNumberUint(addr, "domain", guestDomain) < 0) { if (virJSONValueObjectGetNumberUint(addr, "domain", guestDomain) < 0) {
qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "%s",
_("pci_add reply was missing device domain number")); _("pci_add reply was missing device domain number"));
return -1; return -1;
} }
if (virJSONValueObjectGetNumberUint(addr, "bus", guestBus) < 0) { if (virJSONValueObjectGetNumberUint(addr, "bus", guestBus) < 0) {
qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "%s",
_("pci_add reply was missing device bus number")); _("pci_add reply was missing device bus number"));
return -1; return -1;
} }
if (virJSONValueObjectGetNumberUint(addr, "slot", guestSlot) < 0) { if (virJSONValueObjectGetNumberUint(addr, "slot", guestSlot) < 0) {
qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "%s",
_("pci_add reply was missing device slot number")); _("pci_add reply was missing device slot number"));
return -1; return -1;
} }