[libvirt] [PATCH] virsh: fix non-literal string format
I just pushed this under the trivial rule. These are in the newly added -V output. --- tools/virsh.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 6a9b5d9..0c91f15 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -11546,8 +11546,8 @@ vshShowVersion(vshControl *ctl ATTRIBUTE_UNUSED) vshPrint(ctl, _("Virsh command line tool of libvirt %s\n"), VERSION); vshPrint(ctl, _("See web site at %s\n\n"), "http://libvirt.org/"); - vshPrint(ctl, _("Compiled with support for:\n")); - vshPrint(ctl, _(" Hypervisors:")); + vshPrint(ctl, "%s", _("Compiled with support for:\n")); + vshPrint(ctl, "%s", _(" Hypervisors:")); #ifdef WITH_XEN vshPrint(ctl, " Xen"); #endif @@ -11583,7 +11583,7 @@ vshShowVersion(vshControl *ctl ATTRIBUTE_UNUSED) #endif vshPrint(ctl, "\n"); - vshPrint(ctl, _(" Networking:")); + vshPrint(ctl, "%s", _(" Networking:")); #ifdef WITH_REMOTE vshPrint(ctl, " Remote"); #endif @@ -11610,7 +11610,7 @@ vshShowVersion(vshControl *ctl ATTRIBUTE_UNUSED) #endif vshPrint(ctl, "\n"); - vshPrint(ctl, _(" Storage:")); + vshPrint(ctl, "%s", _(" Storage:")); #ifdef WITH_STORAGE_DIR vshPrint(ctl, " Dir"); #endif @@ -11634,7 +11634,7 @@ vshShowVersion(vshControl *ctl ATTRIBUTE_UNUSED) #endif vshPrint(ctl, "\n"); - vshPrint(ctl, _(" Miscellaneous:")); + vshPrint(ctl, "%s", _(" Miscellaneous:")); #ifdef ENABLE_SECDRIVER_APPARMOR vshPrint(ctl, " AppArmor"); #endif -- 1.7.2.3
On 11/09/2010 02:06 PM, Laine Stump wrote:
I just pushed this under the trivial rule.
These are in the newly added -V output. --- tools/virsh.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)
Admin note - Laine and I just rebased libvirt.org to fix up 'make syntax-check' by altering a botched commit message. If you happened to pull from libvirt.org during the one hour window where commit 0341fc9 was live, then you will see something like this the next time you pull: + 0341fc9...ff4a31d master -> origin/master (forced update) if you also see a merge commit, then simply running 'git rebase' will fix things up so that you're back in sync with the state of the latest upstream. -- Eric Blake eblake@redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org
On 11/09/2010 04:03 PM, Eric Blake wrote:
On 11/09/2010 02:06 PM, Laine Stump wrote:
I just pushed this under the trivial rule.
These are in the newly added -V output. --- tools/virsh.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)
Admin note - Laine and I just rebased libvirt.org to fix up 'make syntax-check' by altering a botched commit message.
If you happened to pull from libvirt.org during the one hour window where commit 0341fc9 was live, then you will see something like this the next time you pull:
+ 0341fc9...ff4a31d master -> origin/master (forced update)
if you also see a merge commit, then simply running 'git rebase' will fix things up so that you're back in sync with the state of the latest upstream.
Clarification: your choice of 'git pull --rebase', or 'git pull && git rebase origin'. -- Eric Blake eblake@redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org
participants (2)
-
Eric Blake -
Laine Stump