aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Pipkin <j@dawnrazor.net>2012-11-05 04:13:29 -0600
committerJacob Pipkin <j@dawnrazor.net>2012-11-05 04:13:29 -0600
commitee3be93c8b42928a5d6edb2b763c209eeda4d643 (patch)
tree15144940886cde232d29c9a2ef45e1f07bc8b63b
parent9f653e629ca6027b577e07eea2f64876da8da587 (diff)
downloadsbotools2-ee3be93c8b42928a5d6edb2b763c209eeda4d643.tar.xz
get rid of prototypes for (readme|user)_prompt, all tests pass (tests are incomplete here)
-rwxr-xr-xsboupgrade4
-rw-r--r--sboupgradex2
2 files changed, 3 insertions, 3 deletions
diff --git a/sboupgrade b/sboupgrade
index 7a5502d..0645709 100755
--- a/sboupgrade
+++ b/sboupgrade
@@ -236,7 +236,7 @@ sub ask_opts ($) {
}
# prompt for the readme
-sub readme_prompt ($$) {
+sub readme_prompt {
exists $_[0] or script_error 'readme_prompt requires an argument.';
my ($sbo, $location) = @_;
my $fh = open_read (get_readme_path $sbo);
@@ -267,7 +267,7 @@ sub process_sbos ($) {
my %failures;
FIRST: for my $sbo (@$todo) {
my $opts = 0;
- $opts = readme_prompt $sbo, $locations{$sbo} unless $non_int;
+ $opts = readme_prompt ($sbo, $locations{$sbo}) unless $non_int;
# switch compat32 on if upgrading a -compat32
$compat32 = 1 if $sbo =~ /-compat32$/;
my ($version, $pkg, $src);
diff --git a/sboupgradex b/sboupgradex
index c20774b..9612771 100644
--- a/sboupgradex
+++ b/sboupgradex
@@ -156,7 +156,7 @@ sub ask_opts ($) {
return;
}
-sub user_prompt ($$) {
+sub user_prompt {
exists $_[1] or script_error 'user_prompt requires two arguments.';
my ($sbo, $location) = @_;
my $fh = open_read ($location .'/README');