From 2dcb77c26736076b3481dcbbca7b173a29d8a0e4 Mon Sep 17 00:00:00 2001
From: Nicholas Clark <nick@ccl4.org>
Date: Tue, 9 Aug 2011 11:47:50 +0200
Subject: [PATCH] In checkcfgvar.pl, eliminate the file-scope lexical
 %MASTER_CFG.

---
 Porting/checkcfgvar.pl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Porting/checkcfgvar.pl b/Porting/checkcfgvar.pl
index e8342ea..66787d5 100755
--- a/Porting/checkcfgvar.pl
+++ b/Porting/checkcfgvar.pl
@@ -28,7 +28,6 @@ GetOptions (
     ) or usage (1);
 
 my $MASTER_CFG = "config_h.SH";
-my %MASTER_CFG;
 
 my %lst;
 my @CFG = (
@@ -53,16 +52,19 @@ my @CFG = (
 	   "Porting/config.sh",
 	  );
 
+my @MASTER_CFG;
 {
+    my %seen;
     open my $fh, '<', $MASTER_CFG;
     while (<$fh>) {
 	while (/[^\\]\$([a-z]\w+)/g) {
 	    my $v = $1;
 	    next if $v =~ /^(CONFIG_H|CONFIG_SH)$/;
-	    $MASTER_CFG{$v}++;
+	    $seen{$v}++;
 	}
     }
     close $fh;
+    @MASTER_CFG = sort keys %seen;
 }
 
 my %MANIFEST;
@@ -75,8 +77,6 @@ my %MANIFEST;
     close $fh;
 }
 
-my @MASTER_CFG = sort keys %MASTER_CFG;
-
 for my $cfg (@CFG) {
     unless (exists $MANIFEST{$cfg}) {
 	print STDERR "[skipping not-expected '$cfg']\n";
-- 
2.7.4