X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/6d23d53d1fb8a271d765b297ee56cb075f488072..e6158e300d3134e44f741e01108dd088297c476f:/slstatus.c

diff --git a/slstatus.c b/slstatus.c
index 3391e67..70d8fbb 100644
--- a/slstatus.c
+++ b/slstatus.c
@@ -37,8 +37,6 @@ struct arg {
 	const char *args;
 };
 
-static unsigned short int delay;
-
 static char *smprintf(const char *, ...);
 static char *battery_perc(const char *);
 static char *cpu_perc(void);
@@ -65,6 +63,7 @@ static char *vol_perc(const char *);
 static char *wifi_perc(const char *);
 static char *wifi_essid(const char *);
 
+static unsigned short int delay;
 static Display *dpy;
 
 #include "config.h"
@@ -261,7 +260,7 @@ hostname(void)
 
 	fgets(hostname, sizeof(hostname), fp);
 	/* FIXME: needs improvement */
-	memset(&hostname[strlen(hostname)-1], '\0',
+	memset(&hostname[strlen(hostname)], '\0',
 		sizeof(hostname) - strlen(hostname));
 	fclose(fp);
 
@@ -480,17 +479,17 @@ vol_perc(const char *snd_card)
 	snd_mixer_selem_id_t *s_elem;
 
 	snd_mixer_open(&handle, 0);
-	snd_mixer_attach(handle, "default");
+	snd_mixer_attach(handle, snd_card);
 	snd_mixer_selem_register(handle, NULL, NULL);
 	snd_mixer_load(handle);
 	snd_mixer_selem_id_malloc(&s_elem);
-	snd_mixer_selem_id_set_name(s_elem, snd_card);
+	snd_mixer_selem_id_set_name(s_elem, ALSA_CHANNEL);
 	elem = snd_mixer_find_selem(handle, s_elem);
 
 	if (elem == NULL) {
 		snd_mixer_selem_id_free(s_elem);
 		snd_mixer_close(handle);
-		perror("alsa error");
+		warn("error: ALSA");
 		return smprintf(UNKNOWN_STR);
 	}
 
@@ -501,7 +500,7 @@ vol_perc(const char *snd_card)
 	snd_mixer_selem_id_free(s_elem);
 	snd_mixer_close(handle);
 
-	return smprintf("%d", (vol * 100) / max);
+	return smprintf("%d", ((uint_fast16_t)(vol * 100) / max));
 }
 
 static char *
@@ -513,7 +512,7 @@ wifi_perc(const char *wificard)
 	char status[5];
 	FILE *fp;
 
-	ccat(3, "/sys/class/net", wificard, "/operstate");
+	ccat(3, "/sys/class/net/", wificard, "/operstate");
 
 	fp = fopen(concat, "r");