Merge commit 'origin/master' into pr4225

* commit 'origin/master':
  PR5686: correct regression in semok/optimize.stp
  trailing whitespace removal, as approved by emacs
  fix global-var array index rendering
  fix NEWS to refer to simpler context.stp tapset functions in auto-printing blurb
  Document written but unread global variable automatic display.
  2nd try
  initial
  Make _get_sock_addr return correct address in kernel before 2.6.16.
  Automatically print written but unread globals
  Make nodwf test passed when CONFIG_QUOTACTL unset
  Uses STAPCONF_DPATH_PATH instead of a kernel version check.
  Simplified "rpm" target a bit.
  Moved tar archive creation step from "rpm" target to "dist-gzip" target.
  remove support for "make dist" since git-archive does as well;
  Examples html files moved into subdir.
  2008-08-25  David Smith  <dsmith@redhat.com>
  ChangeLog Entries
  Robustness improvements for the stap client/server

1 files changed, 8 insertions, 8 deletions

diff --git a/main.cxx b/main.cxx
index a2ceb656..8807a03d 100644
--- a/main.cxx
+++ b/main.cxx
@@ -79,7 +79,7 @@ usage (systemtap_session& s, int exitcode)
     << "   -u         unoptimized translation" << (s.unoptimized ? " [set]" : "") << endl
     << "   -w         suppress warnings" << (s.suppress_warnings ? " [set]" : "") << endl
     << "   -g         guru mode" << (s.guru_mode ? " [set]" : "") << endl
-    << "   -P         prologue-searching for function probes" 
+    << "   -P         prologue-searching for function probes"
     << (s.prologue_searching ? " [set]" : "") << endl
     << "   -b         bulk (percpu file) mode" << (s.bulk_mode ? " [set]" : "") << endl
     << "   -s NUM     buffer size in megabytes, instead of "
@@ -165,7 +165,7 @@ printscript(systemtap_session& s, ostream& o)
             {
               assert (a->alias_names.size() >= 1);
               a->alias_names[0]->print(tmps); // XXX: [0] is arbitrary; perhaps print all
-            }            
+            }
           else
             {
               assert (second->locations.size() >= 1);
@@ -193,7 +193,7 @@ printscript(systemtap_session& s, ostream& o)
           ec->print (o);
           o << endl;
         }
-      
+
       if (s.globals.size() > 0)
         o << "# globals" << endl;
       for (unsigned i=0; i<s.globals.size(); i++)
@@ -207,7 +207,7 @@ printscript(systemtap_session& s, ostream& o)
             }
           o << endl;
         }
-      
+
       if (s.functions.size() > 0)
         o << "# functions" << endl;
       for (unsigned i=0; i<s.functions.size(); i++)
@@ -230,7 +230,7 @@ printscript(systemtap_session& s, ostream& o)
               o << endl;
             }
         }
-      
+
       if (s.probes.size() > 0)
         o << "# probes" << endl;
       for (unsigned i=0; i<s.probes.size(); i++)
@@ -349,7 +349,7 @@ main (int argc, char * const argv [])
   s.ignore_dwarf = false;
 
   const char* s_p = getenv ("SYSTEMTAP_TAPSET");
-  if (s_p != NULL)  
+  if (s_p != NULL)
   {
     s.include_path.push_back (s_p);
   }
@@ -719,7 +719,7 @@ main (int argc, char * const argv [])
     const char* tmpdir_env = getenv("TMPDIR");
     if (! tmpdir_env)
       tmpdir_env = "/tmp";
-    
+
     string stapdir = "/stapXXXXXX";
     string tmpdirt = tmpdir_env + stapdir;
     mode_t mask = umask(0);
@@ -742,7 +742,7 @@ main (int argc, char * const argv [])
   // directory.
   s.translated_source = string(s.tmpdir) + "/" + s.module_name + ".c";
 
-  // Set up our handler to catch routine signals, to allow clean 
+  // Set up our handler to catch routine signals, to allow clean
   // and reasonably timely exit.
   setup_signals(&handle_interrupt);