summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Marcher <me@drkhsh.at>2018-05-17 17:40:11 +0200
committerAaron Marcher <me@drkhsh.at>2018-05-17 17:42:26 +0200
commit7be675f154e3922fb8e2c9309b48f9fa12869817 (patch)
tree1addd0ef4de2aa403819beb6acd4f2d0ba908bc9
parentf9609f4ff421787bfa46b8f1c6ef2419b7679f7b (diff)
Unify type of `i` in for loops
int for normal indexes size_t for usage with the LEN macro
-rw-r--r--components/battery.c3
-rw-r--r--components/volume.c4
2 files changed, 3 insertions, 4 deletions
diff --git a/components/battery.c b/components/battery.c
index a63b9d0..0871953 100644
--- a/components/battery.c
+++ b/components/battery.c
@@ -77,8 +77,7 @@
const char *
battery_state(const char *bat)
{
- int fd;
- size_t i;
+ int fd, i;
struct apm_power_info apm_info;
struct {
unsigned int state;
diff --git a/components/volume.c b/components/volume.c
index ff25769..aa46446 100644
--- a/components/volume.c
+++ b/components/volume.c
@@ -16,7 +16,7 @@
const char *
vol_perc(const char *card)
{
- unsigned int i;
+ size_t i;
int v, afd, devmask;
char *vnames[] = SOUND_DEVICE_NAMES;
@@ -34,7 +34,7 @@ vol_perc(const char *card)
for (i = 0; i < LEN(vnames); i++) {
if (devmask & (1 << i) && !strcmp("vol", vnames[i])) {
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));
close(afd);
return NULL;