error() returns void; declare all variables as extern

diff --git a/dhcpd.h b/dhcpd.h
index 558f8abad502631f1a7f1ca4eb658c13035ecf00..d4eb1c30b60d9eb85e42ceabff31a80877a17de5 100644 (file)
--- a/dhcpd.h
+++ b/dhcpd.h
@@ -48,7 +48,7 @@
 #include <fcntl.h>
 #include <stdio.h>
 #include <unistd.h>
-#include <strings.h>
+#include <string.h>
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <ctype.h>
@@ -213,16 +213,16 @@ int store_options PROTO ((unsigned char *, int, struct tree_cache **,
 char *pretty_print_option PROTO ((unsigned char, unsigned char *, int));
 
 /* errwarn.c */
-int error PROTO ((char *, ...));
+void error PROTO ((char *, ...));
 int warn PROTO ((char *, ...));
 int note PROTO ((char *, ...));
 int debug PROTO ((char *, ...));
 int parse_warn PROTO ((char *, ...));
 
 /* dhcpd.c */
-TIME cur_time;
-TIME default_lease_time;
-TIME max_lease_time;
+extern TIME cur_time;
+extern TIME default_lease_time;
+extern TIME max_lease_time;
 
 extern u_int16_t server_port;
 extern int log_priority;

diff --git a/includes/dhcpd.h b/includes/dhcpd.h
index 558f8abad502631f1a7f1ca4eb658c13035ecf00..d4eb1c30b60d9eb85e42ceabff31a80877a17de5 100644 (file)
--- a/includes/dhcpd.h
+++ b/includes/dhcpd.h
@@ -48,7 +48,7 @@
 #include <fcntl.h>
 #include <stdio.h>
 #include <unistd.h>
-#include <strings.h>
+#include <string.h>
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <ctype.h>
@@ -213,16 +213,16 @@ int store_options PROTO ((unsigned char *, int, struct tree_cache **,
 char *pretty_print_option PROTO ((unsigned char, unsigned char *, int));
 
 /* errwarn.c */
-int error PROTO ((char *, ...));
+void error PROTO ((char *, ...));
 int warn PROTO ((char *, ...));
 int note PROTO ((char *, ...));
 int debug PROTO ((char *, ...));
 int parse_warn PROTO ((char *, ...));
 
 /* dhcpd.c */
-TIME cur_time;
-TIME default_lease_time;
-TIME max_lease_time;
+extern TIME cur_time;
+extern TIME default_lease_time;
+extern TIME max_lease_time;
 
 extern u_int16_t server_port;
 extern int log_priority;