commit 1fa7d2cf9890a250d9b98b8640347abd40c5cd8c
author sewardj <sewardj@a5019735-40e9-0310-863c-91ae7b9d1cf9> Mon Jun 13 18:22:17 2005 +0000
committer sewardj <sewardj@a5019735-40e9-0310-863c-91ae7b9d1cf9> Mon Jun 13 18:22:17 2005 +0000
tree a7e0f3829a225a3b95da144ec36cede66b53fe24
parent 7cee6f99bd38612f2d1c0102d75ca55839601538

Be quieter when outputting XML.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@3910 a5019735-40e9-0310-863c-91ae7b9d1cf9

coregrind/m_syscalls/syscalls-generic.c

diff --git a/coregrind/m_syscalls/syscalls-generic.c b/coregrind/m_syscalls/syscalls-generic.c
index 8d53deb..b2f5592 100644
--- a/coregrind/m_syscalls/syscalls-generic.c
+++ b/coregrind/m_syscalls/syscalls-generic.c
@@ -3786,7 +3786,7 @@
 	  */
       } 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"

memcheck/mc_main.c

diff --git a/memcheck/mc_main.c b/memcheck/mc_main.c
index 1c1a803..ea8edef 100644
--- a/memcheck/mc_main.c
+++ b/memcheck/mc_main.c
@@ -557,7 +557,7 @@
    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: "