From: Julian Seward <jseward@acm.org>
Date: Wed, 17 Sep 2003 21:48:26 +0000 (+0000)
Subject: Suppress a couple more messages when -q applies.
X-Git-Tag: svn/VALGRIND_2_1_0~197
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f08f0f0ca36e206e017f8c998300387aaf36daea;p=thirdparty%2Fvalgrind.git

Suppress a couple more messages when -q applies.


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

diff --git a/coregrind/vg_signals.c b/coregrind/vg_signals.c
index 22ce5399cc..e87bdfa0b6 100644
--- a/coregrind/vg_signals.c
+++ b/coregrind/vg_signals.c
@@ -601,7 +601,7 @@ void VG_(do__NR_sigaction) ( ThreadId tid )
    return;
 
   bad_signo:
-   if (VG_(needs).core_errors)
+   if (VG_(needs).core_errors && VG_(clo_verbosity) >= 1)
       VG_(message)(Vg_UserMsg,
                    "Warning: bad signal number %d in __NR_sigaction.", 
                    signo);
@@ -609,7 +609,7 @@ void VG_(do__NR_sigaction) ( ThreadId tid )
    return;
 
   bad_sigkill_or_sigstop:
-   if (VG_(needs).core_errors)
+   if (VG_(needs).core_errors && VG_(clo_verbosity) >= 1)
       VG_(message)(Vg_UserMsg,
          "Warning: attempt to set %s handler in __NR_sigaction.", 
          signo == VKI_SIGKILL ? "SIGKILL" : "SIGSTOP" );
diff --git a/memcheck/mac_leakcheck.c b/memcheck/mac_leakcheck.c
index 3dd71ed5f4..b7af264c6e 100644
--- a/memcheck/mac_leakcheck.c
+++ b/memcheck/mac_leakcheck.c
@@ -399,8 +399,10 @@ void MAC_(do_detect_memory_leaks) (
 
    if (lc_n_shadows == 0) {
       sk_assert(lc_shadows == NULL);
-      VG_(message)(Vg_UserMsg, 
-                   "No malloc'd blocks -- no leaks are possible.");
+      if (VG_(clo_verbosity) >= 1) {
+         VG_(message)(Vg_UserMsg, 
+                      "No malloc'd blocks -- no leaks are possible.");
+      }
       return;
    }