Index: readlogs.c
===================================================================
RCS file: /var/lib/cvs/public/bbs100-1.2/src/readlogs.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- readlogs.c	12 Dec 2003 04:11:38 -0000	1.1.1.1
+++ readlogs.c	25 Dec 2003 14:51:21 -0000	1.2
@@ -41,7 +41,7 @@
 	FILE *f;
 } Logfile;
 
-Logfile log[4] = {
+Logfile logs[4] = {
 	{ "auth",		"", NULL },
 	{ "messages",	"", NULL },
 	{ "errors",		"", NULL },
@@ -114,38 +114,38 @@
 			}
 		}
 	}
-	num = sizeof(log)/sizeof(Logfile);
+	num = sizeof(logs)/sizeof(Logfile);
 	for(i = 0; i < num; i++) {
-		sprintf(buf, "log/%s/%s.%02d", log[i].name, log[i].name, day);
+		sprintf(buf, "log/%s/%s.%02d", logs[i].name, logs[i].name, day);
 
-		if ((log[i].f = fopen(buf, "r")) == NULL) {
+		if ((logs[i].f = fopen(buf, "r")) == NULL) {
 			printf("failed to open %s, continuing\n", buf);
 			continue;
 		}
-		if (fgets(log[i].buf, 256, log[i].f) == NULL) {
-			fclose(log[i].f);
-			log[i].f = NULL;
+		if (fgets(logs[i].buf, 256, logs[i].f) == NULL) {
+			fclose(logs[i].f);
+			logs[i].f = NULL;
 		}
 	}
 	for(;;) {
 		for(smallest = 0; smallest < num; smallest++) {
-			if (log[smallest].f != NULL)
+			if (logs[smallest].f != NULL)
 				break;
 		}
 		if (smallest >= num)
 			break;
 
 		for(i = smallest+1; i < num; i++)
-			if (log[i].f != NULL && strcmp(log[smallest].buf, log[i].buf) > 0)
+			if (logs[i].f != NULL && strcmp(logs[smallest].buf, logs[i].buf) > 0)
 				smallest = i;
 
 
-		if (strlen(log[smallest].buf) > (DATE_TIME_LEN+1)) {
+		if (strlen(logs[smallest].buf) > (DATE_TIME_LEN+1)) {
 			if (flags & OPT_NO_LOG) {
 				*buf = 0;
 				len = 0;
 			} else {
-				sprintf(buf, "%8s", log[smallest].name);
+				sprintf(buf, "%8s", logs[smallest].name);
 				len = strlen(buf);
 			}
 			if (!(flags & OPT_NO_DATE)) {
@@ -153,15 +153,15 @@
 					buf[len++] = ' ';
 					buf[len] = 0;
 				}
-				strncpy(buf+len, log[smallest].buf, DATE_LEN);
+				strncpy(buf+len, logs[smallest].buf, DATE_LEN);
 
 				if (!(flags & OPT_NOT_PRETTY)) {
-					if (!strncmp(timebuf, log[smallest].buf, DATE_TIME_LEN)) {
+					if (!strncmp(timebuf, logs[smallest].buf, DATE_TIME_LEN)) {
 						for(i = 0; i < DATE_LEN; i++)
 							buf[len+i] = ' ';
 						do_time = 0;
 					} else {
-						strncpy(timebuf, log[smallest].buf, DATE_TIME_LEN);
+						strncpy(timebuf, logs[smallest].buf, DATE_TIME_LEN);
 						timebuf[DATE_TIME_LEN] = 0;
 						do_time = 1;
 					}
@@ -174,11 +174,11 @@
 					buf[len++] = ' ';
 					buf[len] = 0;
 				}
-				strncpy(buf+len, log[smallest].buf+DATE_LEN+1, TIME_LEN);
+				strncpy(buf+len, logs[smallest].buf+DATE_LEN+1, TIME_LEN);
 
 				if (!(flags & OPT_NOT_PRETTY)) {
-					if (do_time || strncmp(timebuf, log[smallest].buf, DATE_TIME_LEN)) {
-						strncpy(timebuf, log[smallest].buf, DATE_TIME_LEN);
+					if (do_time || strncmp(timebuf, logs[smallest].buf, DATE_TIME_LEN)) {
+						strncpy(timebuf, logs[smallest].buf, DATE_TIME_LEN);
 						timebuf[DATE_TIME_LEN] = 0;
 					} else {
 						for(i = 0; i < TIME_LEN; i++)
@@ -193,11 +193,11 @@
 				buf[len++] = ' ';
 				buf[len] = 0;
 			}
-			printf("%s%s", buf, log[smallest].buf + DATE_TIME_LEN);
+			printf("%s%s", buf, logs[smallest].buf + DATE_TIME_LEN);
 		}
-		if (fgets(log[smallest].buf, 256, log[smallest].f) == NULL) {
-			fclose(log[smallest].f);
-			log[smallest].f = NULL;
+		if (fgets(logs[smallest].buf, 256, logs[smallest].f) == NULL) {
+			fclose(logs[smallest].f);
+			logs[smallest].f = NULL;
 		}
 	}
 	return 0;
Index: resolver.c
===================================================================
RCS file: /var/lib/cvs/public/bbs100-1.2/src/resolver.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- resolver.c	12 Dec 2003 04:11:38 -0000	1.1.1.1
+++ resolver.c	25 Dec 2003 14:51:21 -0000	1.2
@@ -34,6 +34,7 @@
 
 #include <stdio.h>
 #include <unistd.h>
+#include <stdlib.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/socket.h>
Index: include/util.h
===================================================================
RCS file: /var/lib/cvs/public/bbs100-1.2/src/include/util.h,v
retrieving revision 1.1.1.1
retrieving revision 1.3
diff -u -r1.1.1.1 -r1.3
--- include/util.h	12 Dec 2003 04:11:38 -0000	1.1.1.1
+++ include/util.h	24 Dec 2003 17:31:18 -0000	1.3
@@ -41,17 +41,21 @@
 #define logmsg				fprintf(stderr, "MSG ");  LogMsg
 #define logauth				fprintf(stderr, "AUTH "); LogMsg
 
-#define UserError(a,b,c,d)	Put((a), "\027ERROR: \022" b "\n\n");	\
-							fprintf(stderr, "ERR %d %s  %s\n", (c), (d), (b))
-
 #ifdef __GNUC__
-  #define logerr			fprintf(stderr, "ERR %d %s %s  ", __LINE__, __FILE__, __PRETTY_FUNCTION__ "()"); LogMsg
-  #define logerror			fprintf(stderr, "ERR %d %s %s  ", __LINE__, __FILE__, __PRETTY_FUNCTION__ "()"); LogError
+/* Warning clean up by Robert de Forest <robert-bbs100@defore.st> */
+  #define logerr			fprintf(stderr, "ERR %d %s %s()  ", __LINE__, __FILE__, __PRETTY_FUNCTION__); LogMsg
+  #define logerror			fprintf(stderr, "ERR %d %s %s()  ", __LINE__, __FILE__, __PRETTY_FUNCTION__); LogError
+
+  #define UserError(a,b,c,d,e)	Put((a), "\027ERROR: \022" b "\n\n");	\
+								fprintf(stderr, "ERR %d %s %s() %s\n", (c), (d), (e), (b))
 
-  #define Perror(x,y)		UserError((x), y, __LINE__, __FILE__ " " __PRETTY_FUNCTION__ "()")
+  #define Perror(x,y)		UserError((x), y, __LINE__, __FILE__, __PRETTY_FUNCTION__)
 #else
   #define logerr			fprintf(stderr, "ERR %d %s  ", __LINE__, __FILE__); LogMsg
   #define logerror			fprintf(stderr, "ERR %d %s  ", __LINE__, __FILE__); LogError
+
+  #define UserError(a,b,c,d)	Put((a), "\027ERROR: \022" b "\n\n");	\
+								fprintf(stderr, "ERR %d %s  %s\n", (c), (d), (b))
 
   #define Perror(x,y)		UserError((x), y, __LINE__, __FILE__)
 #endif