From fc6c69a692002277378308c2f6ca019185ef9fbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dagfinn=20Ilmari=20Manns=C3=A5ker?= <ilmari@ilmari.org>
Date: Mon, 17 Apr 2017 14:38:22 +0100
Subject: [PATCH 4/8] Inline check_nattrs into its only caller

---
 src/backend/catalog/Catalog.pm | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/src/backend/catalog/Catalog.pm b/src/backend/catalog/Catalog.pm
index 9bd6263..0aa3e0c 100644
--- a/src/backend/catalog/Catalog.pm
+++ b/src/backend/catalog/Catalog.pm
@@ -96,8 +96,14 @@ sub Catalogs
 				# non-whitespace characters.
 				my @bki_values = $2 =~ /"[^"]*"|\S+/g;
 
-				check_natts($filename, $catalog{natts}, scalar(@bki_values),
-							$input_file, $input_line_number);
+				# Check that the DATA line matches the declared number of attributes
+				die "Could not find definition for Natts_${catname} before start of DATA() in $filename\n"
+					unless defined $catalog{natts};
+
+				die sprintf
+					"Wrong number of attributes in DATA() entry at %s:%d (expected %d but got %d)\n",
+					$filename, $input_line_number, $catalog{natts}, scalar(@bki_values)
+				unless $catalog{natts} == @bki_values;
 
 				push @{ $catalog{data} }, { oid => $oid, bki_values => \@bki_values };
 			}
@@ -243,18 +249,4 @@ sub RenameTempFile
 	rename($temp_name, $final_name) || die "rename: $temp_name: $!";
 }
 
-# verify the number of fields in the passed-in DATA line
-sub check_natts
-{
-	my ($catname, $natts, $bki_vals, $file, $line) = @_;
-
-	die "Could not find definition for Natts_${catname} before start of DATA() in $file\n"
-		unless defined $natts;
-
-	die sprintf
-		"Wrong number of attributes in DATA() entry at %s:%d (expected %d but got %d)\n",
-		$file, $line, $natts, $bki_vals
-	unless $natts == $bki_vals;
-}
-
 1;
-- 
2.7.4