X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/2f8335abf0d6347100cf63d82e8151ad0ff97ab0..de4f20ace35037a510aafcf49a3d78637d7248b6:/slstatus.c

diff --git a/slstatus.c b/slstatus.c
index 7337e4a..ab461c8 100644
--- a/slstatus.c
+++ b/slstatus.c
@@ -33,7 +33,6 @@ struct arg {
 	const char *args;
 };
 
-static void setstatus(const char *);
 static char *smprintf(const char *, ...);
 static char *battery_perc(const char *);
 static char *cpu_perc(void);
@@ -64,14 +63,6 @@ static Display *dpy;
 
 #include "config.h"
 
-static void
-setstatus(const char *str)
-{
-	/* set WM_NAME via X11 */
-	XStoreName(dpy, DefaultRootWindow(dpy), str);
-	XSync(dpy, False);
-}
-
 static char *
 smprintf(const char *fmt, ...)
 {
@@ -156,7 +147,6 @@ cpu_perc(void)
 	fscanf(fp, "%*s %Lf %Lf %Lf %Lf", &a[0], &a[1], &a[2], &a[3]);
 	fclose(fp);
 
-	/* wait a second (for avg values) */
 	sleep(1);
 
 	fp = fopen("/proc/stat","r");
@@ -262,8 +252,7 @@ entropy(void)
 static char *
 gid(void)
 {
-	gid_t gid = getgid();
-	return smprintf("%d", gid);
+	return smprintf("%d", getgid());
 }
 
 static char *
@@ -626,10 +615,6 @@ main(void)
 	struct arg argument;
 
 	dpy = XOpenDisplay(0x0);
-	if (!dpy) {
-		fprintf(stderr, "Cannot open display!\n");
-		exit(1);
-	}
 
 	for (;;) {
 		memset(status_string, 0, sizeof(status_string));
@@ -649,10 +634,15 @@ main(void)
 			free(element);
 		}
 
-		setstatus(status_string);
-		sleep(UPDATE_INTERVAL -1);
+		XStoreName(dpy, DefaultRootWindow(dpy), status_string);
+		XSync(dpy, False);
 	}
 
+	/* NOT REACHED */
+	/*
+	 * TODO: find out a way to exit successfully
+	 * to prevent memory leaks
+	 */
 	XCloseDisplay(dpy);
 	return 0;
 }