On Mon, Mar 08, 2010 at 10:01:25PM -0500, Laine Stump wrote:

A few more non-literal format strings in error log messages have crept in. Fix them in the standard way - turn the format string into "%s" with the original string as the arg. --- src/qemu/qemu_conf.c | 2 +- src/xen/xend_internal.c | 2 +- src/xen/xm_internal.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index c93baec..40ca221 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -3033,7 +3033,7 @@ qemuBuildVirtioSerialPortDevStr(virDomainChrDefPtr dev) VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_SERIAL) { qemuReportError(VIR_ERR_INTERNAL_ERROR, - _("virtio serial device has invalid address type")); + "%s", _("virtio serial device has invalid address type")); goto error; }

diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index cd7177b..8b4e49e 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -5848,7 +5848,7 @@ xenDaemonFormatSxpr(virConnectPtr conn, if (def->clock.offset == VIR_DOMAIN_CLOCK_OFFSET_LOCALTIME) { if (def->clock.data.timezone) { virXendError(conn, VIR_ERR_CONFIG_UNSUPPORTED, - _("configurable timezones are not supported")); + "%s", _("configurable timezones are not supported")); goto error; }

diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c index 0973b43..2d0f1d5 100644 --- a/src/xen/xm_internal.c +++ b/src/xen/xm_internal.c @@ -2330,7 +2330,7 @@ virConfPtr xenXMDomainConfigFormat(virConnectPtr conn, if (def->clock.offset == VIR_DOMAIN_CLOCK_OFFSET_LOCALTIME) { if (def->clock.data.timezone) { xenXMError(conn, VIR_ERR_CONFIG_UNSUPPORTED, - _("configurable timezones are not supported")); + "%s", _("configurable timezones are not supported")); goto cleanup; }

Okay, cleanup pushed, thanks! Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel@veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/