From: Bruno Haible Date: Sun, 3 Mar 2019 18:36:14 +0000 (+0100) Subject: getloadavg: Write NULL for the null pointer. X-Git-Tag: v1.0~5045 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=2ba60a9f14486037d73d97408843d11297726a7e;p=gnulib.git getloadavg: Write NULL for the null pointer. Reported by Michal Privoznik . * lib/getloadavg.c (getloadavg): Write NULL instead of 0. --- diff --git a/ChangeLog b/ChangeLog index bfb9ffc208..4efd9bccc4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2019-03-03 Bruno Haible + + getloadavg: Write NULL for the null pointer. + Reported by Michal Privoznik . + * lib/getloadavg.c (getloadavg): Write NULL instead of 0. + 2019-02-28 Michal Privoznik alloca, tsearch-tests: Write NULL for the null pointer. diff --git a/lib/getloadavg.c b/lib/getloadavg.c index 353664777f..08c14efcfc 100644 --- a/lib/getloadavg.c +++ b/lib/getloadavg.c @@ -424,17 +424,17 @@ getloadavg (double loadavg[], int nelem) int saved_errno; kc = kstat_open (); - if (kc == 0) + if (kc == NULL) return -1; ksp = kstat_lookup (kc, "unix", 0, "system_misc"); - if (ksp == 0) + if (ksp == NULL) return -1; if (kstat_read (kc, ksp, 0) == -1) return -1; kn = kstat_data_lookup (ksp, "avenrun_1min"); - if (kn == 0) + if (kn == NULL) { /* Return -1 if no load average information is available. */ nelem = 0; @@ -447,14 +447,14 @@ getloadavg (double loadavg[], int nelem) if (nelem >= 2) { kn = kstat_data_lookup (ksp, "avenrun_5min"); - if (kn != 0) + if (kn != NULL) { loadavg[elem++] = (double) kn->value.ul / FSCALE; if (nelem >= 3) { kn = kstat_data_lookup (ksp, "avenrun_15min"); - if (kn != 0) + if (kn != NULL) loadavg[elem++] = (double) kn->value.ul / FSCALE; } } @@ -895,7 +895,7 @@ getloadavg (double loadavg[], int nelem) /* We pass 0 for the kernel, corefile, and swapfile names to use the currently running kernel. */ kd = kvm_open (0, 0, 0, O_RDONLY, 0); - if (kd != 0) + if (kd != NULL) { /* nlist the currently running kernel. */ kvm_nlist (kd, name_list);