Use nitems() from sys/param.h.
Reviewed by: ume MFC after: 3 weeks. Differential Revision: https://reviews.freebsd.org/D9938
This commit is contained in:
parent
a0fb90916a
commit
807bd0d9f0
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=314988
@ -516,7 +516,7 @@ pr_header(time_t *nowp, int nusers)
|
|||||||
/*
|
/*
|
||||||
* Print 1, 5, and 15 minute load averages.
|
* 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");
|
xo_emit(", no load average information available\n");
|
||||||
else {
|
else {
|
||||||
static const char *format[] = {
|
static const char *format[] = {
|
||||||
@ -525,7 +525,7 @@ pr_header(time_t *nowp, int nusers)
|
|||||||
" {:load-average-15/%.2f}",
|
" {:load-average-15/%.2f}",
|
||||||
};
|
};
|
||||||
xo_emit(", load averages:");
|
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)
|
if (use_comma && i > 0)
|
||||||
xo_emit(",");
|
xo_emit(",");
|
||||||
xo_emit(format[i], avenrun[i]);
|
xo_emit(format[i], avenrun[i]);
|
||||||
|
Loading…
Reference in New Issue
Block a user