suppress "pass-2 failed" messages from "stap -l FOOBAR"; just produce empty output

3 files changed, 10 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 139ae6ac..92aad43b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2008-05-17  Frank Ch. Eigler  <fche@elastic.org>
 
+	* elaborate.cxx (semantic_pass): Error on #probes=0, but not in
+	listing mode.
+	(semantic_pass_optimize[12]): Remove inappropriate check from here.
+
+2008-05-17  Frank Ch. Eigler  <fche@elastic.org>
+
 	* tapsets.cxx (cu_function_cache_t): Switch to <ext/hash_map>s,
 	since these tables tend to get pretty big.
 
diff --git a/elaborate.cxx b/elaborate.cxx
index 0e454937..9a817cba 100644
--- a/elaborate.cxx
+++ b/elaborate.cxx
@@ -1159,6 +1159,9 @@ semantic_pass (systemtap_session& s)
       if (rc == 0 && ! s.unoptimized) rc = semantic_pass_optimize2 (s);
       if (rc == 0) rc = semantic_pass_vars (s);
       if (rc == 0) rc = semantic_pass_stats (s);
+      
+      if (s.probes.size() == 0 && !s.listing_mode)
+        throw semantic_error ("no probes found");
     }
   catch (const semantic_error& e)
     {
@@ -2139,9 +2142,6 @@ semantic_pass_optimize1 (systemtap_session& s)
       semantic_pass_opt4 (s, relaxed_p);
     }
 
-  if (s.probes.size() == 0)
-    throw semantic_error ("no probes found");
-
   return rc;
 }
 
@@ -2164,9 +2164,6 @@ semantic_pass_optimize2 (systemtap_session& s)
       semantic_pass_opt5 (s, relaxed_p);
     }
 
-  if (s.probes.size() == 0)
-    throw semantic_error ("no probes found");
-
   return rc;
 }
 
diff --git a/main.cxx b/main.cxx
index eadbd694..b53499b7 100644
--- a/main.cxx
+++ b/main.cxx
@@ -242,7 +242,7 @@ printscript(systemtap_session& s, ostream& o)
             }
         }
     }
-    }
+}
 
 
 int pending_interrupts;