diff options
| author | nia <nia@NetBSD.org> | 2021-10-30 09:26:11 +0000 |
|---|---|---|
| committer | nia <nia@NetBSD.org> | 2021-10-30 09:26:11 +0000 |
| commit | 276d6b790bd34fab592542cecca4c40407a3a1d7 (patch) | |
| tree | 26ce1d6ca9a7e606c0f7d587a9c2aabdc1df71ed /usr.sbin | |
| parent | e501ea9c4c38aa717a1f6aec950788038c605bd2 (diff) | |
traceroute(8): Convert realloc usage to reallocarr.
Eliminate a temporary variable.
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/traceroute/ifaddrlist.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/usr.sbin/traceroute/ifaddrlist.c b/usr.sbin/traceroute/ifaddrlist.c index 924ecd9e0b8..ec4ec6adcd3 100644 --- a/usr.sbin/traceroute/ifaddrlist.c +++ b/usr.sbin/traceroute/ifaddrlist.c @@ -1,4 +1,4 @@ -/* $NetBSD: ifaddrlist.c,v 1.11 2019/08/18 04:12:07 kamil Exp $ */ +/* $NetBSD: ifaddrlist.c,v 1.12 2021/10/30 09:26:11 nia Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -40,7 +40,7 @@ static const char rcsid[] = "@(#) Header: ifaddrlist.c,v 1.2 97/04/22 13:31:05 leres Exp (LBL)"; "@(#) Id: ifaddrlist.c,v 1.9 2000/11/23 20:01:55 leres Exp (LBL)"; #else -__RCSID("$NetBSD: ifaddrlist.c,v 1.11 2019/08/18 04:12:07 kamil Exp $"); +__RCSID("$NetBSD: ifaddrlist.c,v 1.12 2021/10/30 09:26:11 nia Exp $"); #endif #endif @@ -92,13 +92,13 @@ ifaddrlist(struct ifaddrlist **ipaddrp, char *errbuf, size_t buflen) { struct sockaddr_in *sin; struct ifaddrs *ifap = NULL, *ifa; - struct ifaddrlist *al = NULL, *nal; + struct ifaddrlist *al = NULL; size_t i = 0, maxal = 10; if (prog_getifaddrs(&ifap) != 0) goto out; - if ((al = malloc(maxal * sizeof(*al))) == NULL) + if (reallocarr(&al, maxal, sizeof(*al)) != 0) goto out; for (ifa = ifap; ifa; ifa = ifa->ifa_next) { @@ -119,9 +119,8 @@ ifaddrlist(struct ifaddrlist **ipaddrp, char *errbuf, size_t buflen) if (i == maxal) { maxal <<= 1; - if ((nal = realloc(al, maxal * sizeof(*al))) == NULL) + if (reallocarr(&al, maxal, sizeof(*al)) != 0) goto out; - al = nal; } al[i].addr = sin->sin_addr.s_addr; @@ -129,10 +128,10 @@ ifaddrlist(struct ifaddrlist **ipaddrp, char *errbuf, size_t buflen) goto out; i++; } - if ((nal = realloc(al, i * sizeof(*al))) == NULL) + if (reallocarr(&al, i, sizeof(*al)) != 0) goto out; freeifaddrs(ifap); - *ipaddrp = nal; + *ipaddrp = al; return (ssize_t)i; out: if (ifap) |
