In regen/uconfig_h.pl use read_only_bottom_close_and_rename().

This eliminates the only remaining external caller of read_only_bottom(), so
inline read_only_bottom() into read_only_bottom_close_and_rename().

diff --git a/regen/regen_lib.pl b/regen/regen_lib.pl
index f43fb50..e18a3ba 100644 (file)
--- a/regen/regen_lib.pl
+++ b/regen/regen_lib.pl
@@ -130,8 +130,12 @@ EOM
     return $cooked;
 }
 
-sub read_only_bottom {
-    my ($sources, $lang) = @_;
+sub read_only_bottom_close_and_rename {
+    my ($fh, $sources) = @_;
+    my $name = *{$fh}->{name};
+    my $lang = *{$fh}->{lang};
+    die "No final name specified at open time for $name"
+       unless *{$fh}->{final_name};
 
     my $comment;
     if ($sources) {
@@ -150,17 +154,7 @@ sub read_only_bottom {
        $comment =~ s! \* !/* !;
        $comment .= " */";
     }
-    return "$comment\n";
-}
-
-sub read_only_bottom_close_and_rename {
-    my ($fh, $sources) = @_;
-    my $name = *{$fh}->{name};
-    my $lang = *{$fh}->{lang};
-    die "No final name specified at open time for $name"
-       unless *{$fh}->{final_name};
-
-    print $fh "\n", read_only_bottom($sources, $lang);
+    print $fh "\n$comment\n";
 
     close_and_rename($fh);
 }

diff --git a/regen/uconfig_h.pl b/regen/uconfig_h.pl
index ae85f42..99a74f1 100755 (executable)
--- a/regen/uconfig_h.pl
+++ b/regen/uconfig_h.pl
@@ -24,6 +24,4 @@ system $command and die "`$command` failed, \$?=$?";
 
 my $fh = open_new($uconfig_h, '>>');
 
-print $fh "\n", read_only_bottom([$ENV{CONFIG_SH}, 'config_h.SH']);
-
-close_and_rename($fh);
+read_only_bottom_close_and_rename($fh, [$ENV{CONFIG_SH}, 'config_h.SH']);