Author: araujo
Date: Fri Mar 10 04:30:31 2017
New Revision: 314988
URL: https://svnweb.freebsd.org/changeset/base/314988

Log:
  Use nitems() from sys/param.h.
  
  Reviewed by:  ume
  MFC after:    3 weeks.
  Differential Revision:        https://reviews.freebsd.org/D9938

Modified:
  head/usr.bin/w/w.c

Modified: head/usr.bin/w/w.c
==============================================================================
--- head/usr.bin/w/w.c  Fri Mar 10 04:24:21 2017        (r314987)
+++ head/usr.bin/w/w.c  Fri Mar 10 04:30:31 2017        (r314988)
@@ -516,7 +516,7 @@ pr_header(time_t *nowp, int nusers)
        /*
         * Print 1, 5, and 15 minute load averages.
         */
-       if (getloadavg(avenrun, sizeof(avenrun) / sizeof(avenrun[0])) == -1)
+       if (getloadavg(avenrun, nitems(avenrun)) == -1)
                xo_emit(", no load average information available\n");
        else {
                static const char *format[] = {
@@ -525,7 +525,7 @@ pr_header(time_t *nowp, int nusers)
                    " {:load-average-15/%.2f}",
                };
                xo_emit(", load averages:");
-               for (i = 0; i < (int)(sizeof(avenrun) / sizeof(avenrun[0])); 
i++) {
+               for (i = 0; i < (int)(nitems(avenrun)); i++) {
                        if (use_comma && i > 0)
                                xo_emit(",");
                        xo_emit(format[i], avenrun[i]);
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to