KekenoBSD/src
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

mididump(1): Use nitems()

Browse Source 
Reported by:	kevans
Sponsored by:	The FreeBSD Foundation
MFC after:	1 week
Reviewed by:	markj, emaste
Differential Revision:	https://reviews.freebsd.org/D47191
This commit is contained in:
Christos Margiolis
2024-10-19 16:34:27 +02:00
parent feb9ba2993
commit 53314e34d5
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
usr.bin/mididump/mididump.c
+3 -3
View File
@@ -28,6 +28,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#include <sys/param.h>
#include <sys/soundcard.h> #include <sys/soundcard.h>
#include <err.h> #include <err.h>
@@ -39,7 +40,6 @@
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#define ARRLEN(x) (sizeof(x) / sizeof(x[0]))
#define NOTE2OCTAVE(n) (n / 12 - 1) #define NOTE2OCTAVE(n) (n / 12 - 1)
#define NOTE2FREQ(n) (440 * pow(2.0f, ((float)n - 69) / 12)) #define NOTE2FREQ(n) (440 * pow(2.0f, ((float)n - 69) / 12))
#define CHAN_MASK 0x0f #define CHAN_MASK 0x0f
@@ -189,7 +189,7 @@ main(int argc, char *argv[])
case 0x90 ... 0x9f: case 0x90 ... 0x9f:
b1 = read_byte(fd); b1 = read_byte(fd);
b2 = read_byte(fd); b2 = read_byte(fd);
pn = &notes[b1 % ARRLEN(notes)]; pn = &notes[b1 % nitems(notes)];
snprintf(buf, sizeof(buf), "%s%d", pn->name, snprintf(buf, sizeof(buf), "%s%d", pn->name,
NOTE2OCTAVE(b1)); NOTE2OCTAVE(b1));
if (pn->alt != NULL) { if (pn->alt != NULL) {
@@ -211,7 +211,7 @@ main(int argc, char *argv[])
case 0xb0 ... 0xbf: case 0xb0 ... 0xbf:
b1 = read_byte(fd); b1 = read_byte(fd);
b2 = read_byte(fd); b2 = read_byte(fd);
if (b1 > ARRLEN(ctls) - 1) if (b1 > nitems(ctls) - 1)
break; break;
printf("Control/Mode change channel=%d, " printf("Control/Mode change channel=%d, "
"control=%d (%s), value=%d", "control=%d (%s), value=%d",