From 8afcf4bcf11c91eafe016e1e85ef727776da7895 Mon Sep 17 00:00:00 2001 From: laforge Date: Mon, 9 Dec 2002 15:03:51 +0000 Subject: General code cleanup by Roberto Nibali: - linking for dlopen() needs to be after the object generation - fix small typo in Rules.make.in - #ifdef DEBUG all functions that are not used - add missing #include's - fix sloppy braceing - added return for 'int main()' --- Makefile.in | 2 +- Rules.make.in | 2 +- extensions/ulogd_LOCAL.c | 1 + extensions/ulogd_LOGEMU.c | 11 +++++++---- ulogd.c | 20 +++++++++++++------- 5 files changed, 23 insertions(+), 13 deletions(-) diff --git a/Makefile.in b/Makefile.in index a7d01e1..52bede7 100644 --- a/Makefile.in +++ b/Makefile.in @@ -32,7 +32,7 @@ recurse: @for d in $(SUBDIRS); do if ! make -C $$d; then exit 1; fi; done ulogd: ulogd.c $(LIBIPULOG) ulogd.h conffile/conffile.o $(LIBIPULOG)/libipulog.a - $(CC) $(CFLAGS) -rdynamic $(LIBS) $< conffile/conffile.o $(LIBIPULOG)/libipulog.a -o $@ + $(CC) $(CFLAGS) -rdynamic $< conffile/conffile.o $(LIBIPULOG)/libipulog.a -o $@ $(LIBS) clean: # rm -f ulogd *.o extensions/*.o extensions/*.so conffile/*.o diff --git a/Rules.make.in b/Rules.make.in index e5339f3..468df72 100644 --- a/Rules.make.in +++ b/Rules.make.in @@ -17,7 +17,7 @@ INCCONFFILE=-I@top_srcdir@/conffile CC=@CC@ CFLAGS=@CFLAGS@ @CPPFLAGS@ CFLAGS+=-DULOGD_CONFIGFILE=\"$(ULOGD_CONFIGFILE)\" -# doesn't wor for subdirs +# doesn't work for subdirs #CFLAGS+=$(INCIPULOG) $(INCCONFFILE) CFLAGS+=-I/usr/src/linux/include #CFLAGS+=@DEFS@ diff --git a/extensions/ulogd_LOCAL.c b/extensions/ulogd_LOCAL.c index e396cf5..f6078c4 100644 --- a/extensions/ulogd_LOCAL.c +++ b/extensions/ulogd_LOCAL.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #ifdef DEBUG_LOCAL diff --git a/extensions/ulogd_LOGEMU.c b/extensions/ulogd_LOGEMU.c index c31708f..24f61d9 100644 --- a/extensions/ulogd_LOGEMU.c +++ b/extensions/ulogd_LOGEMU.c @@ -1,4 +1,4 @@ -/* ulogd_LOGEMU.c, Version $Revision: 1.9 $ +/* ulogd_LOGEMU.c, Version $Revision: 1.10 $ * * ulogd output target for syslog logging emulation * @@ -20,7 +20,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: ulogd_LOGEMU.c,v 1.9 2002/04/27 19:45:51 laforge Exp $ + * $Id: ulogd_LOGEMU.c,v 1.10 2002/12/09 14:42:43 laforge Exp $ * */ @@ -30,6 +30,9 @@ #include #include #include +#include +#include +#include #include #include #include @@ -119,11 +122,11 @@ int _output_logemu(ulog_iret_t *res) timestr = ctime(&now) + 4; /* truncate time */ - if (tmp = strchr(timestr, '\n')) + if ((tmp = strchr(timestr, '\n'))) *tmp = '\0'; /* truncate hostname */ - if (tmp = strchr(hostname, '.')) + if ((tmp = strchr(hostname, '.'))) *tmp = '\0'; /* print time and hostname */ diff --git a/ulogd.c b/ulogd.c index 201a88a..9d985f6 100644 --- a/ulogd.c +++ b/ulogd.c @@ -1,6 +1,6 @@ -/* ulogd, Version $Revision: 1.28 $ +/* ulogd, Version $Revision: 1.29 $ * - * $Id: ulogd.c,v 1.28 2002/07/30 07:23:36 laforge Exp $ + * $Id: ulogd.c,v 1.29 2002/12/09 14:42:43 laforge Exp $ * * userspace logging daemon for the netfilter ULOG target * of the linux 2.4 netfilter subsystem. @@ -20,7 +20,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: ulogd.c,v 1.28 2002/07/30 07:23:36 laforge Exp $ + * $Id: ulogd.c,v 1.29 2002/12/09 14:42:43 laforge Exp $ * * Modifications: * 14 Jun 2001 Martin Josefsson @@ -39,6 +39,7 @@ #include #include #include +#include #include #include #include @@ -145,6 +146,7 @@ unsigned int interh_getid(const char *name) return 0; } +#ifdef DEBUG /* dump out the contents of the interpreter hash */ static void interh_dump(void) { @@ -155,6 +157,7 @@ static void interh_dump(void) i, (ulogd_interh[i])->name); } +#endif /* key hash allocation granularity */ #define KEYH_ALLOC_GRAN 20 @@ -207,6 +210,7 @@ static unsigned int keyh_allocid(ulog_interpreter_t *ip, unsigned int offset, return id; } +#ifdef DEBUG /* dump the keyhash to standard output */ static void keyh_dump(void) { @@ -217,6 +221,7 @@ static void keyh_dump(void) printf("ulogd_keyh[%lu] = %s:%u\n", i, ulogd_keyh[i].interp->name, ulogd_keyh[i].offset); } +#endif /* get keyid by name */ unsigned int keyh_getid(const char *name) @@ -670,8 +675,8 @@ int main(int argc, char* argv[]) /* endless loop receiving packets and handling them over to * handle_packet */ - while (len = ipulog_read(libulog_h, libulog_buf, - bufsiz_ce.u.value, 1)) { + while ((len = ipulog_read(libulog_h, libulog_buf, + bufsiz_ce.u.value, 1))) { if (len <= 0) { /* this is not supposed to happen */ @@ -679,8 +684,8 @@ int main(int argc, char* argv[]) "ipulog_errno == %d, errno = %d\n", len, ipulog_errno, errno); } else { - while (upkt = ipulog_get_packet(libulog_h, - libulog_buf, len)) { + while ((upkt = ipulog_get_packet(libulog_h, + libulog_buf, len))) { DEBUGP("==> packet received\n"); handle_packet(upkt); } @@ -689,4 +694,5 @@ int main(int argc, char* argv[]) /* hackish, but result is the same */ sigterm_handler(SIGTERM); + return(0); } -- cgit v1.2.3