projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
NMEM thread safe. NMEM must be initialized before use (sigh) -
[yaz-moved-to-github.git]
/
util
/
readconf.c
diff --git
a/util/readconf.c
b/util/readconf.c
index
119b471
..
6973d1f
100644
(file)
--- a/
util/readconf.c
+++ b/
util/readconf.c
@@
-1,10
+1,16
@@
/*
/*
- * Copyright (C) 1994, Index Data I/S
+ * Copyright (C) 1994-1997, Index Data I/S
* All rights reserved.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: readconf.c,v $
* All rights reserved.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: readconf.c,v $
- * Revision 1.3 1996-05-29 15:48:48 quinn
+ * Revision 1.5 1997-09-04 07:53:02 adam
+ * Added include readconf.h.
+ *
+ * Revision 1.4 1997/05/14 06:54:07 adam
+ * C++ support.
+ *
+ * Revision 1.3 1996/05/29 15:48:48 quinn
* Added \n to the isspace rule.
*
* Revision 1.2 1996/05/29 10:05:01 quinn
* Added \n to the isspace rule.
*
* Revision 1.2 1996/05/29 10:05:01 quinn
@@
-26,6
+32,7
@@
#include <ctype.h>
#include <log.h>
#include <ctype.h>
#include <log.h>
+#include <readconf.h>
#define l_isspace(c) ((c) == '\t' || (c) == ' ' || (c) == '\n')
#define l_isspace(c) ((c) == '\t' || (c) == ' ' || (c) == '\n')
@@
-64,8
+71,8
@@
int readconf_line(FILE *f, char *line, int len, char *argv[], int num)
/*
* Read lines of a configuration file.
*/
/*
* Read lines of a configuration file.
*/
-int readconf(char *name, void *private,
- int (*fun)(char *name, void *private, int argc, char *argv[]))
+int readconf(char *name, void *rprivate,
+ int (*fun)(char *name, void *rprivate, int argc, char *argv[]))
{
FILE *f;
char line[512], *m_argv[50];
{
FILE *f;
char line[512], *m_argv[50];
@@
-86,7
+93,7
@@
int readconf(char *name, void *private,
return 0;
}
return 0;
}
- if ((res = (*fun)(name, private, m_argc, m_argv)))
+ if ((res = (*fun)(name, rprivate, m_argc, m_argv)))
{
fclose(f);
return res;
{
fclose(f);
return res;