2007-04-06 Martin Hunt <hunt@redhat.com>

	* stp_merge.c (main): Remove extra newline in output.
	* stap_merge.c: Renamed from stp_merge.c.
	* Makefile: Updated.

diff --git a/runtime/staprun/ChangeLog b/runtime/staprun/ChangeLog
index b948db55e4755742f2ffffad2380ced2c099f470..a50c27795f1312e46e7b0bff6c7d419d9b863828 100644 (file)
--- a/runtime/staprun/ChangeLog
+++ b/runtime/staprun/ChangeLog
@@ -1,3 +1,9 @@
+2007-04-06  Martin Hunt  <hunt@redhat.com>
+
+       * stp_merge.c (main): Remove extra newline in output.
+       * stap_merge.c: Renamed from stp_merge.c.
+       * Makefile: Updated.
+
 2007-04-02  Martin Hunt  <hunt@redhat.com>
 
        * relay_old.c (close_oldrelayfs): If just detaching, call

diff --git a/runtime/staprun/Makefile b/runtime/staprun/Makefile
index e8dd680d91603751e32f3699a2ccd573cc3a7952..b0329d3e66c1f913deb37675fc2cd55fa18fc958 100644 (file)
--- a/runtime/staprun/Makefile
+++ b/runtime/staprun/Makefile
@@ -1,15 +1,15 @@
 CFLAGS = -Wall -std=gnu99 -D_GNU_SOURCE -fexceptions -Wall -Werror -Wshadow -Wunused
 
-all: staprun stp_merge
+all: staprun stap_merge
 
 staprun: staprun.c mainloop.c relay.c ctl.c symbols.c ../transport/transport_msgs.h staprun.h
        gcc -O3 $(CFLAGS) -o staprun staprun.c mainloop.c symbols.c ctl.c relay.c relay_old.c -lpthread
 
-stp_merge: stp_merge.c
-       gcc -O3 $(CFLAGS) -o stp_merge stp_merge.c
+stap_merge: stap_merge.c
+       gcc -O3 $(CFLAGS) -o stap_merge stap_merge.c
 
 debug: staprun.c mainloop.c relay.c ctl.c symbols.c ../transport/transport_msgs.h staprun.h
        gcc -g -D DEBUG $(CFLAGS) -o staprun staprun.c mainloop.c symbols.c ctl.c relay.c relay_old.c -lpthread 
 
 clean:
-       /bin/rm -f staprun stp_merge *.o *~
+       /bin/rm -f staprun stap_merge *.o *~

diff --git a/runtime/staprun/stp_merge.c b/runtime/staprun/stap_merge.c
similarity index 99%
rename from runtime/staprun/stp_merge.c
rename to runtime/staprun/stap_merge.c
index 225d8d79b59f9b9f5f63eda1cf4ef1311cc08f6d..20de1f2a9126b875c72eecd0e715bb4afb1f2c55 100644 (file)
--- a/runtime/staprun/stp_merge.c
+++ b/runtime/staprun/stap_merge.c
@@ -109,8 +109,6 @@ int main (int argc, char *argv[])
                        num[j] = 0;
        } while (min);
 
-       fputs ("\n", ofp);
-
        for (i = 0; i < ncpus; i++)
                fclose (fp[i]);
        fclose (ofp);