From: mmj Date: Thu, 22 Apr 2004 15:38:55 +0000 (+1000) Subject: log_error is it's own object now X-Git-Tag: RELEASE_1_0_0~304 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1aa51dc241f25068c7ff9d64cce7cf8196cf85ee;p=thirdparty%2Fmlmmj.git log_error is it's own object now --- diff --git a/include/log_error.h b/include/log_error.h new file mode 100644 index 00000000..9f9036e5 --- /dev/null +++ b/include/log_error.h @@ -0,0 +1,17 @@ +/* Copyright (C) 2004 Mads Martin Joergensen + * + * $Id$ + * + * This file is redistributable under version 2 of the GNU General + * Public License as described at http://www.gnu.org/licenses/gpl.txt + */ + +#ifndef LOG_ERROR_H +#define LOG_ERROR_H + +#define log_error(msg) log_error_do(msg,__FILE__,__LINE__) + +void log_set_name(const char *name); +void log_error_do(const char *msg, const char *file, int line); + +#endif /* LOG_ERROR_H */ diff --git a/src/Makefile.am b/src/Makefile.am index 3da747d4..a19ca56f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -15,22 +15,24 @@ EXTRA_DIST = mlmmj-make-ml.sh mlmmj_send_SOURCES = mlmmj-send.c writen.c mail-functions.c itoa.c chomp.c \ incindexfile.c checkwait_smtpreply.c getlistaddr.c \ mylocking.c init_sockfd.c strgen.c random-int.c \ - print-version.c + print-version.c log_error.c mlmmj_recieve_SOURCES = mlmmj-recieve.c writen.c random-int.c header_token.c \ getlistaddr.c chomp.c strgen.c print-version.c \ - mygetline.c + mygetline.c log_error.c mlmmj_process_SOURCES = mlmmj-process.c writen.c find_email_adr.c \ incindexfile.c itoa.c getlistaddr.c chomp.c \ mylocking.c listcontrol.c random-int.c strgen.c i\ header_token.c print-version.c send_help.c \ - do_all_the_voodo_here.c mygetline.c gethdrline.c + do_all_the_voodo_here.c mygetline.c gethdrline.c \ + log_error.c mlmmj_subscribe_SOURCES = mlmmj-subscribe.c writen.c mylocking.c \ getlistaddr.c chomp.c random-int.c strgen.c \ - subscriberfuncs.c readln.c print-version.c + subscriberfuncs.c readln.c print-version.c \ + log_error.c mlmmj_unsubscribe_SOURCES = mlmmj-unsubscribe.c writen.c readln.c mylocking.c\ getlistaddr.c chomp.c subscriberfuncs.c random-int.c \ - strgen.c print-version.c + strgen.c print-version.c log_error.c diff --git a/src/Makefile.in b/src/Makefile.in index 5c6917a2..90ef47f1 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -60,13 +60,14 @@ am_mlmmj_process_OBJECTS = mlmmj-process.$(OBJEXT) writen.$(OBJEXT) \ listcontrol.$(OBJEXT) random-int.$(OBJEXT) strgen.$(OBJEXT) \ header_token.$(OBJEXT) print-version.$(OBJEXT) \ send_help.$(OBJEXT) do_all_the_voodo_here.$(OBJEXT) \ - mygetline.$(OBJEXT) gethdrline.$(OBJEXT) + mygetline.$(OBJEXT) gethdrline.$(OBJEXT) log_error.$(OBJEXT) mlmmj_process_OBJECTS = $(am_mlmmj_process_OBJECTS) mlmmj_process_LDADD = $(LDADD) am_mlmmj_recieve_OBJECTS = mlmmj-recieve.$(OBJEXT) writen.$(OBJEXT) \ random-int.$(OBJEXT) header_token.$(OBJEXT) \ getlistaddr.$(OBJEXT) chomp.$(OBJEXT) strgen.$(OBJEXT) \ - print-version.$(OBJEXT) mygetline.$(OBJEXT) + print-version.$(OBJEXT) mygetline.$(OBJEXT) \ + log_error.$(OBJEXT) mlmmj_recieve_OBJECTS = $(am_mlmmj_recieve_OBJECTS) mlmmj_recieve_LDADD = $(LDADD) am_mlmmj_send_OBJECTS = mlmmj-send.$(OBJEXT) writen.$(OBJEXT) \ @@ -74,21 +75,21 @@ am_mlmmj_send_OBJECTS = mlmmj-send.$(OBJEXT) writen.$(OBJEXT) \ incindexfile.$(OBJEXT) checkwait_smtpreply.$(OBJEXT) \ getlistaddr.$(OBJEXT) mylocking.$(OBJEXT) \ init_sockfd.$(OBJEXT) strgen.$(OBJEXT) random-int.$(OBJEXT) \ - print-version.$(OBJEXT) + print-version.$(OBJEXT) log_error.$(OBJEXT) mlmmj_send_OBJECTS = $(am_mlmmj_send_OBJECTS) mlmmj_send_LDADD = $(LDADD) am_mlmmj_subscribe_OBJECTS = mlmmj-subscribe.$(OBJEXT) \ writen.$(OBJEXT) mylocking.$(OBJEXT) getlistaddr.$(OBJEXT) \ chomp.$(OBJEXT) random-int.$(OBJEXT) strgen.$(OBJEXT) \ subscriberfuncs.$(OBJEXT) readln.$(OBJEXT) \ - print-version.$(OBJEXT) + print-version.$(OBJEXT) log_error.$(OBJEXT) mlmmj_subscribe_OBJECTS = $(am_mlmmj_subscribe_OBJECTS) mlmmj_subscribe_LDADD = $(LDADD) am_mlmmj_unsubscribe_OBJECTS = mlmmj-unsubscribe.$(OBJEXT) \ writen.$(OBJEXT) readln.$(OBJEXT) mylocking.$(OBJEXT) \ getlistaddr.$(OBJEXT) chomp.$(OBJEXT) \ subscriberfuncs.$(OBJEXT) random-int.$(OBJEXT) \ - strgen.$(OBJEXT) print-version.$(OBJEXT) + strgen.$(OBJEXT) print-version.$(OBJEXT) log_error.$(OBJEXT) mlmmj_unsubscribe_OBJECTS = $(am_mlmmj_unsubscribe_OBJECTS) mlmmj_unsubscribe_LDADD = $(LDADD) binSCRIPT_INSTALL = $(INSTALL_SCRIPT) @@ -106,6 +107,7 @@ am__depfiles_maybe = depfiles @AMDEP_TRUE@ ./$(DEPDIR)/incindexfile.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/init_sockfd.Po ./$(DEPDIR)/itoa.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/listcontrol.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/log_error.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/mail-functions.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/mlmmj-process.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/mlmmj-recieve.Po \ @@ -207,25 +209,27 @@ EXTRA_DIST = mlmmj-make-ml.sh mlmmj_send_SOURCES = mlmmj-send.c writen.c mail-functions.c itoa.c chomp.c \ incindexfile.c checkwait_smtpreply.c getlistaddr.c \ mylocking.c init_sockfd.c strgen.c random-int.c \ - print-version.c + print-version.c log_error.c mlmmj_recieve_SOURCES = mlmmj-recieve.c writen.c random-int.c header_token.c \ getlistaddr.c chomp.c strgen.c print-version.c \ - mygetline.c + mygetline.c log_error.c mlmmj_process_SOURCES = mlmmj-process.c writen.c find_email_adr.c \ incindexfile.c itoa.c getlistaddr.c chomp.c \ mylocking.c listcontrol.c random-int.c strgen.c i\ header_token.c print-version.c send_help.c \ - do_all_the_voodo_here.c mygetline.c gethdrline.c + do_all_the_voodo_here.c mygetline.c gethdrline.c \ + log_error.c mlmmj_subscribe_SOURCES = mlmmj-subscribe.c writen.c mylocking.c \ getlistaddr.c chomp.c random-int.c strgen.c \ - subscriberfuncs.c readln.c print-version.c + subscriberfuncs.c readln.c print-version.c \ + log_error.c mlmmj_unsubscribe_SOURCES = mlmmj-unsubscribe.c writen.c readln.c mylocking.c\ getlistaddr.c chomp.c subscriberfuncs.c random-int.c \ - strgen.c print-version.c + strgen.c print-version.c log_error.c all: all-am @@ -335,6 +339,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/init_sockfd.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/itoa.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/listcontrol.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/log_error.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mail-functions.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mlmmj-process.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mlmmj-recieve.Po@am__quote@ diff --git a/src/getlistaddr.c b/src/getlistaddr.c index d38953d2..1bf0d9c2 100644 --- a/src/getlistaddr.c +++ b/src/getlistaddr.c @@ -12,8 +12,7 @@ #include #include "getlistaddr.h" #include "chomp.h" - -#include "log_error.c" +#include "log_error.h" #define MAXLISTNAMELEN 1024 diff --git a/src/incindexfile.c b/src/incindexfile.c index ef5d5afb..03103654 100644 --- a/src/incindexfile.c +++ b/src/incindexfile.c @@ -18,8 +18,7 @@ #include "mylocking.h" #include "incindexfile.h" #include "itoa.h" - -#include "log_error.c" +#include "log_error.h" #define INTBUF_SIZE 32 diff --git a/src/init_sockfd.c b/src/init_sockfd.c index dbadf181..c780ded1 100644 --- a/src/init_sockfd.c +++ b/src/init_sockfd.c @@ -12,8 +12,7 @@ #include #include "init_sockfd.h" - -#include "log_error.c" +#include "log_error.h" void init_sockfd(int *sockfd, const char *relayhost) { diff --git a/src/listcontrol.c b/src/listcontrol.c index 6cac22d1..82aed6cf 100644 --- a/src/listcontrol.c +++ b/src/listcontrol.c @@ -18,8 +18,7 @@ #include "find_email_adr.h" #include "strgen.h" #include "send_help.h" - -#include "log_error.c" +#include "log_error.h" int listcontrol(const char *mailfilename, const char *listdir, const char *controladdr) diff --git a/src/log_error.c b/src/log_error.c index 15949303..75356276 100644 --- a/src/log_error.c +++ b/src/log_error.c @@ -3,32 +3,28 @@ #include #include #include +#include -#include "config.h" +#include "log_error.h" +#include "../config.h" #ifdef HAVE_SYSLOG_H #include #endif +char *log_name = NULL; -static char *log_name = NULL; - - -static void log_set_name(const char* name) +void log_set_name(const char* name) { if (log_name) free(log_name); log_name = strdup(name); } - -#define log_error(msg) log_error_do(msg,__FILE__,__LINE__) - -static void log_error_do(const char *msg, const char *file, unsigned int line) +void log_error_do(const char *msg, const char *file, int line) { + static int syslog_is_open = 0; if (!log_name) log_name = "mlmmj-UNKNOWN"; - #ifdef HAVE_SYSLOG - static int syslog_is_open = 0; if(!syslog_is_open) { openlog(log_name, LOG_PID|LOG_CONS, LOG_MAIL); syslog_is_open = 1; diff --git a/src/mail-functions.c b/src/mail-functions.c index 2fb54263..7897cfd3 100644 --- a/src/mail-functions.c +++ b/src/mail-functions.c @@ -20,7 +20,7 @@ #include #include -#include "log_error.c" +#include "log_error.h" /* "HELO \r\n " has length 7 */ #define EXTRA_HELO_LEN 8 diff --git a/src/mlmmj-process.c b/src/mlmmj-process.c index 2d0e110d..e5e9bf4f 100644 --- a/src/mlmmj-process.c +++ b/src/mlmmj-process.c @@ -23,8 +23,7 @@ #include "listcontrol.h" #include "strgen.h" #include "do_all_the_voodo_here.h" - -#include "log_error.c" +#include "log_error.h" static void print_help(const char *prg) { diff --git a/src/mlmmj-recieve.c b/src/mlmmj-recieve.c index 041058f6..80daec3f 100644 --- a/src/mlmmj-recieve.c +++ b/src/mlmmj-recieve.c @@ -19,8 +19,7 @@ #include "wrappers.h" #include "mygetline.h" #include "strgen.h" - -#include "log_error.c" +#include "log_error.h" extern char *optarg; diff --git a/src/mlmmj-send.c b/src/mlmmj-send.c index 85697693..28135031 100644 --- a/src/mlmmj-send.c +++ b/src/mlmmj-send.c @@ -25,8 +25,7 @@ #include "getlistaddr.h" #include "init_sockfd.h" #include "strgen.h" - -#include "log_error.c" +#include "log_error.h" static void print_help(const char *prg) diff --git a/src/mlmmj-subscribe.c b/src/mlmmj-subscribe.c index 0fe84c85..5bc48a2e 100644 --- a/src/mlmmj-subscribe.c +++ b/src/mlmmj-subscribe.c @@ -23,8 +23,7 @@ #include "getlistaddr.h" #include "strgen.h" #include "subscriberfuncs.h" - -#include "log_error.c" +#include "log_error.h" void confirm_sub(const char *listdir, const char *listaddr, const char *subaddr) { diff --git a/src/mlmmj-unsubscribe.c b/src/mlmmj-unsubscribe.c index 8e8834a2..dc82eb69 100644 --- a/src/mlmmj-unsubscribe.c +++ b/src/mlmmj-unsubscribe.c @@ -24,8 +24,7 @@ #include "getlistaddr.h" #include "subscriberfuncs.h" #include "strgen.h" - -#include "log_error.c" +#include "log_error.h" void confirm_unsub(const char *listdir, const char *listaddr, const char *subaddr) { diff --git a/src/send_help.c b/src/send_help.c index 0a8b1636..5a4e7a7e 100644 --- a/src/send_help.c +++ b/src/send_help.c @@ -10,14 +10,14 @@ #include #include #include +#include #include "mlmmj.h" #include "send_help.h" #include "strgen.h" #include "find_email_adr.h" #include "getlistaddr.h" - -#include "log_error.c" +#include "log_error.h" void send_help(const char *listdir, const char *emailaddr) {