From f4c095a042b1bcccb78136be87944e46412386aa Mon Sep 17 00:00:00 2001 From: Heikki Levanto Date: Mon, 13 Dec 2004 14:21:54 +0000 Subject: [PATCH] Moved back to a single log.h, with the new #define YAZ_USE_NEW_LOG --- client/client.c | 4 +- include/yaz/Makefile.am | 4 +- include/yaz/log.h | 115 +++++++++++++++++++++++++++++++++++--- include/yaz/yaz-util.h | 17 +----- include/yaz/ylog.h | 141 ----------------------------------------------- src/atoin.c | 4 +- src/eventl.c | 4 +- src/log.c | 5 +- src/logrpn.c | 4 +- src/nmem.c | 4 +- src/odr.c | 4 +- src/readconf.c | 4 +- src/seshigh.c | 6 +- src/statserv.c | 4 +- src/tcpdchk.c | 4 +- src/tpath.c | 4 +- src/xmalloc.c | 4 +- src/zoom-c.c | 6 +- test/tstlog.c | 4 +- zoom/zoomsh.c | 4 +- ztest/read-grs.c | 4 +- 21 files changed, 146 insertions(+), 204 deletions(-) delete mode 100644 include/yaz/ylog.h diff --git a/client/client.c b/client/client.c index f13e144..5791eac 100644 --- a/client/client.c +++ b/client/client.c @@ -2,7 +2,7 @@ * Copyright (c) 1995-2004, Index Data * See the file LICENSE for details. * - * $Id: client.c,v 1.260 2004-12-09 09:25:44 adam Exp $ + * $Id: client.c,v 1.261 2004-12-13 14:21:54 heikki Exp $ */ #include @@ -51,7 +51,7 @@ #include #include #include -#include +#include #if HAVE_READLINE_READLINE_H #include diff --git a/include/yaz/Makefile.am b/include/yaz/Makefile.am index bc1d356..a673bb6 100644 --- a/include/yaz/Makefile.am +++ b/include/yaz/Makefile.am @@ -1,7 +1,7 @@ -## $Id: Makefile.am,v 1.23 2004-11-18 15:18:13 heikki Exp $ +## $Id: Makefile.am,v 1.24 2004-12-13 14:21:55 heikki Exp $ pkginclude_HEADERS= backend.h ccl.h cql.h comstack.h \ - diagbib1.h sortspec.h ylog.h log.h logrpn.h marcdisp.h nmem.h odr.h oid.h \ + diagbib1.h sortspec.h log.h logrpn.h marcdisp.h nmem.h odr.h oid.h \ options.h otherinfo.h pquery.h prt-ext.h readconf.h statserv.h \ tcpip.h unix.h tpath.h wrbuf.h xmalloc.h \ yaz-ccl.h yaz-iconv.h yaz-util.h yaz-version.h yconfig.h proto.h \ diff --git a/include/yaz/log.h b/include/yaz/log.h index fb4561f..c65dcdb 100644 --- a/include/yaz/log.h +++ b/include/yaz/log.h @@ -23,7 +23,7 @@ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE * OF THIS SOFTWARE. * - * $Id: log.h,v 1.27 2004-12-10 10:42:33 heikki Exp $ + * $Id: log.h,v 1.28 2004-12-13 14:21:55 heikki Exp $ */ /** @@ -34,17 +34,14 @@ #ifndef LOG_H #define LOG_H -#include - -#ifndef YAZ_USE_OLD_LOG -#warning "use of log.h is deprecated, use ylog.h instead" -/* if this warning gets on your nerves, run configure like this: - * CFLAGS="-Wall -g -D YAZ_USE_OLD_LOG" ./configure - */ -#endif +#include +#include YAZ_BEGIN_CDECL +#ifndef YAZ_USE_NEW_LOG + + /* The old LOG_ bit names are here for compatibility only. They may * conflict with bits defined in syslog.h, or other places. 'LOG' * really is not such a good name. YLOG must be more unique @@ -72,6 +69,106 @@ YAZ_BEGIN_CDECL /* logf is deprecated, as it conflicts with a math function */ #define logf yaz_log + + +#endif /* ndef YAZ_USE_NEW_LOG */ + +#define YLOG_FATAL 0x00000001 +#define YLOG_DEBUG 0x00000002 +#define YLOG_WARN 0x00000004 +#define YLOG_LOG 0x00000008 +#define YLOG_ERRNO 0x00000010 /* append strerror to message */ +/*#define YLOG_FILE 0x00000020 */ +/*#define YLOG_APP 0x00000040 */ + /* Application level events (new-connection) */ +#define YLOG_MALLOC 0x00000080 /* debugging mallocs */ +#define YLOG_NOTIME 0x00000100 /* do not output date and time */ +/* #define YLOG_APP2 0x00000200 */ + /* Application-level events, such as api calls */ +/* #define YLOG_APP3 0x00000400 */ + /* For more application-level events */ +#define YLOG_FLUSH 0x00000800 /* Flush log after every write (DEBUG does too) */ +#define YLOG_LOGLVL 0x00001000 /* log when modules query log levels */ + /* this has to be a hard-coded bit, not to loop*/ + +#define YLOG_ALL (0xffff&~YLOG_MALLOC&~YLOG_NOTIME) + +#define YLOG_DEFAULT_LEVEL (YLOG_FATAL | YLOG_ERRNO | YLOG_LOG | YLOG_WARN) + +#define YLOG_LAST_BIT YLOG_LOGLVL /* the last bit used for regular log bits */ + /* the rest are for dynamic modules */ + + +/** + * yaz_log_init is a shorthand for initializing the log level and prefixes */ +YAZ_EXPORT void yaz_log_init(int level, const char *prefix, const char *name); + +/** yaz_log_init_file sets the file name used for yaz_log */ +YAZ_EXPORT void yaz_log_init_file(const char *fname); + +/** yaz_log_init_level sets the logging level. Use an OR of the bits above */ +YAZ_EXPORT void yaz_log_init_level(int level); + +/** yaz_log_init_prefix sets the log prefix */ +YAZ_EXPORT void yaz_log_init_prefix(const char *prefix); + +/** yaz_log_init_prefix2 sets an optional second prefix */ +YAZ_EXPORT void yaz_log_init_prefix2(const char *prefix); + +/** + * yaz_log_time_format sets the format of the timestamp. See man 3 strftime + * Calling with "old" sets to the old format "11:55:06-02/11" + * Calling with NULL or "" sets to the new format "20041102-115719" + * If not called at all, the old format is used, for backward compatibility + */ +YAZ_EXPORT void yaz_log_time_format(const char *fmt); + +/** + * yaz_log_init_max_size sets the max size for a log file. + * zero means no limit. Negative means built-in limit (1GB) + */ +YAZ_EXPORT void yaz_log_init_max_size(int mx); + +/** + * yaz_log writes an entry in the log. Defaults to stderr if not initialized + * to a file with yaz_log_init_file. The level must match the level set via + * yaz_log_init_level, optionally defined via yaz_log_mask_str. */ +YAZ_EXPORT void yaz_log(int level, const char *fmt, ...) +#ifdef __GNUC__ + __attribute__ ((format (printf, 2, 3))) +#endif + ; + +/** + * yaz_log_mask_str converts a comma-separated list of log levels to a bit + * mask. Starts from default level, and adds bits as specified, unless 'none' + * is specified, which clears the list. If a name matches the name of a + * YLOG_BIT above, that one is set. Otherwise a new value is picked, and given + * to that name, to be found with yaz_log_module_level */ +YAZ_EXPORT int yaz_log_mask_str(const char *str); + +/** yaz_log_mask_str_x is like yaz_log_mask_str, but with a given start value*/ +YAZ_EXPORT int yaz_log_mask_str_x(const char *str, int level); + + +/** + * yaz_log_module_level returns a log level mask corresponding to the module + * name. If that had been specified on the -v arguments (that is, passed to + * yaz_log_mask_str), then a non-zero mask is returned. If not, we get a + * zero. This can later be used in yaz_log for the level argument + */ +YAZ_EXPORT int yaz_log_module_level(const char *name); + +/** yaz_log_file returns the file handle for yaz_log. */ +YAZ_EXPORT FILE *yaz_log_file(void); + +YAZ_EXPORT void log_event_start(void (*func)(int level, const char *msg, void *info), + void *info); +YAZ_EXPORT void log_event_end(void (*func)(int level, const char *msg, void *info), + void *info); + +YAZ_EXPORT void yaz_log_reopen(void); + YAZ_END_CDECL #endif diff --git a/include/yaz/yaz-util.h b/include/yaz/yaz-util.h index aba53c0..23e48d2 100644 --- a/include/yaz/yaz-util.h +++ b/include/yaz/yaz-util.h @@ -23,7 +23,7 @@ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE * OF THIS SOFTWARE. * - * $Id: yaz-util.h,v 1.13 2004-12-10 10:42:33 heikki Exp $ + * $Id: yaz-util.h,v 1.14 2004-12-13 14:21:55 heikki Exp $ */ /** * \file yaz-util.h @@ -37,22 +37,7 @@ #include #include -/* [y]log.h trickery */ -/* if [y]log.h has been included, do not worry about it */ -/* else warn here, and make sure log.h does not warn */ - -#ifndef YLOG_H - -#ifndef YAZ_USE_OLD_LOG -#warning "yaz-util.h is deprecated - include the files directly, and use ylog.h" -/* If you get tired of this message, configure your program like this */ -/* CFLAGS="-Wall -g -D YAZ_USE_OLD_LOG" ./configure */ -#define YAZ_USE_OLD_LOG -/* do not complain of the old log.h */ -#endif - #include -#endif #include #include diff --git a/include/yaz/ylog.h b/include/yaz/ylog.h deleted file mode 100644 index b6dcf6b..0000000 --- a/include/yaz/ylog.h +++ /dev/null @@ -1,141 +0,0 @@ -/* - * Copyright (c) 1995-2004, Index Data. - * - * Permission to use, copy, modify, distribute, and sell this software and - * its documentation, in whole or in part, for any purpose, is hereby granted, - * provided that: - * - * 1. This copyright and permission notice appear in all copies of the - * software and its documentation. Notices of copyright or attribution - * which appear at the beginning of any file must remain unchanged. - * - * 2. The name of Index Data or the individual authors may not be used to - * endorse or promote products derived from this software without specific - * prior written permission. - * - * THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND, - * EXPRESS, IMPLIED, OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY - * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. - * IN NO EVENT SHALL INDEX DATA BE LIABLE FOR ANY SPECIAL, INCIDENTAL, - * INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR - * NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF - * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE - * OF THIS SOFTWARE. - * - * $Id: ylog.h,v 1.3 2004-11-19 10:07:08 heikki Exp $ - */ - -/** - * \file log.h - * \brief Header for logging utility - */ - -#ifndef YLOG_H -#define YLOG_H - -#include -#include -#include - -YAZ_BEGIN_CDECL - -#define YLOG_FATAL 0x00000001 -#define YLOG_DEBUG 0x00000002 -#define YLOG_WARN 0x00000004 -#define YLOG_LOG 0x00000008 -#define YLOG_ERRNO 0x00000010 /* append strerror to message */ -/*#define YLOG_FILE 0x00000020 */ -/*#define YLOG_APP 0x00000040 */ - /* Application level events (new-connection) */ -#define YLOG_MALLOC 0x00000080 /* debugging mallocs */ -#define YLOG_NOTIME 0x00000100 /* do not output date and time */ -/* #define YLOG_APP2 0x00000200 */ - /* Application-level events, such as api calls */ -/* #define YLOG_APP3 0x00000400 */ - /* For more application-level events */ -#define YLOG_FLUSH 0x00000800 /* Flush log after every write (DEBUG does too) */ -#define YLOG_LOGLVL 0x00001000 /* log when modules query log levels */ - /* this has to be a hard-coded bit, not to loop*/ - -#define YLOG_ALL (0xffff&~YLOG_MALLOC&~YLOG_NOTIME) - -#define YLOG_DEFAULT_LEVEL (YLOG_FATAL | YLOG_ERRNO | YLOG_LOG | YLOG_WARN) - -#define YLOG_LAST_BIT YLOG_LOGLVL /* the last bit used for regular log bits */ - /* the rest are for dynamic modules */ - - -/** - * yaz_log_init is a shorthand for initializing the log level and prefixes */ -YAZ_EXPORT void yaz_log_init(int level, const char *prefix, const char *name); - -/** yaz_log_init_file sets the file name used for yaz_log */ -YAZ_EXPORT void yaz_log_init_file(const char *fname); - -/** yaz_log_init_level sets the logging level. Use an OR of the bits above */ -YAZ_EXPORT void yaz_log_init_level(int level); - -/** yaz_log_init_prefix sets the log prefix */ -YAZ_EXPORT void yaz_log_init_prefix(const char *prefix); - -/** yaz_log_init_prefix2 sets an optional second prefix */ -YAZ_EXPORT void yaz_log_init_prefix2(const char *prefix); - -/** - * yaz_log_time_format sets the format of the timestamp. See man 3 strftime - * Calling with "old" sets to the old format "11:55:06-02/11" - * Calling with NULL or "" sets to the new format "20041102-115719" - * If not called at all, the old format is used, for backward compatibility - */ -YAZ_EXPORT void yaz_log_time_format(const char *fmt); - -/** - * yaz_log_init_max_size sets the max size for a log file. - * zero means no limit. Negative means built-in limit (1GB) - */ -YAZ_EXPORT void yaz_log_init_max_size(int mx); - -/** - * yaz_log writes an entry in the log. Defaults to stderr if not initialized - * to a file with yaz_log_init_file. The level must match the level set via - * yaz_log_init_level, optionally defined via yaz_log_mask_str. */ -YAZ_EXPORT void yaz_log(int level, const char *fmt, ...) -#ifdef __GNUC__ - __attribute__ ((format (printf, 2, 3))) -#endif - ; - -/** - * yaz_log_mask_str converts a comma-separated list of log levels to a bit - * mask. Starts from default level, and adds bits as specified, unless 'none' - * is specified, which clears the list. If a name matches the name of a - * YLOG_BIT above, that one is set. Otherwise a new value is picked, and given - * to that name, to be found with yaz_log_module_level */ -YAZ_EXPORT int yaz_log_mask_str(const char *str); - -/** yaz_log_mask_str_x is like yaz_log_mask_str, but with a given start value*/ -YAZ_EXPORT int yaz_log_mask_str_x(const char *str, int level); - - -/** - * yaz_log_module_level returns a log level mask corresponding to the module - * name. If that had been specified on the -v arguments (that is, passed to - * yaz_log_mask_str), then a non-zero mask is returned. If not, we get a - * zero. This can later be used in yaz_log for the level argument - */ -YAZ_EXPORT int yaz_log_module_level(const char *name); - -/** yaz_log_file returns the file handle for yaz_log. */ -YAZ_EXPORT FILE *yaz_log_file(void); - -YAZ_EXPORT void log_event_start(void (*func)(int level, const char *msg, void *info), - void *info); -YAZ_EXPORT void log_event_end(void (*func)(int level, const char *msg, void *info), - void *info); - -YAZ_EXPORT void yaz_log_reopen(void); - -YAZ_END_CDECL - -#endif diff --git a/src/atoin.c b/src/atoin.c index 47f5cd8..6138300 100644 --- a/src/atoin.c +++ b/src/atoin.c @@ -2,7 +2,7 @@ * Copyright (c) 1997-2004, Index Data * See the file LICENSE for details. * - * $Id: atoin.c,v 1.3 2004-10-15 00:18:59 adam Exp $ + * $Id: atoin.c,v 1.4 2004-12-13 14:21:55 heikki Exp $ */ /** @@ -16,7 +16,7 @@ #include #include -#include + /** * atoi_n: like atoi but reads at most len characters. diff --git a/src/eventl.c b/src/eventl.c index 6d22779..0f58732 100644 --- a/src/eventl.c +++ b/src/eventl.c @@ -2,7 +2,7 @@ * Copyright (c) 1995-2004, Index Data * See the file LICENSE for details. * - * $Id: eventl.c,v 1.3 2004-11-18 15:18:13 heikki Exp $ + * $Id: eventl.c,v 1.4 2004-12-13 14:21:55 heikki Exp $ */ /** @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include #include "eventl.h" diff --git a/src/log.c b/src/log.c index ff6aac5..6fd475d 100644 --- a/src/log.c +++ b/src/log.c @@ -2,7 +2,7 @@ * Copyright (c) 1995-2004, Index Data * See the file LICENSE for details. * - * $Id: log.c,v 1.17 2004-11-23 14:10:47 heikki Exp $ + * $Id: log.c,v 1.18 2004-12-13 14:21:55 heikki Exp $ */ /** @@ -34,7 +34,8 @@ #include #include #include -#include +#include +#include static NMEM_MUTEX log_mutex = 0; static int mutex_init_flag = 0; /* not yet initialized */ diff --git a/src/logrpn.c b/src/logrpn.c index 5d211e1..133c6f7 100644 --- a/src/logrpn.c +++ b/src/logrpn.c @@ -2,7 +2,7 @@ * Copyright (C) 1995-2004, Index Data * All rights reserved. * - * $Id: logrpn.c,v 1.7 2004-11-18 15:18:13 heikki Exp $ + * $Id: logrpn.c,v 1.8 2004-12-13 14:21:55 heikki Exp $ */ /** @@ -13,7 +13,7 @@ #include #include -#include +#include #include diff --git a/src/nmem.c b/src/nmem.c index a16603d..d1c4633 100644 --- a/src/nmem.c +++ b/src/nmem.c @@ -2,7 +2,7 @@ * Copyright (c) 1995-2004, Index Data. * See the file LICENSE for details. * - * $Id: nmem.c,v 1.6 2004-11-18 15:18:13 heikki Exp $ + * $Id: nmem.c,v 1.7 2004-12-13 14:21:55 heikki Exp $ */ /** @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #ifdef WIN32 diff --git a/src/odr.c b/src/odr.c index 964193e..96d5ff6 100644 --- a/src/odr.c +++ b/src/odr.c @@ -2,7 +2,7 @@ * Copyright (c) 1995-2004, Index Data * See the file LICENSE for details. * - * $Id: odr.c,v 1.9 2004-11-18 15:18:13 heikki Exp $ + * $Id: odr.c,v 1.10 2004-12-13 14:21:55 heikki Exp $ * */ @@ -20,7 +20,7 @@ #include #include -#include +#include #include "odr-priv.h" static int log_level=0; diff --git a/src/readconf.c b/src/readconf.c index b8ca118..849995c 100644 --- a/src/readconf.c +++ b/src/readconf.c @@ -2,7 +2,7 @@ * Copyright (C) 1994-2004, Index Data * All rights reserved. * - * $Id: readconf.c,v 1.3 2004-11-18 15:18:13 heikki Exp $ + * $Id: readconf.c,v 1.4 2004-12-13 14:21:55 heikki Exp $ */ /** @@ -17,7 +17,7 @@ #include #include -#include +#include #include #define l_isspace(c) ((c) == '\t' || (c) == ' ' || (c) == '\n' || (c) == '\r') diff --git a/src/seshigh.c b/src/seshigh.c index b806f81..0d65706 100644 --- a/src/seshigh.c +++ b/src/seshigh.c @@ -2,7 +2,7 @@ * Copyright (c) 1995-2004, Index Data * See the file LICENSE for details. * - * $Id: seshigh.c,v 1.37 2004-12-02 19:12:52 adam Exp $ + * $Id: seshigh.c,v 1.38 2004-12-13 14:21:55 heikki Exp $ */ /** * \file seshigh.c @@ -50,7 +50,7 @@ #include "session.h" #include #include -#include +#include #include #include #include @@ -1419,7 +1419,7 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb) assoc->init->implementation_name, odr_prepend(assoc->encode, "GFS", resp->implementationName)); - version = odr_strdup(assoc->encode, "$Revision: 1.37 $"); + version = odr_strdup(assoc->encode, "$Revision: 1.38 $"); if (strlen(version) > 10) /* check for unexpanded CVS strings */ version[strlen(version)-2] = '\0'; resp->implementationVersion = odr_prepend(assoc->encode, diff --git a/src/statserv.c b/src/statserv.c index 9d12c7a..d111a6f 100644 --- a/src/statserv.c +++ b/src/statserv.c @@ -5,7 +5,7 @@ * NT threaded server code by * Chas Woodfield, Fretwell Downing Informatics. * - * $Id: statserv.c,v 1.12 2004-11-18 15:18:13 heikki Exp $ + * $Id: statserv.c,v 1.13 2004-12-13 14:21:55 heikki Exp $ */ /** @@ -41,7 +41,7 @@ #ifdef USE_XTIMOSI #include #endif -#include +#include #include "eventl.h" #include "session.h" #include diff --git a/src/tcpdchk.c b/src/tcpdchk.c index 5f18801..0ce6fd0 100644 --- a/src/tcpdchk.c +++ b/src/tcpdchk.c @@ -2,7 +2,7 @@ * Copyright (c) 1995-2004, Index Data * See the file LICENSE for details. * - * $Id: tcpdchk.c,v 1.3 2004-11-18 15:18:13 heikki Exp $ + * $Id: tcpdchk.c,v 1.4 2004-12-13 14:21:56 heikki Exp $ */ /** * \file tcpdchk.c @@ -15,7 +15,7 @@ #include #include #include -#include +#include #if HAVE_TCPD_H diff --git a/src/tpath.c b/src/tpath.c index 45d0784..03c44c4 100644 --- a/src/tpath.c +++ b/src/tpath.c @@ -2,7 +2,7 @@ * Copyright (c) 1995-2004, Index Data. * See the file LICENSE for details. * - * $Id: tpath.c,v 1.3 2004-11-18 15:18:14 heikki Exp $ + * $Id: tpath.c,v 1.4 2004-12-13 14:21:56 heikki Exp $ */ /** * \file tpath.c @@ -18,7 +18,7 @@ #include #include #include -#include +#include FILE *yaz_path_fopen(const char *path, const char *name, const char *mode) { diff --git a/src/xmalloc.c b/src/xmalloc.c index 948e518..51040f4 100644 --- a/src/xmalloc.c +++ b/src/xmalloc.c @@ -2,7 +2,7 @@ * Copyright (C) 1994-2004, Index Data * All rights reserved. * - * $Id: xmalloc.c,v 1.3 2004-11-18 15:18:14 heikki Exp $ + * $Id: xmalloc.c,v 1.4 2004-12-13 14:21:56 heikki Exp $ */ /** * \file xmalloc.c @@ -17,7 +17,7 @@ #include #include -#include +#include #include #ifndef TRACE_XMALLOC diff --git a/src/zoom-c.c b/src/zoom-c.c index e95ca03..cc671a8 100644 --- a/src/zoom-c.c +++ b/src/zoom-c.c @@ -2,7 +2,7 @@ * Copyright (c) 2000-2004, Index Data * See the file LICENSE for details. * - * $Id: zoom-c.c,v 1.32 2004-11-18 15:18:14 heikki Exp $ + * $Id: zoom-c.c,v 1.33 2004-12-13 14:21:56 heikki Exp $ */ /** * \file zoom-c.c @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include #include @@ -1037,7 +1037,7 @@ static zoom_ret ZOOM_connection_send_init (ZOOM_connection c) ZOOM_options_get(c->options, "implementationName"), odr_prepend(c->odr_out, "ZOOM-C", ireq->implementationName)); - version = odr_strdup(c->odr_out, "$Revision: 1.32 $"); + version = odr_strdup(c->odr_out, "$Revision: 1.33 $"); if (strlen(version) > 10) /* check for unexpanded CVS strings */ version[strlen(version)-2] = '\0'; ireq->implementationVersion = odr_prepend(c->odr_out, diff --git a/test/tstlog.c b/test/tstlog.c index 80ed063..2e99b8c 100644 --- a/test/tstlog.c +++ b/test/tstlog.c @@ -2,13 +2,13 @@ * Copyright (c) 2004, Index Data * See the file LICENSE for details. * - * $Id: tstlog.c,v 1.2 2004-11-18 15:18:14 heikki Exp $ + * $Id: tstlog.c,v 1.3 2004-12-13 14:21:58 heikki Exp $ * */ #include #include #include -#include +#include int main(int argc, char **argv) { diff --git a/zoom/zoomsh.c b/zoom/zoomsh.c index 6f37182..f0c544a 100644 --- a/zoom/zoomsh.c +++ b/zoom/zoomsh.c @@ -2,7 +2,7 @@ * Copyright (c) 2002-2004, Index Data. * See the file LICENSE for details. * - * $Id: zoomsh.c,v 1.30 2004-11-18 15:18:14 heikki Exp $ + * $Id: zoomsh.c,v 1.31 2004-12-13 14:21:58 heikki Exp $ */ /* ZOOM-C Shell */ @@ -23,7 +23,7 @@ #include -#include +#include #include #include #include diff --git a/ztest/read-grs.c b/ztest/read-grs.c index 1156e03..2acbca5 100644 --- a/ztest/read-grs.c +++ b/ztest/read-grs.c @@ -2,7 +2,7 @@ * Copyright (c) 1995-2003, Index Data. * See the file LICENSE for details. * - * $Id: read-grs.c,v 1.9 2004-11-18 15:18:14 heikki Exp $ + * $Id: read-grs.c,v 1.10 2004-12-13 14:21:59 heikki Exp $ */ /* @@ -14,7 +14,7 @@ #include #include -#include +#include #define GRS_MAX_FIELDS 50 -- 1.7.10.4