Dpkg::ErrorHandling: Explicitly pass field argument to unknown()

debian/changelog

@@ -10,6 +10,7 @@ dpkg (1.15.3) UNRELEASED; urgency=low
   * Document in dpkg-statoverride(8) that mode needs to be specified in
     octal. Closes: #534551
   * Mark argument names in dpkg-statoverride.1 in italic.
+  * Explicitly pass field argument to Dpkg::ErrorHandling::unknown().
 
   [ Raphael Hertzog ]
   * Unset TAR_OPTIONS when creating/extracting tar archives for source

scripts/Dpkg/ErrorHandling.pm

@@ -62,12 +62,12 @@ sub internerr($;@)
     die report(_g("internal error"), @_);
 }
 
-sub unknown($)
+sub unknown($$)
 {
-    # XXX: implicit argument
-    my $field = $_;
+    my ($field, $desc) = @_;
+
     warning(_g("unknown information field '%s' in input data in %s"),
-            $field, $_[0]);
+            $field, $desc);
 }
 
 sub subprocerr(@)

scripts/dpkg-genchanges.pl

@@ -270,7 +270,7 @@ foreach $_ (keys %{$src_fields}) {
     } elsif (m/^X[BS]+-/i || m/^$control_src_field_regex$/i) {
 	# Silently ignore valid fields
     } else {
-	unknown(_g('general section of control info file'));
+	unknown($_, _g('general section of control info file'));
     }
 }
 
@@ -324,7 +324,7 @@ foreach my $pkg ($control->get_packages()) {
 	} elsif (m/^$control_pkg_field_regex$/ || m/^X[BS]+-/i) {
 	    # Silently ignore valid fields
 	} else {
-	    unknown(_g("package's section of control info file"));
+	    unknown($_, _g("package's section of control info file"));
 	}
     }
 }
@@ -341,7 +341,7 @@ foreach $_ (keys %{$changelog}) {
     } elsif (s/^X[BS]*C[BS]*-//i) {
 	$fields->{$_} = $v;
     } elsif (!m/^X[BS]+-/i) {
-	unknown(_g("parsed version of changelog"));
+	unknown($_, _g("parsed version of changelog"));
     }
 }
 

scripts/dpkg-gencontrol.pl

@@ -160,7 +160,7 @@ foreach $_ (keys %{$src_fields}) {
     } elsif (m/^X[CS]+-/i || m/^$control_src_field_regex$/i) {
 	# Silently ignore valid fields
     } else {
-	unknown(_g('general section of control info file'));
+	unknown($_, _g('general section of control info file'));
     }
 }
 
@@ -193,7 +193,7 @@ foreach $_ (keys %{$pkg}) {
     } elsif (s/^X[CS]*B[CS]*-//i) { # Include XB-* fields
 	$fields->{$_} = $v;
     } elsif (!m/^X[CS]+-/i) {
-	unknown(_g("package's section of control info file"));
+	unknown($_, _g("package's section of control info file"));
     }
 }
 
@@ -210,7 +210,7 @@ foreach $_ (keys %{$changelog}) {
     } elsif (s/^X[CS]*B[CS]*-//i) {
 	$fields->{$_} = $v;
     } elsif (!m/^X[CS]+-/i) {
-	unknown(_g("parsed version of changelog"));
+	unknown($_, _g("parsed version of changelog"));
     }
 }
 

scripts/dpkg-source.pl

@@ -182,7 +182,7 @@ if ($options{'opmode'} eq 'build') {
 	} elsif (m/^$control_src_field_regex$/i || m/^X[BC]+-/i) {
 	    # Silently ignore valid fields
 	} else {
-	    unknown(_g('general section of control info file'));
+	    unknown($_, _g('general section of control info file'));
 	}
     }
 
@@ -215,7 +215,7 @@ if ($options{'opmode'} eq 'build') {
             } elsif (m/^$control_pkg_field_regex$/ ||
                      m/^X[BC]+-/i) { # Silently ignore valid fields
             } else {
-                unknown(_g("package's section of control info file"));
+                unknown($_, _g("package's section of control info file"));
             }
 	}
     }
@@ -240,7 +240,7 @@ if ($options{'opmode'} eq 'build') {
 	} elsif (m/^(Maintainer|Changes|Urgency|Distribution|Date|Closes)$/i ||
 		 m/^X[BS]+-/i) {
 	} else {
-	    unknown(_g("parsed version of changelog"));
+	    unknown($_, _g("parsed version of changelog"));
 	}
     }