From 19beed5e2e8d160d2ce401054302925bde8c767e Mon Sep 17 00:00:00 2001 From: Maxim Konovalov Date: Mon, 24 Jan 2005 17:01:48 +0000 Subject: [PATCH] o Reorganize the previous delta to make it more style(9) compliant. Submitted by: ru o Reduce an amount of memory we ask in advance. --- usr.sbin/arp/arp.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/usr.sbin/arp/arp.c b/usr.sbin/arp/arp.c index 32c0bc25850..5a22ea844e1 100644 --- a/usr.sbin/arp/arp.c +++ b/usr.sbin/arp/arp.c @@ -474,8 +474,7 @@ search(u_long addr, action_fn *action) if (needed == 0) /* empty table */ return 0; buf = NULL; - do { - needed += needed / 2; + for (;;) { newbuf = realloc(buf, needed); if (newbuf == NULL) { if (buf != NULL) @@ -484,7 +483,10 @@ search(u_long addr, action_fn *action) } buf = newbuf; st = sysctl(mib, 6, buf, &needed, NULL, 0); - } while (st == -1 && errno == ENOMEM); + if (st == 0 || errno != ENOMEM) + break; + needed += needed / 8; + } if (st == -1) err(1, "actual retrieval of routing table"); lim = buf + needed;