From cb4a6614fae48d05f09b7b15328ea6ef4071ccb3 Mon Sep 17 00:00:00 2001
From: "Daniel P. Berrange" <berrange@redhat.com>
Date: Tue, 28 Apr 2009 10:55:45 +0000
Subject: [PATCH] Fix check for -Wformat-security which depends on -Wformat

---
 ChangeLog            |  7 +++++++
 m4/compiler-flags.m4 | 10 +++++++++-
 src/virsh.c          |  6 +++---
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 05b0712905..ee39b0106d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Apr 28 11:54:22 BST 2009 Daniel P. Berrange <berrange@redhat.com>
+
+	Fix check for -Wformat-security which depends on -Wformat
+	* m4/compiler-flags.m4: Set previously verified compiler flags
+	when checking new flags
+	* srv/virsh.c: Fix three non-critical format string bugs
+
 Fri Apr 24 15:55:56 CEST 2009 Daniel Veillard <veillard@redhat.com>
 
 	* NEWS configure.in libvirt.spec.in docs/*: release of 0.6.3
diff --git a/m4/compiler-flags.m4 b/m4/compiler-flags.m4
index 4940a1e6dc..de359a5e47 100644
--- a/m4/compiler-flags.m4
+++ b/m4/compiler-flags.m4
@@ -24,7 +24,15 @@ AC_DEFUN([gl_COMPILER_FLAGS],
   [AC_MSG_CHECKING(whether compiler accepts $1)
    AC_SUBST(COMPILER_FLAGS)
    ac_save_CFLAGS="$CFLAGS"
-   CFLAGS="$CFLAGS $1"
+   dnl Some flags are dependant, so we set all previously checked
+   dnl flags when testing. Except for -Werror which we have to 
+   dnl check on its own, because some of our compiler flags cause
+   dnl warnings from the autoconf test program!
+   if test "$1" = "-Werror" ; then
+     CFLAGS="$CFLAGS $1"
+   else
+     CFLAGS="$CFLAGS $COMPILER_FLAGS $1"
+   fi
    AC_TRY_LINK([], [], has_option=yes, has_option=no,)
    echo 'int x;' >conftest.c
    $CC $CFLAGS -c conftest.c 2>conftest.err
diff --git a/src/virsh.c b/src/virsh.c
index 96946e8858..2e41c02072 100644
--- a/src/virsh.c
+++ b/src/virsh.c
@@ -4463,7 +4463,7 @@ cmdNodeListDevicesPrint(vshControl *ctl,
     }
 
     /* Print this device */
-    vshPrint(ctl, indentBuf);
+    vshPrint(ctl, "%s", indentBuf);
     vshPrint(ctl, "%s\n", devices[devid]);
 
 
@@ -4487,7 +4487,7 @@ cmdNodeListDevicesPrint(vshControl *ctl,
 
     /* If there is a child device, then print another blank line */
     if (nextlastdev != -1) {
-        vshPrint(ctl, indentBuf);
+        vshPrint(ctl, "%s", indentBuf);
         vshPrint(ctl, "  |\n");
     }
 
@@ -4511,7 +4511,7 @@ cmdNodeListDevicesPrint(vshControl *ctl,
     /* If there was no child device, and we're the last in
      * a list of devices, then print another blank line */
     if (nextlastdev == -1 && devid == lastdev) {
-        vshPrint(ctl, indentBuf);
+        vshPrint(ctl, "%s", indentBuf);
         vshPrint(ctl, "\n");
     }
 }
-- 
2.39.5