2006-01-03 Frank Ch. Eigler <fche@redhat.com>

	* tapsets.cxx (emit_deregistration): Fix bad thinko on loop nesting.

2 files changed, 8 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index e1f6ed91..de45d2eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2006-01-03  Frank Ch. Eigler  <fche@redhat.com>
 
+	* tapsets.cxx (emit_deregistration): Fix bad thinko on loop nesting.
+
+2006-01-03  Frank Ch. Eigler  <fche@redhat.com>
+
 	PR 1144, 1379
 	* tapsets.cxx (emit_probe_prologue, _epilogue): New routines.
 	Call from existing derived_probe spots.  Implement soft errors in
diff --git a/tapsets.cxx b/tapsets.cxx
index a6c57b80..b6533a10 100644
--- a/tapsets.cxx
+++ b/tapsets.cxx
@@ -2965,32 +2965,32 @@ dwarf_derived_probe::emit_deregistrations (translator_output* o, unsigned proben
 {
   o->newline() << "{";
   o->newline(1) << "int i;";
-  o->newline() << "for (i = 0; i < " << probe_points.size() << "; i++)";
+  o->newline() << "for (i = 0; i < " << probe_points.size() << "; i++) {";
   string probe_name = struct_kprobe_array_name(probenum) + "[i]";
   o->indent(1);
   if (has_return)
     {
       o->newline() << "#ifdef ARCH_SUPPORTS_KRETPROBES";
-      o->newline() << "unregister_kretprobe (&(" << probe_name << "));";
       o->newline() << "atomic_add ("
                    << probe_name << ".kp.nmissed,"
                    << "& skipped_count);";
       o->newline() << "atomic_add ("
                    << probe_name << ".nmissed,"
                    << "& skipped_count);";
+      o->newline() << "unregister_kretprobe (&(" << probe_name << "));";
       o->newline() << "#else";
       o->newline() << ";";
       o->newline() << "#endif";
     }
   else
     {
-      o->newline() << "unregister_kprobe (&(" << probe_name << "));";
       o->newline() << "atomic_add ("
                    << probe_name << ".nmissed,"
                    << "& skipped_count);";
+      o->newline() << "unregister_kprobe (&(" << probe_name << "));";
     }
 
-  o->indent(-1);
+  o->newline(-1) << "}";
   o->newline(-1) << "}";
 }