Mercurial > gnulib

comparison lib/getloadavg.c @ 40218:e92cc6824b7f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
getloadavg: Write NULL for the null pointer. Reported by Michal Privoznik <mprivozn@redhat.com>. * lib/getloadavg.c (getloadavg): Write NULL instead of 0.
author Bruno Haible <bruno@clisp.org>
date Sun, 03 Mar 2019 19:36:14 +0100
parents dd38f4180e3f
children
comparison
equal deleted inserted replaced
40217:a315d09bcec4 40218:e92cc6824b7f
422 kstat_t *ksp; 422 kstat_t *ksp;
423 kstat_named_t *kn; 423 kstat_named_t *kn;
424 int saved_errno; 424 int saved_errno;
425 425
426 kc = kstat_open (); 426 kc = kstat_open ();
427 if (kc == 0) 427 if (kc == NULL)
428 return -1; 428 return -1;
429 ksp = kstat_lookup (kc, "unix", 0, "system_misc"); 429 ksp = kstat_lookup (kc, "unix", 0, "system_misc");
430 if (ksp == 0) 430 if (ksp == NULL)
431 return -1; 431 return -1;
432 if (kstat_read (kc, ksp, 0) == -1) 432 if (kstat_read (kc, ksp, 0) == -1)
433 return -1; 433 return -1;
434 434
435 435
436 kn = kstat_data_lookup (ksp, "avenrun_1min"); 436 kn = kstat_data_lookup (ksp, "avenrun_1min");
437 if (kn == 0) 437 if (kn == NULL)
438 { 438 {
439 /* Return -1 if no load average information is available. */ 439 /* Return -1 if no load average information is available. */
440 nelem = 0; 440 nelem = 0;
441 elem = -1; 441 elem = -1;
442 } 442 }
445 loadavg[elem++] = (double) kn->value.ul / FSCALE; 445 loadavg[elem++] = (double) kn->value.ul / FSCALE;
446 446
447 if (nelem >= 2) 447 if (nelem >= 2)
448 { 448 {
449 kn = kstat_data_lookup (ksp, "avenrun_5min"); 449 kn = kstat_data_lookup (ksp, "avenrun_5min");
450 if (kn != 0) 450 if (kn != NULL)
451 { 451 {
452 loadavg[elem++] = (double) kn->value.ul / FSCALE; 452 loadavg[elem++] = (double) kn->value.ul / FSCALE;
453 453
454 if (nelem >= 3) 454 if (nelem >= 3)
455 { 455 {
456 kn = kstat_data_lookup (ksp, "avenrun_15min"); 456 kn = kstat_data_lookup (ksp, "avenrun_15min");
457 if (kn != 0) 457 if (kn != NULL)
458 loadavg[elem++] = (double) kn->value.ul / FSCALE; 458 loadavg[elem++] = (double) kn->value.ul / FSCALE;
459 } 459 }
460 } 460 }
461 } 461 }
462 462
893 } 893 }
894 # else /* SUNOS_5 */ 894 # else /* SUNOS_5 */
895 /* We pass 0 for the kernel, corefile, and swapfile names 895 /* We pass 0 for the kernel, corefile, and swapfile names
896 to use the currently running kernel. */ 896 to use the currently running kernel. */
897 kd = kvm_open (0, 0, 0, O_RDONLY, 0); 897 kd = kvm_open (0, 0, 0, O_RDONLY, 0);
898 if (kd != 0) 898 if (kd != NULL)
899 { 899 {
900 /* nlist the currently running kernel. */ 900 /* nlist the currently running kernel. */
901 kvm_nlist (kd, name_list); 901 kvm_nlist (kd, name_list);
902 offset = name_list[0].n_value; 902 offset = name_list[0].n_value;
903 getloadavg_initialized = true; 903 getloadavg_initialized = true;