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 22ce5399cc2dc14993982b6c6a24f5b10fd5ff67..e87bdfa0b6dcffc77d70a4b690b213c51a9bdd08 100644 (file)
--- 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 3dd71ed5f4a45b8f6673285904df6081d0753eb3..b7af264c6ef89a5d0da865783ca9bd944896d01f 100644 (file)
--- 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;
    }