Module Name: src
Committed By: nia
Date: Sat Oct 30 11:31:51 UTC 2021
Modified Files:
src/usr.bin/systat: netcmds.c
Log Message:
netstat(1): use reallocarr instead of realloc(x * y)
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/usr.bin/systat/netcmds.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/systat/netcmds.c
diff -u src/usr.bin/systat/netcmds.c:1.21 src/usr.bin/systat/netcmds.c:1.22
--- src/usr.bin/systat/netcmds.c:1.21 Sat Feb 26 22:12:33 2005
+++ src/usr.bin/systat/netcmds.c Sat Oct 30 11:31:51 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: netcmds.c,v 1.21 2005/02/26 22:12:33 dsl Exp $ */
+/* $NetBSD: netcmds.c,v 1.22 2021/10/30 11:31:51 nia Exp $ */
/*-
* Copyright (c) 1980, 1992, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)netcmds.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: netcmds.c,v 1.21 2005/02/26 22:12:33 dsl Exp $");
+__RCSID("$NetBSD: netcmds.c,v 1.22 2021/10/30 11:31:51 nia Exp $");
#endif /* not lint */
/*
@@ -223,12 +223,10 @@ selectport(long port, int onoff)
p->onoff = onoff;
return (0);
}
- p = (struct pitem *)realloc(ports, (nports+1)*sizeof (*p));
- if (p == NULL) {
+ if (reallocarr(&ports, nports + 1, sizeof(*p)) != 0) {
error("malloc failed");
die(0);
}
- ports = p;
p = &ports[nports++];
p->port = port;
p->onoff = onoff;
@@ -326,12 +324,10 @@ selecthost(struct sockaddr *sa, int onof
}
if (sa->sa_len > sizeof(struct sockaddr_storage))
return (-1); /*XXX*/
- p = (struct hitem *)realloc(hosts, (nhosts+1)*sizeof (*p));
- if (p == NULL) {
+ if (reallocarr(&hosts, nhosts + 1, sizeof(*p)) != 0) {
error("malloc failed");
die(0);
}
- hosts = p;
p = &hosts[nhosts++];
memcpy(&p->addr, sa, sa->sa_len);
p->onoff = onoff;
