emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- style fixes and shrink by another 4 bytes while at it.

Browse Source
This commit is contained in:
Bernhard Reutner-Fischer 2007-01-07 22:12:35 +00:00
parent 6998142998
commit 42646c5585
1 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
networking/arp.c
View File

@ -87,27 +87,24 @@ static int arp_del(char **args)
req.arp_flags = ATF_PERM; req.arp_flags = ATF_PERM;
args++; args++;
while (*args != NULL) { while (*args != NULL) {
if (option_mask32 & ARP_OPT_v)
bb_error_msg("args=%s", *args);
switch (index_in_str_array(options, *args)) { switch (index_in_str_array(options, *args)) {
case 0: // "pub" case 0: /* "pub" */
flags |= 1; flags |= 1;
args++; args++;
break; break;
case 1: // "priv" case 1: /* "priv" */
flags |= 2; flags |= 2;
args++; args++;
break; break;
case 2: // "temp" case 2: /* "temp" */
req.arp_flags &= ~ATF_PERM; req.arp_flags &= ~ATF_PERM;
args++; args++;
break; break;
case 3: // "trail" case 3: /* "trail" */
req.arp_flags |= ATF_USETRAILERS; req.arp_flags |= ATF_USETRAILERS;
args++; args++;
break; break;
case 4: // "dontpub" case 4: /* "dontpub" */
#ifdef HAVE_ATF_DONTPUB #ifdef HAVE_ATF_DONTPUB
req.arp_flags |= ATF_DONTPUB; req.arp_flags |= ATF_DONTPUB;
#else #else
@ -115,7 +112,7 @@ static int arp_del(char **args)
#endif #endif
args++; args++;
break; break;
case 5: // "auto" case 5: /* "auto" */
#ifdef HAVE_ATF_MAGIC #ifdef HAVE_ATF_MAGIC
req.arp_flags |= ATF_MAGIC; req.arp_flags |= ATF_MAGIC;
#else #else
@ -123,20 +120,19 @@ static int arp_del(char **args)
#endif #endif
args++; args++;
break; break;
case 6: // "dev" case 6: /* "dev" */
if (*++args == NULL) if (*++args == NULL)
bb_show_usage(); bb_show_usage();
device = *args; device = *args;
args++; args++;
break; break;
case 7: // "netmask" case 7: /* "netmask" */
if (*++args == NULL) if (*++args == NULL)
bb_show_usage(); bb_show_usage();
if (strcmp(*args, "255.255.255.255") != 0) { if (strcmp(*args, "255.255.255.255") != 0) {
safe_strncpy(host, *args, 128); safe_strncpy(host, *args, 128);
if (ap->input(0, host, &sa) < 0) { if (ap->input(0, host, &sa) < 0) {
bb_herror_msg("%s", host); bb_herror_msg_and_die("%s", host);
return -1;
} }
memcpy(&req.arp_netmask, &sa, sizeof(struct sockaddr)); memcpy(&req.arp_netmask, &sa, sizeof(struct sockaddr));
req.arp_flags |= ATF_NETMASK; req.arp_flags |= ATF_NETMASK;
@ -187,8 +183,8 @@ static int arp_del(char **args)
} }
/* Get the hardware address to a specified interface name */ /* Get the hardware address to a specified interface name */
static void static void arp_getdevhw(char *ifname, struct sockaddr *sa,
arp_getdevhw(char *ifname, struct sockaddr *sa, const struct hwtype *hwt) const struct hwtype *hwt)
{ {
struct ifreq ifr; struct ifreq ifr;
const struct hwtype *xhw; const struct hwtype *xhw;
@ -221,7 +217,7 @@ static int arp_set(char **args)
struct arpreq req; struct arpreq req;
struct sockaddr sa; struct sockaddr sa;
int flags; int flags;
memset(&req, 0, sizeof(req)); memset(&req, 0, sizeof(req));
safe_strncpy(host, *args++, 128); safe_strncpy(host, *args++, 128);
@ -247,23 +243,23 @@ static int arp_set(char **args)
flags = ATF_PERM | ATF_COM; flags = ATF_PERM | ATF_COM;
while (*args != NULL) { while (*args != NULL) {
switch (index_in_str_array(options, *args)) { switch (index_in_str_array(options, *args)) {
case 0: // "pub" case 0: /* "pub" */
flags |= ATF_PUBL; flags |= ATF_PUBL;
args++; args++;
break; break;
case 1: // "priv" case 1: /* "priv" */
flags &= ~ATF_PUBL; flags &= ~ATF_PUBL;
args++; args++;
break; break;
case 2: // "temp" case 2: /* "temp" */
flags &= ~ATF_PERM; flags &= ~ATF_PERM;
args++; args++;
break; break;
case 3: // "trail" case 3: /* "trail" */
flags |= ATF_USETRAILERS; flags |= ATF_USETRAILERS;
args++; args++;
break; break;
case 4: // "dontpub" case 4: /* "dontpub" */
#ifdef HAVE_ATF_DONTPUB #ifdef HAVE_ATF_DONTPUB
flags |= ATF_DONTPUB; flags |= ATF_DONTPUB;
#else #else
@ -271,7 +267,7 @@ static int arp_set(char **args)
#endif #endif
args++; args++;
break; break;
case 5: // "auto" case 5: /* "auto" */
#ifdef HAVE_ATF_MAGIC #ifdef HAVE_ATF_MAGIC
flags |= ATF_MAGIC; flags |= ATF_MAGIC;
#else #else
@ -279,13 +275,13 @@ static int arp_set(char **args)
#endif #endif
args++; args++;
break; break;
case 6: // "dev" case 6: /* "dev" */
if (*++args == NULL) if (*++args == NULL)
bb_show_usage(); bb_show_usage();
device = *args; device = *args;
args++; args++;
break; break;
case 7: // "netmask" case 7: /* "netmask" */
if (*++args == NULL) if (*++args == NULL)
bb_show_usage(); bb_show_usage();
if (strcmp(*args, "255.255.255.255") != 0) { if (strcmp(*args, "255.255.255.255") != 0) {
@ -376,7 +372,8 @@ static int arp_show(char *name)
int type, flags; int type, flags;
FILE *fp; FILE *fp;
char *hostname; char *hostname;
int num, entries = 0, shown = 0; int num;
unsigned entries = 0, shown = 0;
host[0] = '\0'; host[0] = '\0';