From: Denis Vlasenko <vda.linux@googlemail.com>
Date: Thu, 10 Apr 2008 02:09:40 +0000 (-0000)
Subject: udhcp,ipcalc: simple code shrink (Nico Erfurth <masta AT perlgolf.de>)
X-Git-Tag: 1_11_0~361
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=fcc6347976ded376c9effe3b9fb216b00b2140cb;p=oweals%2Fbusybox.git

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
---

diff --git a/networking/ipcalc.c b/networking/ipcalc.c
index 9e92b643e..8578893af 100644
--- a/networking/ipcalc.c
+++ b/networking/ipcalc.c
@@ -175,16 +175,13 @@ int ipcalc_main(int argc, char **argv)
 
 		if (opt & HOSTNAME) {
 			struct hostent *hostinfo;
-			int x;
 
 			hostinfo = gethostbyaddr((char *) &ipaddr, sizeof(ipaddr), AF_INET);
 			if (!hostinfo) {
 				bb_herror_msg_and_die("cannot find hostname for %s", argv[0]);
 			}
-			for (x = 0; hostinfo->h_name[x]; x++) {
-				hostinfo->h_name[x] = tolower(hostinfo->h_name[x]);
-			}
-
+			str_tolower(hostinfo->h_name);
+			
 			printf("HOSTNAME=%s\n", hostinfo->h_name);
 		}
 	}
diff --git a/networking/udhcp/files.c b/networking/udhcp/files.c
index 043a95bb0..e0e8b12c3 100644
--- a/networking/udhcp/files.c
+++ b/networking/udhcp/files.c
@@ -26,13 +26,11 @@ static int read_ip(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;
 
-	temp_ether_addr = ether_aton(line);
+	temp_ether_addr = ether_aton_r(line, (struct ether_addr *)arg);
 	if (temp_ether_addr == NULL)
 		return 0;
-	memcpy(mac_bytes, temp_ether_addr, 6);
 	return 1;
 }