svn commit: r201202 - head/usr.sbin/arp
John Baldwin
jhb at FreeBSD.org
Tue Dec 29 15:48:05 UTC 2009
Author: jhb
Date: Tue Dec 29 15:48:04 2009
New Revision: 201202
URL: http://svn.freebsd.org/changeset/base/201202
Log:
Use reallocf() to simplify some logic.
MFC after: 2 weeks
Modified:
head/usr.sbin/arp/arp.c
Modified: head/usr.sbin/arp/arp.c
==============================================================================
--- head/usr.sbin/arp/arp.c Tue Dec 29 14:29:08 2009 (r201201)
+++ head/usr.sbin/arp/arp.c Tue Dec 29 15:48:04 2009 (r201202)
@@ -493,7 +493,7 @@ search(u_long addr, action_fn *action)
{
int mib[6];
size_t needed;
- char *lim, *buf, *newbuf, *next;
+ char *lim, *buf, *next;
struct rt_msghdr *rtm;
struct sockaddr_inarp *sin2;
struct sockaddr_dl *sdl;
@@ -516,13 +516,9 @@ search(u_long addr, action_fn *action)
return 0;
buf = NULL;
for (;;) {
- newbuf = realloc(buf, needed);
- if (newbuf == NULL) {
- if (buf != NULL)
- free(buf);
+ buf = reallocf(buf, needed);
+ if (buf == NULL)
errx(1, "could not reallocate memory");
- }
- buf = newbuf;
st = sysctl(mib, 6, buf, &needed, NULL, 0);
if (st == 0 || errno != ENOMEM)
break;
More information about the svn-src-head
mailing list