From c3157bcd428bdf98a548688cca4b13ecc1622463 Mon Sep 17 00:00:00 2001
From: "Frank Ch. Eigler" <fche@elastic.org>
Date: Wed, 26 Nov 2008 16:52:34 -0500
Subject: PR6925: improve upon "Try again with another -v option" message

---
 main.cxx | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'main.cxx')

diff --git a/main.cxx b/main.cxx
index 406228ae..2646cecd 100644
--- a/main.cxx
+++ b/main.cxx
@@ -939,7 +939,7 @@ main (int argc, char * const argv [])
 
   if (rc)
     cerr << "Pass 1: parse failed.  "
-         << "Try again with more '-v' (verbose) options."
+         << "Try again with another '--vp 1' option."
          << endl;
 
   if (rc || s.last_pass == 1 || pending_interrupts) goto cleanup;
@@ -967,7 +967,7 @@ main (int argc, char * const argv [])
 
   if (rc)
     cerr << "Pass 2: analysis failed.  "
-         << "Try again with more '-v' (verbose) options."
+         << "Try again with another '--vp 01' option."
          << endl;
   // Generate hash.  There isn't any point in generating the hash
   // if last_pass is 2, since we'll quit before using it.
@@ -1026,7 +1026,7 @@ main (int argc, char * const argv [])
 
   if (rc)
     cerr << "Pass 3: translation failed.  "
-         << "Try again with more '-v' (verbose) options."
+         << "Try again with another '--vp 001' option."
          << endl;
 
   if (rc || s.last_pass == 3 || pending_interrupts) goto cleanup;
@@ -1054,7 +1054,7 @@ main (int argc, char * const argv [])
 
   if (rc)
     cerr << "Pass 4: compilation failed.  "
-         << "Try again with more '-v' (verbose) options."
+         << "Try again with another '--vp 0001' option."
          << endl;
   else
     {
@@ -1098,7 +1098,7 @@ pass_5:
 
   if (rc)
     cerr << "Pass 5: run failed.  "
-         << "Try again with more '-v' (verbose) options."
+         << "Try again with another '--vp 00001' option."
          << endl;
 
   // if (rc) goto cleanup;
-- 
cgit 


From c31df222427089e752256c58fceb6f077bdc53ce Mon Sep 17 00:00:00 2001
From: "Frank Ch. Eigler" <fche@elastic.org>
Date: Wed, 26 Nov 2008 16:59:35 -0500
Subject: fix valgrind warning with setting s.verbose too late during
 initialization

---
 main.cxx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'main.cxx')

diff --git a/main.cxx b/main.cxx
index 2646cecd..0cc47804 100644
--- a/main.cxx
+++ b/main.cxx
@@ -746,6 +746,9 @@ main (int argc, char * const argv [])
     }
 
   int rc = 0;
+  
+  // PASS 0: setting up
+  s.verbose = s.perpass_verbose[0];
 
   // For PR1477, we used to override $PATH and $LC_ALL and other stuff
   // here.  We seem to use complete pathnames in
@@ -804,7 +807,6 @@ main (int argc, char * const argv [])
 
   // PASS 1a: PARSING USER SCRIPT
 
-  s.verbose = s.perpass_verbose[0];
   struct stat user_file_stat;
   int user_file_stat_rc = -1;
 
@@ -1103,6 +1105,7 @@ pass_5:
 
   // if (rc) goto cleanup;
 
+  // PASS 6: cleaning up
  cleanup:
 
   // update the database information
-- 
cgit