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, 4 insertions, 4 deletions

diff --git a/util.h b/util.h
index 7c627ee9..6c69c998 100644
--- a/util.h
+++ b/util.h
@@ -27,7 +27,7 @@ stringify(T t)
 }
 
 
-template <typename OUT, typename IN> 
+template <typename OUT, typename IN>
 inline OUT lex_cast(IN const & in)
 {
   std::stringstream ss;
@@ -39,7 +39,7 @@ inline OUT lex_cast(IN const & in)
 }
 
 
-template <typename OUT, typename IN> 
+template <typename OUT, typename IN>
 inline OUT
 lex_cast_hex(IN const & in)
 {
@@ -54,7 +54,7 @@ lex_cast_hex(IN const & in)
 
 // Return as quoted string, so that when compiled as a C literal, it
 // would print to the user out nicely.
-template <typename IN> 
+template <typename IN>
 inline std::string
 lex_cast_qstring(IN const & in)
 {
@@ -74,7 +74,7 @@ lex_cast_qstring(IN const & in)
           out2 += "01234567" [(c >> 6) & 0x07];
           out2 += "01234567" [(c >> 3) & 0x07];
           out2 += "01234567" [(c >> 0) & 0x07];
-        }        
+        }
       else if (c == '"' || c == '\\')
         {
           out2 += '\\';