vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source 
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:
proski 2006-09-08 12:56:22 +00:00
parent 2ba51692ac
commit 79a9f283de
3 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -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> 2006-06-24 Yoshinori K. Okuji <okuji@enbug.org>
* docs/grub.texi: Changed the license term to the GNU Free * docs/grub.texi: Changed the license term to the GNU Free

3
netboot/etherboot.h
View file

@ -531,9 +531,6 @@ extern int ip_abort;
extern int network_ready; extern int network_ready;
extern struct rom_info rom; extern struct rom_info rom;
extern struct arptable_t arptable[MAX_ARP]; 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 */ /* config.c */
extern struct nic nic; extern struct nic nic;

6
netboot/main.c
View file

@ -56,7 +56,8 @@ static int vendorext_isvalid;
static unsigned long netmask; static unsigned long netmask;
static struct bootpd_t bootp_data; static struct bootpd_t bootp_data;
static unsigned long xid; static unsigned long xid;
static unsigned char *end_of_rfc1533 = NULL;
#define BOOTP_DATA_ADDR (&bootp_data)
#ifndef NO_DHCP_SUPPORT #ifndef NO_DHCP_SUPPORT
#endif /* 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) if (block == 0)
{ {
end_of_rfc1533 = NULL;
vendorext_isvalid = 0; vendorext_isvalid = 0;
if (grub_memcmp (p, rfc1533_cookie, 4)) 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) else if (c == RFC1533_END)
{ {
end_of_rfc1533 = endp = p; endp = p;
continue; continue;
} }
else if (c == RFC1533_NETMASK) else if (c == RFC1533_NETMASK)