simplify status_string clearing

[slstatus.git] / slstatus.c

diff --git a/slstatus.c b/slstatus.c
index 3391e67..6e86092 100644 (file)
--- a/slstatus.c
+++ b/slstatus.c
@@ -37,8 +37,6 @@ struct arg {
        const char *args;
 };
 
        const char *args;
 };
 

-static unsigned short int delay;
-

 static char *smprintf(const char *, ...);
 static char *battery_perc(const char *);
 static char *cpu_perc(void);
 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 char *wifi_perc(const char *);
 static char *wifi_essid(const char *);
 

+static unsigned short int delay;

 static Display *dpy;
 
 #include "config.h"
 static Display *dpy;
 
 #include "config.h"


@@ -480,17 +479,17 @@ vol_perc(const char *snd_card)
        snd_mixer_selem_id_t *s_elem;
 
        snd_mixer_open(&handle, 0);
        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_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);
        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);
        }
 
                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);
 
        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 *
 }
 
 static char *


@@ -513,7 +512,7 @@ wifi_perc(const char *wificard)
        char status[5];
        FILE *fp;
 
        char status[5];
        FILE *fp;
 

-       ccat(3, "/sys/class/net", wificard, "/operstate");
+       ccat(3, "/sys/class/net/", wificard, "/operstate");

 
        fp = fopen(concat, "r");
 
 
        fp = fopen(concat, "r");
 


@@ -569,6 +568,8 @@ wifi_essid(const char *wificard)
                return smprintf(UNKNOWN_STR);
        }
 
                return smprintf(UNKNOWN_STR);
        }
 

+       close(sockfd);
+

        if (strcmp((char *)wreq.u.essid.pointer, "") == 0)
                return smprintf(UNKNOWN_STR);
        else
        if (strcmp((char *)wreq.u.essid.pointer, "") == 0)
                return smprintf(UNKNOWN_STR);
        else


@@ -586,7 +587,7 @@ main(void)
        dpy = XOpenDisplay(NULL);
 
        for (;;) {
        dpy = XOpenDisplay(NULL);
 
        for (;;) {

-               memset(status_string, 0, sizeof(status_string));
+               status_string[0] = '\0';

                for (i = 0; i < sizeof(args) / sizeof(args[0]); ++i) {
                        argument = args[i];
                        if (argument.args == NULL)
                for (i = 0; i < sizeof(args) / sizeof(args[0]); ++i) {
                        argument = args[i];
                        if (argument.args == NULL)