Merge dbname2, host2, etc. into the new array method.

Greg Sabino Mullane · Greg Sabino Mullane · commit 900b0887df0f · 2014-10-30T17:02:50.000-04:00
diff --git a/check_postgres.pl b/check_postgres.pl
@@ -1001,22 +1001,22 @@ package check_postgres;
     if ($arg =~ /^\-?\-?(\w+)\s*=\s*(.+)/o) {
         my ($name,$value) = (lc $1, $2);
         if ($name =~ /^(?:db)?port(\d+)$/o or $name =~ /^p(\d+)$/o) {
-            $opt{"port$1"} = $value;
+            push @{ $opt{port} } => $value;
         }
         elsif ($name =~ /^(?:db)?host(\d+)$/o or $name =~ /^H(\d+)$/o) {
-            $opt{"host$1"} = $value;
+            push @{ $opt{host} } => $value;
         }
         elsif ($name =~ /^db(?:name)?(\d+)$/o) {
-            $opt{"dbname$1"} = $value;
+            push @{ $opt{dbname} } => $value;
         }
         elsif ($name =~ /^dbuser(\d+)$/o or $name =~ /^u(\d+)/o) {
-            $opt{"dbuser$1"} = $value;
+            push @{ $opt{dbuser} } => $value;
         }
         elsif ($name =~ /^dbpass(\d+)$/o) {
-            $opt{"dbpass$1"} = $value;
+            push @{ $opt{dbpass} } => $value;
         }
         elsif ($name =~ /^dbservice(\d+)$/o) {
-            $opt{"dbservice$1"} = $value;
+            push @{ $opt{dbservice} } => $value;
         }
         else {
             push @badargs => $arg;

Original file line number	Diff line number	Diff line change
`@@ -1001,22 +1001,22 @@ package check_postgres;`
`1001`	`1001`	`if ($arg =~ /^\-?\-?(\w+)\s=\s(.+)/o) {`
`1002`	`1002`	`my ($name,$value) = (lc $1, $2);`
`1003`	`1003`	`if ($name =~ /^(?:db)?port(\d+)$/o or $name =~ /^p(\d+)$/o) {`
`1004`		`- $opt{"port$1"} = $value;`
	`1004`	`+ push @{ $opt{port} } => $value;`
`1005`	`1005`	`}`
`1006`	`1006`	`elsif ($name =~ /^(?:db)?host(\d+)$/o or $name =~ /^H(\d+)$/o) {`
`1007`		`- $opt{"host$1"} = $value;`
	`1007`	`+ push @{ $opt{host} } => $value;`
`1008`	`1008`	`}`
`1009`	`1009`	`elsif ($name =~ /^db(?:name)?(\d+)$/o) {`
`1010`		`- $opt{"dbname$1"} = $value;`
	`1010`	`+ push @{ $opt{dbname} } => $value;`
`1011`	`1011`	`}`
`1012`	`1012`	`elsif ($name =~ /^dbuser(\d+)$/o or $name =~ /^u(\d+)/o) {`
`1013`		`- $opt{"dbuser$1"} = $value;`
	`1013`	`+ push @{ $opt{dbuser} } => $value;`
`1014`	`1014`	`}`
`1015`	`1015`	`elsif ($name =~ /^dbpass(\d+)$/o) {`
`1016`		`- $opt{"dbpass$1"} = $value;`
	`1016`	`+ push @{ $opt{dbpass} } => $value;`
`1017`	`1017`	`}`
`1018`	`1018`	`elsif ($name =~ /^dbservice(\d+)$/o) {`
`1019`		`- $opt{"dbservice$1"} = $value;`
	`1019`	`+ push @{ $opt{dbservice} } => $value;`
`1020`	`1020`	`}`
`1021`	`1021`	`else {`
`1022`	`1022`	`push @badargs => $arg;`