# HG changeset patch # User Bruno Haible # Date 1551638174 -3600 # Node ID e92cc6824b7f6b2f9a4558488ee75254ae9ee330 # Parent a315d09bcec4d35b5c5f82bfccc993c5b88b0fb5 getloadavg: Write NULL for the null pointer. Reported by Michal Privoznik . * lib/getloadavg.c (getloadavg): Write NULL instead of 0. diff -r a315d09bcec4 -r e92cc6824b7f ChangeLog --- a/ChangeLog Sun Mar 03 19:34:57 2019 +0100 +++ b/ChangeLog Sun Mar 03 19:36:14 2019 +0100 @@ -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 -r a315d09bcec4 -r e92cc6824b7f lib/getloadavg.c --- a/lib/getloadavg.c Sun Mar 03 19:34:57 2019 +0100 +++ b/lib/getloadavg.c Sun Mar 03 19:36:14 2019 +0100 @@ -424,17 +424,17 @@ 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 @@ 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 @@ /* 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);