Clean up kernel-doc SystemTap function formatting.

diff --git a/ChangeLog b/ChangeLog
index 022194d25c92a7b79c22f008fb1ad393e81b9264..01adb05faa9e25b8604b061fa6bea5cb871cca77 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-11-25  Will Cohen <wcohen@redhat.com>
+
+       * scripts/kernel-doc: Clean up SystemTap function formatting.
+       
 2008-11-25  Will Cohen <wcohen@redhat.com>
 
        * scripts/kernel-doc: Make executable.

diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index 1ed34323f46229717131b359ca5f8adbfc2e4bd6..dd18ed6954ae738b9502d8e362ae17da64012b9f 100755 (executable)
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -1053,21 +1053,20 @@ sub output_sfunction_xml(%) {
     print "<refsynopsisdiv>\n";
     print " <title>Synopsis</title>\n";
     print "  <programlisting>\n";
-    print "    ".$args{'sfunction'}.":";
-    print $args{'functiontype'}."(\n";
+    print "    ".$args{'sfunction'};
+    if ($args{'functiontype'}) { print ":".$args{'functiontype'} }
+    print "(";
 
     $count = $#{$args{'parameterlist'}};
     if ($count >= 0) {
        foreach $parameter (@{$args{'parameterlist'}}) {
            $type = $args{'parametertypes'}{$parameter};
-           print "        ".$parameter.":".$type;
+           print $parameter.":".$type;
            $count -= 1;
-           if ($count >= 0) { print ",\n"; }
+           if ($count >= 0) { print ","; } 
        }
-    } else {
-       print "  ";
     }
-    print "\n    );\n</programlisting>\n";
+    print ")\n</programlisting>\n";
     print "</refsynopsisdiv>\n";
 
     # print parameters