From: Julian Seward <jseward@acm.org>
Date: Mon, 13 Jun 2005 18:22:17 +0000 (+0000)
Subject: Be quieter when outputting XML.
X-Git-Tag: svn/VALGRIND_3_0_0~408
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=66755d61e5cc0ee05ef90534a1e3e28dd9c4f8ae;p=thirdparty%2Fvalgrind.git

Be quieter when outputting XML.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@3910
---

diff --git a/coregrind/m_syscalls/syscalls-generic.c b/coregrind/m_syscalls/syscalls-generic.c
index 8d53deb67e..b2f55929a1 100644
--- a/coregrind/m_syscalls/syscalls-generic.c
+++ b/coregrind/m_syscalls/syscalls-generic.c
@@ -3786,7 +3786,7 @@ PRE(sys_ioctl)
 	  */
       } else if (/* size == 0 || */ dir == _VKI_IOC_NONE) {
 	 static Int moans = 3;
-	 if (moans > 0) {
+	 if (moans > 0 && !VG_(clo_xml)) {
 	    moans--;
 	    VG_(message)(Vg_UserMsg, 
 			 "Warning: noted but unhandled ioctl 0x%x"
diff --git a/memcheck/mc_main.c b/memcheck/mc_main.c
index 1c1a8034e6..ea8edef5e5 100644
--- a/memcheck/mc_main.c
+++ b/memcheck/mc_main.c
@@ -557,7 +557,7 @@ static void set_address_range_perms ( Addr aA, SizeT len,
    if (len == 0)
       return;
 
-   if (VG_(clo_verbosity) > 0) {
+   if (VG_(clo_verbosity) > 0 && !VG_(clo_xml)) {
       if (len > 100 * 1000 * 1000) {
          VG_(message)(Vg_UserMsg, 
                       "Warning: set address range perms: "