fallingsky04
/
slstatus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add and use LEN() macro

This commit is contained in:
Laslo Hunhold 2017-08-11 13:39:19 +02:00 committed by Aaron Marcher
parent 178c23e3d2
commit 1814061396
No known key found for this signature in database
GPG Key ID: 74B048E5C2474F9A
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
slstatus.c
View File

@ -28,6 +28,8 @@
#include "arg.h" #include "arg.h"
#define LEN(x) (sizeof (x) / sizeof *(x))
struct arg { struct arg {
const char *(*func)(); const char *(*func)();
const char *fmt; const char *fmt;
@ -167,13 +169,13 @@ battery_state(const char *bat)
if (n != 1) if (n != 1)
return UNKNOWN_STR; return UNKNOWN_STR;
for (i = 0; i < sizeof(map) / sizeof(*map); i++) { for (i = 0; i < LEN(map); i++) {
if (!strcmp(map[i].state, state)) { if (!strcmp(map[i].state, state)) {
break; break;
} }
} }
return (i == sizeof(map) / sizeof(*map)) ? "?" : map[i].symbol; return (i == LEN(map)) ? "?" : map[i].symbol;
} }
static const char * static const char *
@ -745,7 +747,7 @@ vol_perc(const char *card)
close(afd); close(afd);
return UNKNOWN_STR; return UNKNOWN_STR;
} }
for (i = 0; i < (sizeof(vnames) / sizeof((vnames[0]))); i++) { for (i = 0; i < LEN(vnames); i++) {
if (devmask & (1 << i) && !strcmp("vol", vnames[i])) { if (devmask & (1 << i) && !strcmp("vol", vnames[i])) {
if (ioctl(afd, MIXER_READ(i), &v) == -1) { if (ioctl(afd, MIXER_READ(i), &v) == -1) {
warn("vol_perc: ioctl"); warn("vol_perc: ioctl");
@ -884,8 +886,7 @@ main(int argc, char *argv[])
while (!done) { while (!done) {
status_string[0] = '\0'; status_string[0] = '\0';
for (element = status_string, i = len = 0; for (element = status_string, i = len = 0; i < LEN(args);
i < sizeof(args) / sizeof(args[0]);
++i, element += len) { ++i, element += len) {
argument = args[i]; argument = args[i];
len = snprintf(element, sizeof(status_string)-1 - len, len = snprintf(element, sizeof(status_string)-1 - len,