From 50237e1d2713126e87d510017a4cc304a69c6798 Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 13 Oct 1998 20:09:18 +0000
Subject: [PATCH] Changed call to readconf_line.

---
 util/charmap.c  |   10 +++++++---
 util/zebramap.c |   10 +++++++---
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/util/charmap.c b/util/charmap.c
index 7104cd3..08bbdb2 100644
--- a/util/charmap.c
+++ b/util/charmap.c
@@ -1,10 +1,13 @@
 /*
- * Copyright (C) 1996-1997, Index Data I/S 
+ * Copyright (C) 1996-1998, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: charmap.c,v $
- * Revision 1.13  1997-10-27 14:33:06  adam
+ * Revision 1.14  1998-10-13 20:09:18  adam
+ * Changed call to readconf_line.
+ *
+ * Revision 1.13  1997/10/27 14:33:06  adam
  * Moved towards generic character mapping depending on "structure"
  * field in abstract syntax file. Fixed a few memory leaks. Fixed
  * bug with negative integers when doing searches with relational
@@ -346,6 +349,7 @@ chrmaptab chrmaptab_create(const char *tabpath, const char *name, int map_only)
     FILE *f;
     char line[512], *argv[50];
     chrmaptab res;
+    int lineno = 0;
     int argc, num = (int) *CHR_BASE, i;
 
     if (!(f = yaz_path_fopen(tabpath, name, "r")))
@@ -382,7 +386,7 @@ chrmaptab chrmaptab_create(const char *tabpath, const char *name, int map_only)
     res->output[(int) *CHR_UNKNOWN] = (unsigned char*) "@";
     res->base_uppercase = 0;
 
-    while ((argc = readconf_line(f, line, 512, argv, 50)))
+    while ((argc = readconf_line(f, &lineno, line, 512, argv, 50)))
 	if (!map_only && !yaz_matchstr(argv[0], "lowercase"))
 	{
 	    if (argc != 2)
diff --git a/util/zebramap.c b/util/zebramap.c
index 8188c0c..d3dc2ed 100644
--- a/util/zebramap.c
+++ b/util/zebramap.c
@@ -1,10 +1,13 @@
 /*
- * Copyright (C) 1994-1998, Index Data I/S 
+ * Copyright (C) 1994-1998, Index Data 
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: zebramap.c,v $
- * Revision 1.10  1998-06-23 15:33:37  adam
+ * Revision 1.11  1998-10-13 20:09:19  adam
+ * Changed call to readconf_line.
+ *
+ * Revision 1.10  1998/06/23 15:33:37  adam
  * Added feature to specify sort criteria in query (type 7 specifies
  * sort flags).
  *
@@ -97,6 +100,7 @@ static void zebra_map_read (ZebraMaps zms, const char *name)
     char line[512];
     char *argv[10];
     int argc;
+    int lineno = 0;
     struct zebra_map **zm = 0, *zp;
 
     if (!(f = yaz_path_fopen(zms->tabpath, name, "r")))
@@ -104,7 +108,7 @@ static void zebra_map_read (ZebraMaps zms, const char *name)
 	logf(LOG_WARN|LOG_ERRNO, "%s", name);
 	return ;
     }
-    while ((argc = readconf_line(f, line, 512, argv, 10)))
+    while ((argc = readconf_line(f, &lineno, line, 512, argv, 10)))
     {
 	if (!yaz_matchstr (argv[0], "index") && argc == 2)
 	{
-- 
1.7.10.4