Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-12-21 23:29:34 +00:00
Code Issues Projects Releases Wiki Activity

networking/interface.c: fix indentation

Browse Source
This commit is contained in:
Denis Vlasenko 2008-06-04 07:59:51 +00:00
parent 630a7f75e8
commit 3b162ecdf6
3 changed files with 49 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/libbb.h
View File

@ -934,6 +934,8 @@ extern smallint interface_opt_a;
int display_interfaces(char *ifname);
#if ENABLE_FEATURE_HWIB
int in_ib(const char *bufp, struct sockaddr *sap);
#else
#define in_ib(a, b) 1 /* fail */
#endif
const struct aftype *get_aftype(const char *name);
const struct hwtype *get_hwtype(const char *name);

10
networking/ifconfig.c
View File

@ -252,20 +252,13 @@ static const struct options OptArray[] = {
/*
* A couple of prototypes.
*/
#if ENABLE_FEATURE_IFCONFIG_HW
static int in_ether(const char *bufp, struct sockaddr *sap);
# if ENABLE_FEATURE_HWIB
extern int in_ib(const char *bufp, struct sockaddr *sap);
# else
# define in_ib(a, b) 1 /* fail */
# endif
#endif
/*
* Our main function.
*/
int ifconfig_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int ifconfig_main(int argc, char **argv)
{
@ -436,8 +429,7 @@ int ifconfig_main(int argc, char **argv)
bb_show_usage();
/*safe_strncpy(host, *argv, sizeof(host));*/
host = *argv;
if (hw_class == 1 ? in_ether(host, &sa)
: in_ib(host, &sa))
if (hw_class == 1 ? in_ether(host, &sa) : in_ib(host, &sa))
bb_error_msg_and_die("invalid hw-addr %s", host);
p = (char *) &sa;
}

10
networking/interface.c
View File

@ -680,7 +680,6 @@ static int if_fetch(struct interface *ife)
return 0;
}
static int do_if_fetch(struct interface *ife)
{
if (if_fetch(ife) < 0) {
@ -1239,7 +1238,7 @@ int in_ib(const char *bufp, struct sockaddr *sap)
val = c - 'A' + 10;
else {
errno = EINVAL;
return (-1);
return -1;
}
val <<= 4;
c = *bufp;
@ -1253,7 +1252,7 @@ int in_ib(const char *bufp, struct sockaddr *sap)
val >>= 4;
else {
errno = EINVAL;
return (-1);
return -1;
}
if (c != 0)
bufp++;
@ -1266,14 +1265,13 @@ int in_ib(const char *bufp, struct sockaddr *sap)
}
}
#ifdef DEBUG
fprintf(stderr, "in_ib(%s): %s\n", orig, UNSPEC_print(sap->sa_data));
fprintf(stderr, "in_ib(%s): %s\n", orig, UNSPEC_print(sap->sa_data));
#endif
return (0);
return 0;
}
#endif
int display_interfaces(char *ifname)
{
int status;