avoid format-related warnings

* src/qemu/qemu_monitor_text.c (qemuMonitorTextGetAllPCIAddresses):
Use %s.
* src/storage/storage_backend_iscsi.c (virStorageBackendCreateIfaceIQN):
Likewise.
* tools/virsh.c (cmdSecretSetValue): Likewise.
This commit is contained in:
Jim Meyering 2010-02-01 18:25:23 +01:00
parent 6b8d8395b6
commit 4cd188d4d5
3 changed files with 5 additions and 5 deletions

View File

@ -1959,7 +1959,7 @@ int qemuMonitorTextGetAllPCIAddresses(qemuMonitorPtr mon,
if (qemuMonitorCommand(mon, "info pci", &reply) < 0) { if (qemuMonitorCommand(mon, "info pci", &reply) < 0) {
qemudReportError(NULL, NULL, NULL, VIR_ERR_OPERATION_FAILED, qemudReportError(NULL, NULL, NULL, VIR_ERR_OPERATION_FAILED,
_("cannot query PCI addresses")); "%s", _("cannot query PCI addresses"));
return -1; return -1;
} }

View File

@ -1,7 +1,7 @@
/* /*
* storage_backend_iscsi.c: storage backend for iSCSI handling * storage_backend_iscsi.c: storage backend for iSCSI handling
* *
* Copyright (C) 2007-2008 Red Hat, Inc. * Copyright (C) 2007-2008, 2010 Red Hat, Inc.
* Copyright (C) 2007-2008 Daniel P. Berrange * Copyright (C) 2007-2008 Daniel P. Berrange
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@ -259,7 +259,7 @@ virStorageBackendCreateIfaceIQN(virConnectPtr conn,
char temp_ifacename[32]; char temp_ifacename[32];
if (virRandomInitialize(time(NULL) ^ getpid()) == -1) { if (virRandomInitialize(time(NULL) ^ getpid()) == -1) {
virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, "%s",
_("Failed to initialize random generator " _("Failed to initialize random generator "
"when creating iscsi interface")); "when creating iscsi interface"));
goto out; goto out;

View File

@ -1,7 +1,7 @@
/* /*
* virsh.c: a Xen shell used to exercise the libvirt API * virsh.c: a Xen shell used to exercise the libvirt API
* *
* Copyright (C) 2005, 2007-2009 Red Hat, Inc. * Copyright (C) 2005, 2007-2010 Red Hat, Inc.
* *
* See COPYING.LIB for the License of this software * See COPYING.LIB for the License of this software
* *
@ -5482,7 +5482,7 @@ cmdSecretSetValue(vshControl *ctl, const vshCmd *cmd)
goto cleanup; goto cleanup;
if (!base64_decode_alloc(base64, strlen(base64), &value, &value_size)) { if (!base64_decode_alloc(base64, strlen(base64), &value, &value_size)) {
vshError(ctl, _("Invalid base64 data")); vshError(ctl, "%s", _("Invalid base64 data"));
goto cleanup; goto cleanup;
} }
if (value == NULL) { if (value == NULL) {