X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/b650c438f0dc049d98e339e66eeffd7650774a5d..9fa858daeafb5398cdf19af9483b2854fe6e9772:/slstatus.c

diff --git a/slstatus.c b/slstatus.c
index 2e57fbb..dae5e8a 100644
--- a/slstatus.c
+++ b/slstatus.c
@@ -147,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");
@@ -615,36 +614,29 @@ main(void)
 	char *res, *element;
 	struct arg argument;
 
-	dpy = XOpenDisplay(0x0);
-
-	for (;;) {
-		memset(status_string, 0, sizeof(status_string));
-		for (i = 0; i < sizeof(args) / sizeof(args[0]); ++i) {
-			argument = args[i];
-			if (argument.args == NULL)
-				res = argument.func();
-			else
-				res = argument.func(argument.args);
-			element = smprintf(argument.format, res);
-			if (element == NULL) {
-				element = smprintf(UNKNOWN_STR);
-				fprintf(stderr, "Failed to format output.\n");
-			}
-			strlcat(status_string, element, sizeof(status_string));
-			free(res);
-			free(element);
+	stderr = stderr;
+	dpy = XOpenDisplay(NULL);
+
+	memset(status_string, 0, sizeof(status_string));
+	for (i = 0; i < sizeof(args) / sizeof(args[0]); ++i) {
+		argument = args[i];
+		if (argument.args == NULL)
+			res = argument.func();
+		else
+			res = argument.func(argument.args);
+		element = smprintf(argument.format, res);
+		if (element == NULL) {
+			element = smprintf(UNKNOWN_STR);
+			fprintf(stderr, "Failed to format output.\n");
 		}
-
-		XStoreName(dpy, DefaultRootWindow(dpy), status_string);
-		XSync(dpy, False);
-		sleep(UPDATE_INTERVAL -1);
+		strlcat(status_string, element, sizeof(status_string));
+		free(res);
+		free(element);
 	}
 
-	/* NOT REACHED */
-	/*
-	 * TODO: find out a way to exit successfully
-	 * to prevent memory leaks
-	 */
+	XStoreName(dpy, DefaultRootWindow(dpy), status_string);
+	XSync(dpy, False);
 	XCloseDisplay(dpy);
+
 	return 0;
 }