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

diff --git a/testsuite/systemtap.base/optim_arridx.stp b/testsuite/systemtap.base/optim_arridx.stp
index 3e4f8fd2..5c9c1051 100644
--- a/testsuite/systemtap.base/optim_arridx.stp
+++ b/testsuite/systemtap.base/optim_arridx.stp
@@ -1,7 +1,7 @@
 global arr1, arr2, arr3, elide_idx1, elide_global_a, elide_global_b
 
 function fna(a:long) {return a}
-function fnb(a:long, b:long) {return a+b+printf("")}
+function fnb(a:long, b:long) {return a+b}
 
 probe begin {
   // array indices
@@ -16,7 +16,7 @@ probe begin {
   m = 1
   for (elide_n=2; m <= 10; m++)
     arr2[m] = m * 10
-  printf ("%d %d %d %d\n", arr1[0], arr2[0,0], idx2, j)
+  printf ("%d %d %d %d\n", arr1[0,0], arr2[0], idx2, j)
   
   // function args
   aa = fna(elide_aa = 1)
@@ -40,6 +40,6 @@ probe begin {
   // binary expression
   cc = ((elide_hh = 4) + (cc = 1))
 
-  printf("%d %d %d %d %d", aa, bb, cc, dd, ee)
+  printf("%d %d %d %d %d\n", aa, bb, cc, dd, ee)
   exit ()
 }