On Tue, Dec 22, 2009 at 02:14:50AM +0100, Matthias Bolte wrote:
> ---
> src/cpu/cpu.c | 4 ++--
> src/cpu/cpu_map.c | 2 +-
> src/qemu/qemu_monitor_json.c | 20 ++++++++++----------
> 3 files changed, 13 insertions(+), 13 deletions(-)
>
> diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c
> index e822f22..975ca28 100644
> --- a/src/cpu/cpu.c
> +++ b/src/cpu/cpu.c
> @@ -48,7 +48,7 @@ cpuGetSubDriver(virConnectPtr conn,
>
> if (arch == NULL) {
> virCPUReportError(conn, VIR_ERR_INTERNAL_ERROR,
> - _("undefined hardware architecture"));
> + "%s", _("undefined hardware architecture"));
> return NULL;
> }
>
> @@ -130,7 +130,7 @@ cpuDecode(virConnectPtr conn,
>
> if (cpu == NULL) {
> virCPUReportError(conn, VIR_ERR_INTERNAL_ERROR,
> - _("invalid CPU definition"));
> + "%s", _("invalid CPU definition"));
> return -1;
> }
>
> diff --git a/src/cpu/cpu_map.c b/src/cpu/cpu_map.c
> index 067f6ff..d615e15 100644
> --- a/src/cpu/cpu_map.c
> +++ b/src/cpu/cpu_map.c
> @@ -79,7 +79,7 @@ int cpuMapLoad(const char *arch,
>
> if (arch == NULL) {
> virCPUReportError(NULL, VIR_ERR_INTERNAL_ERROR,
> - _("undefined hardware architecture"));
> + "%s", _("undefined hardware architecture"));
> return -1;
> }
>
> diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
> index 03562e8..b96f4ac 100644
> --- a/src/qemu/qemu_monitor_json.c
> +++ b/src/qemu/qemu_monitor_json.c
> @@ -645,7 +645,7 @@ int qemuMonitorJSONGetBlockStatsInfo(qemuMonitorPtr mon,
>
> devices = virJSONValueObjectGet(reply, "return");
> 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"));
> goto cleanup;
> }
> @@ -655,13 +655,13 @@ int qemuMonitorJSONGetBlockStatsInfo(qemuMonitorPtr mon,
> virJSONValuePtr stats;
> const char *thisdev;
> 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"));
> goto cleanup;
> }
>
> 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"));
> goto cleanup;
> }
> @@ -672,7 +672,7 @@ int qemuMonitorJSONGetBlockStatsInfo(qemuMonitorPtr mon,
> found = 1;
> if ((stats = virJSONValueObjectGet(dev, "stats")) == NULL ||
> 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"));
> goto cleanup;
> }
> @@ -919,13 +919,13 @@ qemuMonitorJSONGetMigrationStatusReply(virJSONValuePtr reply,
> char *statusstr;
>
> 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"));
> return -1;
> }
>
> 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"));
> return -1;
> }
> @@ -1214,25 +1214,25 @@ qemuMonitorJSONGetGuestAddress(virJSONValuePtr reply,
>
> addr = virJSONValueObjectGet(reply, "return");
> 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"));
> return -1;
> }
>
> 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"));
> return -1;
> }
>
> 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"));
> return -1;
> }
>
> 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"));
> return -1;
> }
ACK, thanks !
Daniel
--
Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/
daniel@xxxxxxxxxxxx | Rpmfind RPM search engine http://rpmfind.net/
http://veillard.com/ | virtualization library http://libvirt.org/
--
Libvir-list mailing list
Libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list