Add argument to cons_options; clean up some old junk

diff --git a/dhcpd.h b/dhcpd.h
index a966170caae747caccc14ae1195970792ad61f1b..7a367028ea180e1dd2592b96a96c638b9a1011d8 100644 (file)
--- a/dhcpd.h
+++ b/dhcpd.h
@@ -257,13 +257,9 @@ typedef unsigned char option_mask [16];
 void parse_options PROTO ((struct packet *));
 void parse_option_buffer PROTO ((struct packet *, unsigned char *, int));
 void cons_options PROTO ((struct packet *, struct packet *,
-                         struct tree_cache **, int));
-/* void new_cons_options PROTO ((struct packet *, struct packet *,
-                         struct tree_cache **, int)); */
+                         struct tree_cache **, int, int));
 int store_options PROTO ((unsigned char *, int, struct tree_cache **,
-                          unsigned char *, int, int, int));
-/* int store_option PROTO ((struct tree_cache **, unsigned char,
-                        unsigned char *, int, int *)); */
+                          unsigned char *, int, int, int, int));
 char *pretty_print_option PROTO ((unsigned char, unsigned char *, int));
 
 /* errwarn.c */

diff --git a/includes/dhcpd.h b/includes/dhcpd.h
index a966170caae747caccc14ae1195970792ad61f1b..7a367028ea180e1dd2592b96a96c638b9a1011d8 100644 (file)
--- a/includes/dhcpd.h
+++ b/includes/dhcpd.h
@@ -257,13 +257,9 @@ typedef unsigned char option_mask [16];
 void parse_options PROTO ((struct packet *));
 void parse_option_buffer PROTO ((struct packet *, unsigned char *, int));
 void cons_options PROTO ((struct packet *, struct packet *,
-                         struct tree_cache **, int));
-/* void new_cons_options PROTO ((struct packet *, struct packet *,
-                         struct tree_cache **, int)); */
+                         struct tree_cache **, int, int));
 int store_options PROTO ((unsigned char *, int, struct tree_cache **,
-                          unsigned char *, int, int, int));
-/* int store_option PROTO ((struct tree_cache **, unsigned char,
-                        unsigned char *, int, int *)); */
+                          unsigned char *, int, int, int, int));
 char *pretty_print_option PROTO ((unsigned char, unsigned char *, int));
 
 /* errwarn.c */