summaryrefslogtreecommitdiff
path: root/networking
diff options
context:
space:
mode:
authorRon Yorston2015-07-19 23:05:20 +0200
committerDenys Vlasenko2015-07-19 23:05:20 +0200
commitd840c5d139cfa50fbe4f6f67c178b0edf0c690c8 (patch)
treee75010ca3ce7769f53a6170ebe940f37c6a94dc1 /networking
parent78cfa00154dca18a1326d2064121bf65cd081781 (diff)
downloadbusybox-d840c5d139cfa50fbe4f6f67c178b0edf0c690c8.zip
busybox-d840c5d139cfa50fbe4f6f67c178b0edf0c690c8.tar.gz
libbb: add a function to make a copy of a region of memory
Introduce a library routine to package the idiom: p = xmalloc(b, n); memcpy(p, b, n); and use it where possible. The example in traceroute used xzalloc but it didn't need to. function old new delta xmemdup - 32 +32 last_main 834 826 -8 make_device 2321 2311 -10 common_traceroute_main 3698 3685 -13 readtoken1 3182 3168 -14 procps_scan 1222 1206 -16 forkchild 655 638 -17 ------------------------------------------------------------------------------ (add/remove: 1/0 grow/shrink: 0/6 up/down: 32/-78) Total: -46 bytes Signed-off-by: Ron Yorston <rmy@frippery.org> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'networking')
-rw-r--r--networking/traceroute.c11
-rw-r--r--networking/udhcp/d6_dhcpc.c2
2 files changed, 2 insertions, 11 deletions
diff --git a/networking/traceroute.c b/networking/traceroute.c
index 97a7a19..12ba614 100644
--- a/networking/traceroute.c
+++ b/networking/traceroute.c
@@ -387,15 +387,6 @@ struct globals {
#define outudp ((struct udphdr *)(outip + 1))
-/* libbb candidate? tftp uses this idiom too */
-static len_and_sockaddr* dup_sockaddr(const len_and_sockaddr *lsa)
-{
- len_and_sockaddr *new_lsa = xzalloc(LSA_LEN_SIZE + lsa->len);
- memcpy(new_lsa, lsa, LSA_LEN_SIZE + lsa->len);
- return new_lsa;
-}
-
-
static int
wait_for_reply(len_and_sockaddr *from_lsa, struct sockaddr *to, unsigned *timestamp_us, int *left_ms)
{
@@ -1074,7 +1065,7 @@ common_traceroute_main(int op, char **argv)
printf(" from %s", source);
printf(", %d hops max, %d byte packets\n", max_ttl, packlen);
- from_lsa = dup_sockaddr(dest_lsa);
+ from_lsa = xmemdup(dest_lsa, LSA_LEN_SIZE + dest_lsa->len);
lastaddr = xzalloc(dest_lsa->len);
to = xzalloc(dest_lsa->len);
seq = 0;
diff --git a/networking/udhcp/d6_dhcpc.c b/networking/udhcp/d6_dhcpc.c
index 044f046..4e9b705 100644
--- a/networking/udhcp/d6_dhcpc.c
+++ b/networking/udhcp/d6_dhcpc.c
@@ -118,7 +118,7 @@ static void *d6_copy_option(uint8_t *option, uint8_t *option_end, unsigned code)
uint8_t *opt = d6_find_option(option, option_end, code);
if (!opt)
return opt;
- return memcpy(xmalloc(opt[3] + 4), opt, opt[3] + 4);
+ return xmemdup(opt, opt[3] + 4);
}
static void *d6_store_blob(void *dst, const void *src, unsigned len)