Fixed a Unixism in log.c (NULL == 0) and a typo in a make rule.

diff --git a/src/main/Makefile b/src/main/Makefile
index 71d6bc7..938682b 100644 (file)
--- a/src/main/Makefile
+++ b/src/main/Makefile
@@ -67,7 +67,7 @@ session.o:  session.c $(INCLUDES) ../include/modules.h
 request_list.o:  request_list.c $(INCLUDES)
        $(CC) $(CFLAGS) -c request_list.c
 
-request_tree.o:  request_tre.c $(INCLUDES)
+request_tree.o:  request_tree.c $(INCLUDES)
        $(CC) $(CFLAGS) -c request_tree.c
 
 proxy.o:  proxy.c $(INCLUDES)

diff --git a/src/main/log.c b/src/main/log.c
index 83b312b..2317d3f 100644 (file)
--- a/src/main/log.c
+++ b/src/main/log.c
@@ -58,7 +58,7 @@ static int do_log(int lvl, const char *fmt, va_list ap)
                }
        }
 
-       timeval = time(0);
+       timeval = time(NULL);
 #if HAVE_SYSLOG_H
        if (use_syslog)
                *buffer = '\0';
@@ -99,7 +99,7 @@ static int do_log(int lvl, const char *fmt, va_list ap)
        /*
         *      Filter out characters not in Latin-1.
         */
-       for (p = (unsigned char *)buffer; *p; p++) {
+       for (p = (unsigned char *)buffer; *p != '\0'; p++) {
                if (*p == '\r' || *p == '\n')
                        *p = ' ';
                else if (*p < 32 || (*p >= 128 && *p <= 160))