mirror of
https://git.savannah.gnu.org/git/grub.git
synced 2026-10-21 23:02:40 +00:00
* 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.
This commit is contained in:
1 parent
2ba51692ac
commit
79a9f283de
3 files changed
+10
-6
No files matched your search
@@ -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
|
||||
|
||||
@@ -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;
|
||||
|
||||
+3
-3
@@ -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)
|
||||
|
||||
Reference in new issue
Block a user