* netboot/etherboot.h: Remove incorrect extern declarations of

the variables later declared static.  Move BOOTP_DATA_ADDR ...
* netboot/main.c: ... here.  Eliminate end_of_rfc1533 - it's
write-only.

diff --git a/ChangeLog b/ChangeLog
index 9edc123db5588ab55e16c3d42637aa73d2f4d3d3..e546128541794f5882e905412a1c91fba879db8d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-09-08  Pavel Roskin  <proski@gnu.org>
+
+       * netboot/etherboot.h: Remove incorrect extern declarations of
+       the variables later declared static.  Move BOOTP_DATA_ADDR ...
+       * netboot/main.c: ... here.  Eliminate end_of_rfc1533 - it's
+       write-only.
+
 2006-06-24  Yoshinori K. Okuji  <okuji@enbug.org>
 
        * docs/grub.texi: Changed the license term to the GNU Free

diff --git a/netboot/etherboot.h b/netboot/etherboot.h
index 74ca16f8d660d7b0581873b483bb569bd62f7a0e..e3e067c1b12a8d4280bb3bd810dee66679ec9158 100644 (file)
--- a/netboot/etherboot.h
+++ b/netboot/etherboot.h
@@ -531,9 +531,6 @@ extern int ip_abort;
 extern int network_ready;
 extern struct rom_info rom;
 extern struct arptable_t arptable[MAX_ARP];
-extern struct bootpd_t bootp_data;
-#define        BOOTP_DATA_ADDR (&bootp_data)
-extern unsigned char *end_of_rfc1533;
 
 /* config.c */
 extern struct nic nic;

diff --git a/netboot/main.c b/netboot/main.c
index 82759b6cc86a9c16d14eaacb89da376d8f079b5a..4b074b303d0d69d01519e7381fc27d45cd130a02 100644 (file)
--- a/netboot/main.c
+++ b/netboot/main.c
@@ -56,7 +56,8 @@ static int vendorext_isvalid;
 static unsigned long netmask;
 static struct bootpd_t bootp_data;
 static unsigned long xid;
-static unsigned char *end_of_rfc1533 = NULL;
+
+#define        BOOTP_DATA_ADDR (&bootp_data)
 
 #ifndef        NO_DHCP_SUPPORT
 #endif /* NO_DHCP_SUPPORT */
@@ -967,7 +968,6 @@ decode_rfc1533 (unsigned char *p, int block, int len, int eof)
   
   if (block == 0)
     {
-      end_of_rfc1533 = NULL;
       vendorext_isvalid = 0;
       
       if (grub_memcmp (p, rfc1533_cookie, 4))
@@ -1021,7 +1021,7 @@ decode_rfc1533 (unsigned char *p, int block, int len, int eof)
        }
       else if (c == RFC1533_END)
        {
-         end_of_rfc1533 = endp = p;
+         endp = p;
          continue;
        }
       else if (c == RFC1533_NETMASK)