From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 1 May 2016 10:59:57 +0000 (+0100)
Subject: update-xfonts-traditional: Break out filter_st_isok (no functional change)
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=xfonts-traditional.git;a=commitdiff_plain;h=0c09768ac8cbf1b78d9672c336dc4c1d2ab49339

update-xfonts-traditional: Break out filter_st_isok (no functional change)
---

diff --git a/update-xfonts-traditional b/update-xfonts-traditional
index 51ab164..a2e81e0 100755
--- a/update-xfonts-traditional
+++ b/update-xfonts-traditional
@@ -171,6 +171,12 @@ sub loadfoundries () {
     die "no foundry maps\n" unless %foundrymap;
 }
 
+sub filter_st_isok ($) {
+    my ($ch) = @_;
+    my $st = $ch->{St};
+    return !$st || $ch->{SigOK}{($st & ~128)};
+}
+
 sub processpcfgz ($$$$) {
     my ($inpcfgz,$outpcfgz,$logfile,$what) = @_;
     print $reportfh "processing $inpcfgz to $outpcfgz\n" if $verbose>=2;
@@ -255,15 +261,9 @@ sub processpcfgz ($$$$) {
 	$ch->{St} = $?;
     }
 
-    my $st_isok = sub {
-	my ($ch) = @_;
-	my $st = $ch->{St};
-	return !$st || $ch->{SigOK}{($st & ~128)};
-    };
-
     if ($tolerate_bad_fonts &&
 	$r eq 'no bdf data' &&
-	$st_isok->($ch{'gunzip'}) &&
+	filter_st_isok($ch{'gunzip'}) &&
 	($ch{'pcf2bdf'}{St} & ~128) == 6)
     {
 	$r = "pcf2bdf failed ($ch{'pcf2bdf'}{St})";
@@ -271,7 +271,7 @@ sub processpcfgz ($$$$) {
 	$ch{'pcf2bdf'}{SigOK}{6} = 1;
     }
     foreach my $ch (@children) {
-	if (!$st_isok->($ch)) {
+	if (!filter_st_isok($ch)) {
 	    die "update-xfonts-traditional:".
 		" $ch->{Exe} [$ch->{Pid}] for $inpcfgz".
 		" failed $ch->{St}".