From 938eac215351d662d5ed11efbd95f5e123f3195b Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Wed, 28 Oct 1998 10:26:59 +0000 Subject: [PATCH] New functions log_init_file, log_init_level, log_init_prefix. --- include/log.h | 9 ++++++++- util/log.c | 34 ++++++++++++++++++++++++++-------- 2 files changed, 34 insertions(+), 9 deletions(-) diff --git a/include/log.h b/include/log.h index 8276260..a7e9c9d 100644 --- a/include/log.h +++ b/include/log.h @@ -24,7 +24,10 @@ * OF THIS SOFTWARE. * * $Log: log.h,v $ - * Revision 1.13 1998-10-13 16:11:11 adam + * Revision 1.14 1998-10-28 10:26:59 adam + * New functions log_init_file, log_init_level, log_init_prefix. + * + * Revision 1.13 1998/10/13 16:11:11 adam * Added printf-format check for logf when using GNUC. * * Revision 1.12 1997/09/04 07:59:02 adam @@ -101,6 +104,10 @@ extern "C" { #define LOG_DEFAULT_LEVEL (LOG_FATAL | LOG_ERRNO | LOG_LOG | LOG_WARN) YAZ_EXPORT void log_init(int level, const char *prefix, const char *name); +YAZ_EXPORT void log_init_file (const char *fname); +YAZ_EXPORT void log_init_level (int level); +YAZ_EXPORT void log_init_prefix (const char *prefix); + YAZ_EXPORT void logf(int level, const char *fmt, ...) #ifdef __GNUC__ __attribute__ ((format (printf, 2, 3))) diff --git a/util/log.c b/util/log.c index 1b423ba..f6b1185 100644 --- a/util/log.c +++ b/util/log.c @@ -4,7 +4,10 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: log.c,v $ - * Revision 1.17 1997-12-09 16:11:02 adam + * Revision 1.18 1998-10-28 10:27:00 adam + * New functions log_init_file, log_init_level, log_init_prefix. + * + * Revision 1.17 1997/12/09 16:11:02 adam * Assume strerror is defined on Unixes as well. It's standard ANSI. * * Revision 1.16 1997/10/06 08:55:07 adam @@ -135,26 +138,41 @@ FILE *log_file(void) return l_file; } -void log_init(int level, const char *prefix, const char *name) +void log_init_file (const char *fname) { FILE *new_file; - l_level = level; - if (prefix && *prefix) - sprintf(l_prefix, "%.512s", prefix); if (!l_file) l_file = stderr; - if (!name || !*name) + if (!fname || !*fname) return; - if (!(new_file = fopen(name, "a"))) + if (!(new_file = fopen(fname, "a"))) return; if (l_file != stderr) { - setvbuf(new_file, 0, _IONBF, 0); fclose (l_file); } + setvbuf(new_file, 0, _IONBF, 0); l_file = new_file; } +void log_init_level (int level) +{ + l_level = level; +} + +void log_init_prefix (const char *prefix) +{ + if (prefix && *prefix) + sprintf(l_prefix, "%.512s", prefix); +} + +void log_init(int level, const char *prefix, const char *fname) +{ + log_init_level (level); + log_init_prefix (prefix); + log_init_file (fname); +} + static void (*start_hook_func)(int, const char *, void *) = NULL; static void *start_hook_info; static void (*end_hook_func)(int, const char *, void *) = NULL; -- 1.7.10.4