CVS commit: src/usr.bin/systat

[Nia Alarie]

Module Name:    src
Committed By:   nia
Date:           Tue Nov  9 09:18:02 UTC 2021

Modified Files:
        src/usr.bin/systat: pigs.c swap.c

Log Message:
systat(1): convert free(x); x = malloc(x * y) to reallocarr.

free on NULL is a guaranteed non-op.


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/usr.bin/systat/pigs.c
cvs rdiff -u -r1.20 -r1.21 src/usr.bin/systat/swap.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/pigs.c
diff -u src/usr.bin/systat/pigs.c:1.33 src/usr.bin/systat/pigs.c:1.34
--- src/usr.bin/systat/pigs.c:1.33	Fri Nov 23 03:46:35 2012
+++ src/usr.bin/systat/pigs.c	Tue Nov  9 09:18:02 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: pigs.c,v 1.33 2012/11/23 03:46:35 christos Exp $	*/
+/*	$NetBSD: pigs.c,v 1.34 2021/11/09 09:18:02 nia Exp $	*/
 
 /*-
  * Copyright (c) 1980, 1992, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)pigs.c	8.2 (Berkeley) 9/23/93";
 #endif
-__RCSID("$NetBSD: pigs.c,v 1.33 2012/11/23 03:46:35 christos Exp $");
+__RCSID("$NetBSD: pigs.c,v 1.34 2021/11/09 09:18:02 nia Exp $");
 #endif /* not lint */
 
 /*
@@ -179,14 +179,11 @@ fetchpigs(void)
 	if ((kpp = kvm_getproc2(kd, KERN_PROC_ALL, 0, sizeof(*kpp),
 				&nproc)) == NULL) {
 		error("%s", kvm_geterr(kd));
-		if (pt)
-			free(pt);
+		free(pt);
 		return;
 	}
 	if (nproc > lastnproc) {
-		free(pt);
-		if ((pt =
-		    malloc((nproc + 1) * sizeof(struct p_times))) == NULL) {
+		if (reallocarr(&pt, nproc + 1, sizeof(struct p_times)) != 0) {
 			error("Out of memory");
 			die(0);
 		}

Index: src/usr.bin/systat/swap.c
diff -u src/usr.bin/systat/swap.c:1.20 src/usr.bin/systat/swap.c:1.21
--- src/usr.bin/systat/swap.c:1.20	Fri May 30 02:29:37 2008
+++ src/usr.bin/systat/swap.c	Tue Nov  9 09:18:02 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: swap.c,v 1.20 2008/05/30 02:29:37 mrg Exp $	*/
+/*	$NetBSD: swap.c,v 1.21 2021/11/09 09:18:02 nia Exp $	*/
 
 /*
  * Copyright (c) 1997 Matthew R. Green.
@@ -60,7 +60,7 @@
 #if 0
 static char sccsid[] = "@(#)swap.c	8.3 (Berkeley) 4/29/95";
 #endif
-__RCSID("$NetBSD: swap.c,v 1.20 2008/05/30 02:29:37 mrg Exp $");
+__RCSID("$NetBSD: swap.c,v 1.21 2021/11/09 09:18:02 nia Exp $");
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -121,10 +121,8 @@ fetchswap(void)
 		return;
 	update_label = (nswap != rnswap);
 
-	if (swap_devices)
-		(void)free(swap_devices);
-	if ((swap_devices = malloc(nswap * sizeof(*swap_devices))) == NULL) {
-		error("malloc failed");
+	if (reallocarr(&swap_devices, nswap, sizeof(*swap_devices)) != 0) {
+		error("realloc failed");
 		die(0);
 	}