From: Julian Seward <jseward@acm.org>
Date: Fri, 9 Nov 2007 11:33:02 +0000 (+0000)
Subject: Don't print warnings about silly args to malloc/calloc in XML mode.
X-Git-Tag: svn/VALGRIND_3_3_0~177
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5338c831dbbbb247126cc46b3af105879d6475f9;p=thirdparty%2Fvalgrind.git

Don't print warnings about silly args to malloc/calloc in XML mode.


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

diff --git a/memcheck/mc_malloc_wrappers.c b/memcheck/mc_malloc_wrappers.c
index 57b6b545a9..7ed5dffece 100644
--- a/memcheck/mc_malloc_wrappers.c
+++ b/memcheck/mc_malloc_wrappers.c
@@ -153,8 +153,9 @@ static Bool complain_about_silly_args(SizeT sizeB, Char* fn)
    // assuming here that the size asked for is not greater than 2^31 bytes
    // (for 32-bit platforms) or 2^63 bytes (for 64-bit platforms).
    if ((SSizeT)sizeB < 0) {
-      VG_(message)(Vg_UserMsg, "Warning: silly arg (%ld) to %s()",
-                   (SSizeT)sizeB, fn );
+      if (!VG_(clo_xml)) 
+         VG_(message)(Vg_UserMsg, "Warning: silly arg (%ld) to %s()",
+                      (SSizeT)sizeB, fn );
       return True;
    }
    return False;
@@ -163,8 +164,10 @@ static Bool complain_about_silly_args(SizeT sizeB, Char* fn)
 static Bool complain_about_silly_args2(SizeT n, SizeT sizeB)
 {
    if ((SSizeT)n < 0 || (SSizeT)sizeB < 0) {
-      VG_(message)(Vg_UserMsg, "Warning: silly args (%ld,%ld) to calloc()",
-                   (SSizeT)n, (SSizeT)sizeB);
+      if (!VG_(clo_xml))
+         VG_(message)(Vg_UserMsg,
+                      "Warning: silly args (%ld,%ld) to calloc()",
+                      (SSizeT)n, (SSizeT)sizeB);
       return True;
    }
    return False;