From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 25 Jan 2012 20:56:25 +0000 (+0000)
Subject: fix message ("none") return value s from processbdf and hence processpcfgz
X-Git-Tag: debian/1.3~8
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=xfonts-traditional.git;a=commitdiff_plain;h=1bbbeaf42afa4e7af424db60b2385fde0fb8ff48

fix message ("none") return value s from processbdf and hence processpcfgz
---

diff --git a/debian/changelog b/debian/changelog
index 1b62af7..44d2913 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xfonts-traditional (1.3) unstable; urgency=low
 
   * Process multiple fonts in parallel.
+  * General improvements to handling of errors and unprocessed fonts.
 
  --
 
diff --git a/update-xfonts-traditional b/update-xfonts-traditional
index 8e04e60..619e2fa 100755
--- a/update-xfonts-traditional
+++ b/update-xfonts-traditional
@@ -66,7 +66,7 @@ sub processbdf ($$$$) {
 	    local ($_) = $glyph;
 	    my $key= sprintf "%s,%d,%d,%d,%d", $foundry,$w,$h,$xo,$yo;
 	    my $rules= loadrules($key);
-	    return (0,'no rules') if !$rules;
+	    return 'no rules' if !$rules;
 	    $rules->();
 	    $modified += ($_ ne $glyph);
 	    print $outbdf $_,"\n" or die $!
@@ -82,22 +82,22 @@ sub processbdf ($$$$) {
 	}
 	if ($state eq 'idle' && m/^FOUNDRY\s+/) {
 	    die if defined $foundry;
-	    return (0,'foundry syntax') unless m/^FOUNDRY\s+\"(\w+)\"\s+/;
+	    return 'foundry syntax' unless m/^FOUNDRY\s+\"(\w+)\"\s+/;
 	    $foundry = $foundrymap{lc $1};
-	    return (0,'no foundry') unless defined $foundry;
+	    return 'no foundry' unless defined $foundry;
 	    $_ = "FOUNDRY \"$foundry\"\n";
 	}
 	if ($state eq 'idle' && m/^FONT\s+/) {
 	    die if defined $font;
-	    return (0,'simple font name') unless m/^(FONT\s+)\-(\w+)\-/;
+	    return 'simple font name' unless m/^(FONT\s+)\-(\w+)\-/;
 	    $font = $foundrymap{lc $2};
-	    return (0,'no foundry') unless defined $font;
+	    return 'no foundry' unless defined $font;
 	    $_ = "FONT -$font-$'";
 	}
 	if ($state eq 'idle' && m/^STARTCHAR\s/) {
 	    die unless defined $foundry;
 	    die unless defined $font;
-	    return (0,'foundry != font') unless $foundry eq $font;
+	    return 'foundry != font' unless $foundry eq $font;
 	    $state='startchar';
 	    $w=undef;
 	}