Add some missing newlines and static declarations.

MFC after:	3 days
This commit is contained in:
marius 2013-04-07 15:33:06 +00:00
parent fd361c8faa
commit 79b1899934

View File

@ -90,13 +90,13 @@ struct if_info {
* The list of all interfaces that are being listened to. rarp_loop()
* "selects" on the descriptors in this list.
*/
struct if_info *iflist;
static struct if_info *iflist;
int verbose; /* verbose messages */
const char *tftp_dir = TFTP_DIR; /* tftp directory */
static int verbose; /* verbose messages */
static const char *tftp_dir = TFTP_DIR; /* tftp directory */
int dflag; /* messages to stdout/stderr, not syslog(3) */
int sflag; /* ignore /tftpboot */
static int dflag; /* messages to stdout/stderr, not syslog(3) */
static int sflag; /* ignore /tftpboot */
static u_char zero[6];
@ -308,6 +308,7 @@ init_one(struct ifaddrs *ifa, char *target, int pass1)
break;
}
}
/*
* Initialize all "candidate" interfaces that are in the system
* configuration list. A "candidate" is up, not loopback and not
@ -369,6 +370,7 @@ init(char *target)
static void
usage(void)
{
(void)fprintf(stderr, "%s\n%s\n",
"usage: rarpd -a [-dfsv] [-t directory] [-P pidfile]",
" rarpd [-dfsv] [-t directory] [-P pidfile] interface");
@ -630,6 +632,7 @@ rarp_bootable(in_addr_t addr)
static in_addr_t
choose_ipaddr(in_addr_t **alist, in_addr_t net, in_addr_t netmask)
{
for (; *alist; ++alist)
if ((**alist & netmask) == net)
return **alist;
@ -692,16 +695,18 @@ rarp_process(struct if_info *ii, u_char *pkt, u_int len)
* host (i.e. the guy running rarpd), won't try to ARP for the hardware
* address of the guy being booted (he cannot answer the ARP).
*/
struct sockaddr_in sin_inarp = {
static struct sockaddr_in sin_inarp = {
sizeof(struct sockaddr_in), AF_INET, 0,
{0},
{0},
};
struct sockaddr_dl sin_dl = {
static struct sockaddr_dl sin_dl = {
sizeof(struct sockaddr_dl), AF_LINK, 0, IFT_ETHER, 0, 6,
0, ""
};
struct {
static struct {
struct rt_msghdr rthdr;
char rtspace[512];
} rtmsg;
@ -883,6 +888,7 @@ rarp_reply(struct if_info *ii, struct ether_header *ep, in_addr_t ipaddr,
static in_addr_t
ipaddrtonetmask(in_addr_t addr)
{
addr = ntohl(addr);
if (IN_CLASSA(addr))
return htonl(IN_CLASSA_NET);