Delete unused automatic variables

diff --git a/common/dispatch.c b/common/dispatch.c
index af6ae8c46317fbfc4fc1030a8f2b8224d1092c8b..bc9ebe11b62eec95934a183b383c493cc4bb70f2 100644 (file)
--- a/common/dispatch.c
+++ b/common/dispatch.c
@@ -49,7 +49,6 @@ static char copyright[] =
 #include <sys/ioctl.h>
 
 struct interface_info *interfaces;
-static struct hardware_link *interface_links;
 
 static void got_one PROTO ((struct interface_info *));
 
@@ -67,8 +66,6 @@ void discover_interfaces ()
        int i;
        int sock;
        int address_count = 0;
-       int ifix = 0;
-       struct hardware_link *lp;
        struct subnet *subnet;
        struct shared_network *share;
        struct sockaddr_in *foo;
@@ -323,17 +320,10 @@ void dispatch ()
 
 void dispatch ()
 {
-       struct sockaddr_in from;
-       struct hardware hfrom;
-       struct iaddr ifrom;
        fd_set r, w, x;
        struct interface_info *l;
        int max = 0;
        int count;
-       int result;
-       static unsigned char packbuf [4095]; /* Packet input buffer.
-                                               Must be as large as largest
-                                               possible MTU. */
 
        FD_ZERO (&r);
        FD_ZERO (&w);

diff --git a/common/memory.c b/common/memory.c
index 0c271bd67f04518bc1968fa61f0efd99e23596ca..5d4883c340debab0a060ce2742e4d3b1b6840c8d 100644 (file)
--- a/common/memory.c
+++ b/common/memory.c
@@ -134,7 +134,6 @@ struct host_decl *find_hosts_by_haddr (htype, haddr, hlen)
        int hlen;
 {
        struct host_decl *foo;
-       int i;
 
        foo = (struct host_decl *)hash_lookup (host_hw_addr_hash,
                                               haddr, hlen);
@@ -146,7 +145,6 @@ struct host_decl *find_hosts_by_uid (data, len)
        int len;
 {
        struct host_decl *foo;
-       int i;
 
        foo = (struct host_decl *)hash_lookup (host_uid_hash, data, len);
        return foo;
@@ -645,7 +643,6 @@ void write_leases ()
 {
        struct lease *l;
        struct shared_network *s;
-       int i;
 
        for (s = shared_networks; s; s = s -> next) {
                for (l = s -> leases; l; l = l -> next) {
@@ -661,7 +658,6 @@ void dump_subnets ()
        struct lease *l;
        struct shared_network *s;
        struct subnet *n;
-       int i;
 
        for (s = shared_networks; s; s = s -> next) {
                for (n = subnets; n; n = n -> next_sibling) {

diff --git a/common/options.c b/common/options.c
index 354c10a4f2093b1590249f9fd06219e30c401d4d..fffc27e2467b363a5117e23aa0b1b256bae9ec7c 100644 (file)
--- a/common/options.c
+++ b/common/options.c
@@ -165,8 +165,6 @@ void cons_options (inpacket, outpacket, options, overload)
        int main_buffer_size;
        int mainbufix, bufix;
        int option_size;
-       int result;
-       int i;
 
        /* If the client has provided a maximum DHCP message size,
           use that.   Otherwise, we use the default MTU size (576 bytes). */
@@ -297,10 +295,6 @@ int store_options (buffer, buflen, options, priority_list, priority_len,
 {
        int bufix = 0;
        int option_stored [256];
-       int missed = 0;
-       int missed_code = 0;
-       int missed_length = 0;
-       int result;
        int i;
        int ix;
 

diff --git a/common/socket.c b/common/socket.c
index bb4475279a05c5b19a1db2c0cee093fbbebc717f..2ce80452ca1efbaf95ecaa0036f308d46976a63d 100644 (file)
--- a/common/socket.c
+++ b/common/socket.c
@@ -61,7 +61,6 @@ int if_register_socket (info, interface)
 {
        struct sockaddr_in name;
        int sock;
-       struct socklist *tmp;
        int flag;
        static int once = 0;
 

diff --git a/dispatch.c b/dispatch.c
index af6ae8c46317fbfc4fc1030a8f2b8224d1092c8b..bc9ebe11b62eec95934a183b383c493cc4bb70f2 100644 (file)
--- a/dispatch.c
+++ b/dispatch.c
@@ -49,7 +49,6 @@ static char copyright[] =
 #include <sys/ioctl.h>
 
 struct interface_info *interfaces;
-static struct hardware_link *interface_links;
 
 static void got_one PROTO ((struct interface_info *));
 
@@ -67,8 +66,6 @@ void discover_interfaces ()
        int i;
        int sock;
        int address_count = 0;
-       int ifix = 0;
-       struct hardware_link *lp;
        struct subnet *subnet;
        struct shared_network *share;
        struct sockaddr_in *foo;
@@ -323,17 +320,10 @@ void dispatch ()
 
 void dispatch ()
 {
-       struct sockaddr_in from;
-       struct hardware hfrom;
-       struct iaddr ifrom;
        fd_set r, w, x;
        struct interface_info *l;
        int max = 0;
        int count;
-       int result;
-       static unsigned char packbuf [4095]; /* Packet input buffer.
-                                               Must be as large as largest
-                                               possible MTU. */
 
        FD_ZERO (&r);
        FD_ZERO (&w);

diff --git a/memory.c b/memory.c
index 0c271bd67f04518bc1968fa61f0efd99e23596ca..5d4883c340debab0a060ce2742e4d3b1b6840c8d 100644 (file)
--- a/memory.c
+++ b/memory.c
@@ -134,7 +134,6 @@ struct host_decl *find_hosts_by_haddr (htype, haddr, hlen)
        int hlen;
 {
        struct host_decl *foo;
-       int i;
 
        foo = (struct host_decl *)hash_lookup (host_hw_addr_hash,
                                               haddr, hlen);
@@ -146,7 +145,6 @@ struct host_decl *find_hosts_by_uid (data, len)
        int len;
 {
        struct host_decl *foo;
-       int i;
 
        foo = (struct host_decl *)hash_lookup (host_uid_hash, data, len);
        return foo;
@@ -645,7 +643,6 @@ void write_leases ()
 {
        struct lease *l;
        struct shared_network *s;
-       int i;
 
        for (s = shared_networks; s; s = s -> next) {
                for (l = s -> leases; l; l = l -> next) {
@@ -661,7 +658,6 @@ void dump_subnets ()
        struct lease *l;
        struct shared_network *s;
        struct subnet *n;
-       int i;
 
        for (s = shared_networks; s; s = s -> next) {
                for (n = subnets; n; n = n -> next_sibling) {

diff --git a/options.c b/options.c
index 354c10a4f2093b1590249f9fd06219e30c401d4d..fffc27e2467b363a5117e23aa0b1b256bae9ec7c 100644 (file)
--- a/options.c
+++ b/options.c
@@ -165,8 +165,6 @@ void cons_options (inpacket, outpacket, options, overload)
        int main_buffer_size;
        int mainbufix, bufix;
        int option_size;
-       int result;
-       int i;
 
        /* If the client has provided a maximum DHCP message size,
           use that.   Otherwise, we use the default MTU size (576 bytes). */
@@ -297,10 +295,6 @@ int store_options (buffer, buflen, options, priority_list, priority_len,
 {
        int bufix = 0;
        int option_stored [256];
-       int missed = 0;
-       int missed_code = 0;
-       int missed_length = 0;
-       int result;
        int i;
        int ix;
 

diff --git a/socket.c b/socket.c
index bb4475279a05c5b19a1db2c0cee093fbbebc717f..2ce80452ca1efbaf95ecaa0036f308d46976a63d 100644 (file)
--- a/socket.c
+++ b/socket.c
@@ -61,7 +61,6 @@ int if_register_socket (info, interface)
 {
        struct sockaddr_in name;
        int sock;
-       struct socklist *tmp;
        int flag;
        static int once = 0;