Fabio/ddclient
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Delete unused varargs from _read_config and parse_assignment(s)

Browse source
This commit is contained in:
Richard Hansen 2020-05-25 16:34:09 -04:00
parent dc37e00d9d
commit 6757c2ec0e
1 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
ddclient
View file

@ -1074,14 +1074,13 @@ sub read_cache {
## parse_assignment(string) return (name, value, rest) ## parse_assignment(string) return (name, value, rest)
###################################################################### ######################################################################
sub parse_assignments { sub parse_assignments {
my $rest = shift; my ($rest) = @_;
my @args = @_;
my %variables = (); my %variables = ();
my ($name, $value); my ($name, $value);
while (1) { while (1) {
$rest =~ s/^\s+//; $rest =~ s/^\s+//;
($name, $value, $rest) = parse_assignment($rest, @args); ($name, $value, $rest) = parse_assignment($rest);
if (defined $name) { if (defined $name) {
$variables{$name} = $value; $variables{$name} = $value;
} else { } else {
@ -1091,8 +1090,7 @@ sub parse_assignments {
return ($rest, %variables); return ($rest, %variables);
} }
sub parse_assignment { sub parse_assignment {
my $rest = shift; my ($rest) = @_;
my $stop = @_ ? shift : '[\n\s,]';
my ($c, $name, $value); my ($c, $name, $value);
my ($escape, $quote) = (0, ''); my ($escape, $quote) = (0, '');
@ -1110,7 +1108,7 @@ sub parse_assignment {
$quote = '' $quote = ''
} elsif (!$quote && $c =~ /[\'\"]/) { } elsif (!$quote && $c =~ /[\'\"]/) {
$quote = $c; $quote = $c;
} elsif (!$quote && $c =~ /^${stop}/) { } elsif (!$quote && $c =~ /^[\n\s,]/) {
last; last;
} else { } else {
$value .= $c; $value .= $c;
@ -1124,19 +1122,15 @@ sub parse_assignment {
## read_config ## read_config
###################################################################### ######################################################################
sub read_config { sub read_config {
my $file = shift; my ($file, $config, $globals) = @_;
my $config = shift; _read_config($config, $globals, '', $file);
my $globals = shift;
my %globals = ();
_read_config($config, $globals, '', $file, %globals);
} }
sub _read_config { sub _read_config {
my $config = shift; my $config = shift;
my $globals = shift; my $globals = shift;
my $stamp = shift; my $stamp = shift;
local $file = shift; local $file = shift;
my %globals = @_; my %globals = ();
my %config = (); my %config = ();
my $content = ''; my $content = '';