X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=pctb%2Focr.c;h=fafdba8eec2ac74f54c4ffc05f096f62c0c5d479;hb=8360f12a6a457b73ebb18dbeedbb15e6ed91318b;hp=f4bc77d56118ae8b4caebfce168a3336cd2eecc2;hpb=74e4e249f2c3e848592984cb193aded6a77a341d;p=ypp-sc-tools.main.git

diff --git a/pctb/ocr.c b/pctb/ocr.c
index f4bc77d..fafdba8 100644
--- a/pctb/ocr.c
+++ b/pctb/ocr.c
@@ -81,12 +81,7 @@ static int resolver_done;
 
 DEBUG_DEFINE_DEBUGF(ocr)
 
-#define dbassert(x)							\
-  ((x) ? (void)0 :							\
-     fatal("Error in character set database.\n"				\
-	   " Requirement not met: %s:%d: %s", __FILE__,__LINE__, #x))
-
-#define FGETSLINE (fgetsline(db,lbuf,sizeof(lbuf)))
+#define FGETSLINE (dbfile_getsline(lbuf,sizeof(lbuf),__FILE__,__LINE__))
 
 static void cleardb_node(DatabaseNode *n) {
   int i;
@@ -100,10 +95,9 @@ static void readdb(OcrReader *rd) {
   DatabaseNode *current, *additional;
   char chrs[MAXGLYPHCHRS+1];
   Pixcol cv;
-  int r,j,ctxi;
+  int j,ctxi;
   int h, endsword;
   char lbuf[100];
-  FILE *db;
 
   for (ctxi=0; ctxi<NCONTEXTS; ctxi++)
     cleardb_node(&rd->contexts[ctxi]);
@@ -112,23 +106,18 @@ static void readdb(OcrReader *rd) {
   asprintf(&dbfname,"%s/charset-%d.txt",get_vardir(),rd->h);
   sysassert(dbfname);
   
-  db= fopen(dbfname,"r");
-  free(dbfname);
-  if (!db) {
-    sysassert(errno==ENOENT);
-    return;
-  }
+  if (!dbfile_open(dbfname))
+    goto x;
 
   FGETSLINE;
   dbassert(!strcmp(lbuf,"# ypp-sc-tools pctb font v1"));
 
-  r= fscanf(db, "%d", &h);
-  dbassert(r==1);
+  dbassert( dbfile_scanf("%d", &h) == 1);
   dbassert(h==rd->h);
 
   for (;;) {
     FGETSLINE;
-    if (!lbuf || lbuf[0]=='#') continue;
+    if (!lbuf[0] || lbuf[0]=='#') continue;
     if (!strcmp(lbuf,".")) break;
 
     for (ctxi=0; ctxi<NCONTEXTS; ctxi++)
@@ -140,13 +129,13 @@ static void readdb(OcrReader *rd) {
 
   found_ctx:
     for (nchrs=0;;) {
-      int c= fgetc(db); sysassert(!ferror(db)); dbassert(c!=EOF);
+      int c= fgetc(dbfile); sysassert(!ferror(dbfile)); dbassert(c!=EOF);
       if (c=='\n') { dbassert(nchrs); break; }
       dbassert(nchrs<MAXGLYPHCHRS);
       if (c=='\\') {
 	unsigned cr;
-	c= fgetc(db); sysassert(!ferror(db)); dbassert(c=='x');
-	r= fscanf(db, "%2x", &cr); sysassert(!ferror(db)); dbassert(r==1);
+	c= fgetc(dbfile); sysassert(!ferror(dbfile)); dbassert(c=='x');
+	dbassert( dbfile_scanf("%2x", &cr) == 1);
 	assert(cr>0 && cr<=255);
 	c= cr;
       }
@@ -195,8 +184,9 @@ static void readdb(OcrReader *rd) {
     strcpy(current->s, chrs);
     current->endsword= endsword;
   }
-  sysassert(!ferror(db));
-  sysassert(!fclose(db));
+ x:
+  dbfile_close();
+  free(dbfname);
 }
 
 static void cu_pr_ctxmap(unsigned ctxmap) {