M components/battery.c → 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;

M components/volume.c → 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 @@ }
 	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;