Unify type of `i` in for loops
int for normal indexes size_t for usage with the LEN macro
This commit is contained in:
parent
f9609f4ff4
commit
7be675f154
|
@ -77,8 +77,7 @@
|
||||||
const char *
|
const char *
|
||||||
battery_state(const char *bat)
|
battery_state(const char *bat)
|
||||||
{
|
{
|
||||||
int fd;
|
int fd, i;
|
||||||
size_t i;
|
|
||||||
struct apm_power_info apm_info;
|
struct apm_power_info apm_info;
|
||||||
struct {
|
struct {
|
||||||
unsigned int state;
|
unsigned int state;
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
const char *
|
const char *
|
||||||
vol_perc(const char *card)
|
vol_perc(const char *card)
|
||||||
{
|
{
|
||||||
unsigned int i;
|
size_t i;
|
||||||
int v, afd, devmask;
|
int v, afd, devmask;
|
||||||
char *vnames[] = SOUND_DEVICE_NAMES;
|
char *vnames[] = SOUND_DEVICE_NAMES;
|
||||||
|
|
||||||
|
@ -34,7 +34,7 @@ vol_perc(const char *card)
|
||||||
for (i = 0; i < LEN(vnames); 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) < 0) {
|
if (ioctl(afd, MIXER_READ(i), &v) < 0) {
|
||||||
fprintf(stderr, "ioctl 'MIXER_READ(%d)': %s\n", i,
|
fprintf(stderr, "ioctl 'MIXER_READ(%ld)': %s\n", i,
|
||||||
strerror(errno));
|
strerror(errno));
|
||||||
close(afd);
|
close(afd);
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
Loading…
Reference in New Issue