udhcp,ipcalc: simple code shrink (Nico Erfurth <masta AT perlgolf.de>)

function                                             old     new   delta
ipcalc_main                                          609     610      +1
read_staticlease                                     102      85     -17
ether_aton                                            17       -     -17
This commit is contained in:
Denis Vlasenko 2008-04-10 02:09:40 +00:00
parent b3f39f0cfa
commit fcc6347976
2 changed files with 3 additions and 8 deletions

View File

@ -175,16 +175,13 @@ int ipcalc_main(int argc, char **argv)
if (opt & HOSTNAME) { if (opt & HOSTNAME) {
struct hostent *hostinfo; struct hostent *hostinfo;
int x;
hostinfo = gethostbyaddr((char *) &ipaddr, sizeof(ipaddr), AF_INET); hostinfo = gethostbyaddr((char *) &ipaddr, sizeof(ipaddr), AF_INET);
if (!hostinfo) { if (!hostinfo) {
bb_herror_msg_and_die("cannot find hostname for %s", argv[0]); bb_herror_msg_and_die("cannot find hostname for %s", argv[0]);
} }
for (x = 0; hostinfo->h_name[x]; x++) { str_tolower(hostinfo->h_name);
hostinfo->h_name[x] = tolower(hostinfo->h_name[x]);
}
printf("HOSTNAME=%s\n", hostinfo->h_name); printf("HOSTNAME=%s\n", hostinfo->h_name);
} }
} }

View File

@ -26,13 +26,11 @@ static int read_ip(const char *line, void *arg)
static int read_mac(const char *line, void *arg) static int read_mac(const char *line, void *arg)
{ {
uint8_t *mac_bytes = arg;
struct ether_addr *temp_ether_addr; struct ether_addr *temp_ether_addr;
temp_ether_addr = ether_aton(line); temp_ether_addr = ether_aton_r(line, (struct ether_addr *)arg);
if (temp_ether_addr == NULL) if (temp_ether_addr == NULL)
return 0; return 0;
memcpy(mac_bytes, temp_ether_addr, 6);
return 1; return 1;
} }