From 3e04f1d910b2bab606e2bcaa61a0cee4f9cfe8b8 Mon Sep 17 00:00:00 2001
From: "Ali H. Fardan" <raiz@firemail.cc>
Date: Wed, 14 Sep 2016 03:31:01 +0300
Subject: minor improvements and memory leak fix

---
 slstatus.c | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

(limited to 'slstatus.c')

diff --git a/slstatus.c b/slstatus.c
index 840ceb0..69fb6a5 100644
--- a/slstatus.c
+++ b/slstatus.c
@@ -66,9 +66,8 @@ static char *wifi_perc(const char *);
 static char *wifi_essid(const char *);
 static void sighandler(const int);
 
-static unsigned short int delay;
+static unsigned short int delay, done;
 static Display *dpy;
-static int done = 0;
 
 #include "config.h"
 
@@ -117,7 +116,7 @@ battery_perc(const char *battery)
 static char *
 battery_state(const char *battery)
 {
-	char *state = malloc(sizeof(char)*12);
+	char *state[12]; 
 	FILE *fp;
 
 	if (!state) {
@@ -132,7 +131,7 @@ battery_state(const char *battery)
 		warn("Error opening battery file: %s", concat);
 		return smprintf(UNKNOWN_STR);
 	}
-	fscanf(fp, "%s", state);
+	fscanf(fp, "%12s", state);
 	fclose(fp);
 
 	if (strcmp(state, "Charging") == 0)
@@ -509,7 +508,7 @@ vol_perc(const char *soundcard)
 	if (elem == NULL) {
 		snd_mixer_selem_id_free(s_elem);
 		snd_mixer_close(handle);
-		warn("Failed to get volume percentage for: %s.", soundcard);
+		warn("Failed to get volume percentage for: %s", soundcard);
 		return smprintf(UNKNOWN_STR);
 	}
 
@@ -599,15 +598,14 @@ wifi_essid(const char *wificard)
 static void
 sighandler(const int signo)
 {
-	if (signo == SIGTERM || signo == SIGINT) {
+	if (signo == SIGTERM || signo == SIGINT)
 		done = 1;
-	}
 }
 
 int
 main(void)
 {
-	size_t i;
+	unsigned short int i;
 	char status_string[4096];
 	char *res, *element, *status_old;
 	struct arg argument;
@@ -620,8 +618,6 @@ main(void)
 
 	dpy = XOpenDisplay(NULL);
 
-	XFetchName(dpy, DefaultRootWindow(dpy), &status_old);
-
 	while (!done) {
 		status_string[0] = '\0';
 		for (i = 0; i < sizeof(args) / sizeof(args[0]); ++i) {
@@ -649,7 +645,7 @@ main(void)
 		delay = 0;
 	}
 
-	XStoreName(dpy, DefaultRootWindow(dpy), status_old);
+	XStoreName(dpy, DefaultRootWindow(dpy), NULL);
 	XSync(dpy, False);
 
 	XCloseDisplay(dpy);
-- 
cgit v1.2.3