From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 3 Jul 2009 20:25:23 +0000 (+0100)
Subject: Merge /u/ijackson/things/ypp-sc-tools
X-Git-Tag: 1.9.2~54
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=commitdiff_plain;h=852f619ddd998ca771b37789d54be50e5670f193;hp=3b564897d1c81b80783da2f95d56770de55996b6;p=ypp-sc-tools.db-test.git

Merge /u/ijackson/things/ypp-sc-tools
---

diff --git a/pctb/dictionary-manager b/pctb/dictionary-manager
index fb11565..10218e0 100755
--- a/pctb/dictionary-manager
+++ b/pctb/dictionary-manager
@@ -889,7 +889,8 @@ set database_magic/char {# ypp-sc-tools pctb font v1}
     
 proc read_database_header/char {f} {
     global rows
-    if {([db_getsl $f])+0 != $rows} { error "wrong h ?" }
+    set l [db_getsl $f]
+    if {$l+0 != $rows} { error "wrong h $l $rows ?" }
 }
 proc read_database_entry/char {f context} {
     global database
@@ -1102,7 +1103,7 @@ proc dict2_reqkind_rows {dict} {
 	debug "DICT PIXMAP"
     } elseif {[regexp {^(char)([1-9]\d*)$} $dict dummy reqkind rows]} {
 	debug "DICT CHAR rqk=$reqkind r=$rows."
-	return [list $reqkind rows]
+	return [list $reqkind $rows]
     } else {
 	error "$dict ?"
     }