Commit 994a9404 authored by Ryan Jackson's avatar Ryan Jackson
Browse files

Fix multiple declaration and incorrect prototype problems

parent e95a47a2
......@@ -35,12 +35,12 @@ if ($EUID != 0) {
#
# Load the OS independent support library. It will load the OS dependent
# library and initialize itself.
#
# library and initialize itself.
#
use libsetup;
use libtmcc;
use librc;
use libtestbed;
use libtestbed ('TB_EVENTSERVER', 'TB_BOSSNODE');
# Script specific goo.
my $RCDIR = "$BINDIR/rc";
......
......@@ -103,7 +103,7 @@ my %funcs = (
hkeys => \&sendhkeys,
batt => \&sendbatt,
rootpswd=> \&setrootpswd,
dhcpdconf=> \&gendhcpdconf,
dhcpdconf=> \&dhcpdconf,
);
my %immediate = (
......@@ -131,7 +131,7 @@ sub sendbatt($);
sub setrootpswd($);
sub logmsg($;$);
sub saysomething($);
sub gendhcpdconf();
sub dhcpdconf($);
#
# Parse command arguments. Once we return from getopts, all that should be
......@@ -992,15 +992,15 @@ resched:
if ($iv{rootpswd});
}
sub gendhcpdconf($)
sub dhcpdconf($)
{
my ($curtime) = @_;
if ($fakeit) {
my $delta = $curtime - $faketimes{dhcpdconf};
$faketimes{dhcpdconf} = $curtime;
logmsg("gendhcpdconf at +$delta\n");
qinsert($curtime + $iv{dhcpdconf}, \&gendhcpdconf) if ($iv{dhcpdconf});
logmsg("dhcpdconf at +$delta\n");
qinsert($curtime + $iv{dhcpdconf}, \&dhcpdconf) if ($iv{dhcpdconf});
return;
}
......@@ -1016,7 +1016,7 @@ resched:
# Since the tmcc call and update can take awhile, we update curtime
#
$curtime = time();
qinsert($curtime + $iv{dhcpdconf}, \&gendhcpdconf)
qinsert($curtime + $iv{dhcpdconf}, \&dhcpdconf)
if ($iv{dhcpdconf});
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment