diff options
| author | pfg <pfg@FreeBSD.org> | 2016-04-20 15:45:55 +0000 |
|---|---|---|
| committer | pfg <pfg@FreeBSD.org> | 2016-04-20 15:45:55 +0000 |
| commit | 15369e2805f361b0ac3d32a98d1413add68c5b42 (patch) | |
| tree | fb11ecd3a1afac76147418d282a50384f3e1427f /sys/pc98 | |
| parent | b09e37ef6cc1ad2e74a185000ee99cee5da7e798 (diff) | |
| download | FreeBSD-src-15369e2805f361b0ac3d32a98d1413add68c5b42.zip FreeBSD-src-15369e2805f361b0ac3d32a98d1413add68c5b42.tar.gz | |
Use our nitems() macro when param.h is available.
Replacements specific to arm, mips, pc98, powerpc and sparc64.
Discussed in: freebsd-current
Diffstat (limited to 'sys/pc98')
| -rw-r--r-- | sys/pc98/cbus/gdc.c | 2 | ||||
| -rw-r--r-- | sys/pc98/cbus/pckbd.c | 3 | ||||
| -rw-r--r-- | sys/pc98/cbus/scterm-sck.c | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/sys/pc98/cbus/gdc.c b/sys/pc98/cbus/gdc.c index b048dad..4fff4ce 100644 --- a/sys/pc98/cbus/gdc.c +++ b/sys/pc98/cbus/gdc.c @@ -585,7 +585,7 @@ map_gen_mode_num(int type, int color, int mode) }; int i; - for (i = 0; i < sizeof(mode_map)/sizeof(mode_map[0]); ++i) { + for (i = 0; i < nitems(mode_map); ++i) { if (mode_map[i].from == mode) return mode_map[i].to; } diff --git a/sys/pc98/cbus/pckbd.c b/sys/pc98/cbus/pckbd.c index 92331b6..aec0f0d 100644 --- a/sys/pc98/cbus/pckbd.c +++ b/sys/pc98/cbus/pckbd.c @@ -446,8 +446,7 @@ pckbd_init(int unit, keyboard_t **kbdp, void *arg, int flags) keymap = &default_keymap; accmap = &default_accentmap; fkeymap = default_fkeytab; - fkeymap_size = - sizeof(default_fkeytab)/sizeof(default_fkeytab[0]); + fkeymap_size = nitems(default_fkeytab); state->kbdc = kbdc_open(data[0]); if (state->kbdc == NULL) diff --git a/sys/pc98/cbus/scterm-sck.c b/sys/pc98/cbus/scterm-sck.c index 5232b20..a7615d6 100644 --- a/sys/pc98/cbus/scterm-sck.c +++ b/sys/pc98/cbus/scterm-sck.c @@ -819,7 +819,7 @@ scterm_scan_esc(scr_stat *scp, term_stat *tcp, u_char c) v2 = tcp->param[2]; switch (n) { case 1: /* flags only */ - if (v0 < sizeof(cattrs)/sizeof(cattrs[0])) + if (v0 < nitems(cattrs)) v0 = cattrs[v0]; else /* backward compatibility */ v0 = cattrs[v0 & 0x3]; @@ -884,7 +884,7 @@ scterm_scan_esc(scr_stat *scp, term_stat *tcp, u_char c) v0 = 0; /* FALL THROUGH */ case 1: - if (v0 < sizeof(tcattrs)/sizeof(tcattrs[0])) + if (v0 < nitems(tcattrs)) sc_change_cursor_shape(scp, tcattrs[v0], -1, -1); break; |
