along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: logger.c,v 1.1.2.1 2003/07/06 22:11:31 guus Exp $
+ $Id: logger.c,v 1.1.2.5 2003/07/22 20:55:19 guus Exp $
*/
-#include <stdio.h>
-#include <stdarg.h>
-#include <syslog.h>
+#include "system.h"
#include "conf.h"
#include "logger.h"
-#include "system.h"
-
-volatile int debug_level = DEBUG_NOTHING;
-int logmode = LOGMODE_STDERR;
-pid_t logpid;
+debug_t debug_level = DEBUG_NOTHING;
+static logmode_t logmode = LOGMODE_STDERR;
+static pid_t logpid;
extern char *logfilename;
-FILE *logfile = NULL;
-const char *logident = NULL;
-
-void openlogger(const char *ident, int mode) {
- char *fname;
+static FILE *logfile = NULL;
+static const char *logident = NULL;
+void openlogger(const char *ident, logmode_t mode) {
logident = ident;
logmode = mode;
switch(mode) {
+ case LOGMODE_NULL:
+ break;
case LOGMODE_STDERR:
logpid = getpid();
break;
}
}
-void vlogger(int priority, const char *format, va_list ap) {
+void logger(int priority, const char *format, ...) {
+ va_list ap;
+
+ va_start(ap, format);
+
switch(logmode) {
+ case LOGMODE_NULL:
+ break;
case LOGMODE_STDERR:
vfprintf(stderr, format, ap);
fprintf(stderr, "\n");
break;
case LOGMODE_FILE:
- fprintf(logfile, "%d %s[%d]: ", time(NULL), logident, logpid);
+ fprintf(logfile, "%ld %s[%d]: ", time(NULL), logident, logpid);
vfprintf(logfile, format, ap);
fprintf(logfile, "\n");
break;
#endif
break;
}
+
+ va_end(ap);
}
void closelogger(void) {
switch(logmode) {
+ case LOGMODE_NULL:
+ case LOGMODE_STDERR:
+ break;
case LOGMODE_FILE:
fclose(logfile);
break;