summaryrefslogtreecommitdiffstats
path: root/usr.sbin/camdd/camdd.c
diff options
context:
space:
mode:
authoraraujo <araujo@FreeBSD.org>2017-04-17 18:55:54 +0000
committeraraujo <araujo@FreeBSD.org>2017-04-17 18:55:54 +0000
commita52fbfbaa6cb040819aaa956af20324f4cf1b1f9 (patch)
tree647b1c8fb6ffc61d7646056b90483cfd245a7867 /usr.sbin/camdd/camdd.c
parent1e35d29d6289b2c15cca0f7e951e77e144f0b08e (diff)
downloadFreeBSD-src-a52fbfbaa6cb040819aaa956af20324f4cf1b1f9.zip
FreeBSD-src-a52fbfbaa6cb040819aaa956af20324f4cf1b1f9.tar.gz
MFC r314987-r314989, r314993-r314994, r315046-r315049, r315102
r314987: Use nitems() from sys/param.h. Reviewed by: asomers MFC after: 3 weeks. Differential Revision: https://reviews.freebsd.org/D9944 r314988: Use nitems() from sys/param.h. Reviewed by: ume MFC after: 3 weeks. Differential Revision: https://reviews.freebsd.org/D9938 r314989: Use nitems() from sys/param.h and also remove the cast. Reviewed by: markj MFC after: 3 weeks. Differential Revision: https://reviews.freebsd.org/D9937 r314993: Use nitems() from sys/param.h. Reviewed by: ngie MFC after: 3 weeks. Differential Revision: https://reviews.freebsd.org/D9936 r314994: Use nitems() from sys/param.h. Reviewed by: ngie MFC after: 3 weeks. Differential Revision: https://reviews.freebsd.org/D9940 r315046: Use nitems() from sys/param.h Reviewed by: jhb MFC after: 3 weeks. Differential Revision: https://reviews.freebsd.org/D9941 r315047: Use nitems() from sys/param.h. Reviewed by: np MFC after: 3 weeks. Differential Revision: https://reviews.freebsd.org/D9945 r315048: Use nitems() from sys/param.h. MFC after: 3 weeks. r315049: Bring back the cast removed in my previous commit to allow us build vmstat with WARNS 2. This cast was first introduced at r87690. Reported by: bde, pfg and ngie MFC after: 3 weeks. r315102: Use nitems() from sys/param.h. Reviewed by: ngie Differential Revision: https://reviews.freebsd.org/D9943
Diffstat (limited to 'usr.sbin/camdd/camdd.c')
-rw-r--r--usr.sbin/camdd/camdd.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/usr.sbin/camdd/camdd.c b/usr.sbin/camdd/camdd.c
index 05225f6..9da57b0 100644
--- a/usr.sbin/camdd/camdd.c
+++ b/usr.sbin/camdd/camdd.c
@@ -1004,8 +1004,7 @@ camdd_probe_tape(int fd, char *filename, uint64_t *max_iosize,
goto bailout;
}
- for (i = 0; i < sizeof(req_status_items) /
- sizeof(req_status_items[0]); i++) {
+ for (i = 0; i < nitems(req_status_items); i++) {
char *name;
name = __DECONST(char *, req_status_items[i].name);
OpenPOWER on IntegriCloud