From f65fb9bca18bb445de2c337ed9e4d84de5b631f7 Mon Sep 17 00:00:00 2001
From: "Ali H. Fardan" <raiz@firemail.cc>
Date: Sun, 21 Aug 2016 15:19:45 +0300
Subject: [PATCH] fixed the code, works now

---
 .config.h.swp | Bin 0 -> 12288 bytes
 slstatus.c    |  32 +++++++++++++++++++-------------
 2 files changed, 19 insertions(+), 13 deletions(-)
 create mode 100644 .config.h.swp

diff --git a/.config.h.swp b/.config.h.swp
new file mode 100644
index 0000000000000000000000000000000000000000..dfc71bbf434b571d5f007bb60cb40d435163615d
GIT binary patch
literal 12288
zcmYc?2=nw+FxN9-U|?VnU|{g+-5Ku3@r{AqmVu$PIJF2QOb8nq8=DhS1Cp-;8K_^B
zT9B__oKswqSW;T7pPZkUmYJ@X0g@lZqaiRF0<;VPUIt?$Lj#Zv%1Vj~!a|`S<|rNw
zfzc2c4S~@R7!85Z5Eu=C(GVC7fzc2cAt6vwz{pU~z`(!+^{*k6W<;Z*+)-*Y1V%$(
zGz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtqGoKw=65!z(rhhEwd2`F~jd{}?|5
z!%=<)hAsRI3@!W&49)xu45j=G495Hn4FCBU7!LC>FdX7zVCdjuV2I~qV2I;mV9?`Z
zU|{8AU|`{6VEE3<z_5##fuWt3fgzHYfkBR!f#ER^1H*D228J9S1_oOm1_l8h28J)(
z3=C(u85kCFGce?FGcZ_lGcd4oGca7?Vqlog#lR57#lWD;#lXPD#lUcxlYya=lYzmW
zlY!wc2Lr<`4hDv`91ILC91IN691IM)91IMs91IL+*&+Tp3G&krjFV9(kA}c#2#kin
zXb6mk0P!JEYt6t}t&oyfl3J3Po2sJ#0!pgIN)Q%^r=XyuTB)m=tE-x#pz2|z>T9JM
ztfWw@1J;*WoE=|~T9gb{u2fu{qM&MAtWcu>)~}=wQ&*OsgHWcRRF<EkplX6pmy(*6
zSejD;Q(cspi>$gRF&EiXzfd0^sP)MOrN|1C3rfMpf-P52fGgD3Qb;S!OD@UG&jWiX
zEx#x?u>{Nn6NyFXrManjB??;l44?&unaK*t`FX`93dJQwrO71<iACukTpS&%V5?Bg
zpsP@xnU)!!T3no&qM!j{D}dRW3ehl=tiVbXk`s$k6f*NlQj5|OlT#J)5_3~yL6$&G
z00kV>fa1*byu=)Z%sd5<U}|0oafUJID!_tPK_fAzI1$7x%}rHE%u7+oEiFk^0Qsl1
z7?;7t`K5U&AXmmR=qiBLS%RFXpaEy)rzs?t78QZQ1|){!C{XZ%wH1I;j)F!hn8vOI
z6i}s^DGJ1xSCX1rpr8RFQ;QNyN{doKj!#KVFG@`<Mll^(Nm^!3D#$TKrFrqm`MJ3u
z|7#SL<|!nX7MJAbDimj==Hw_qWl&6kih(sJ=Ej#6r=}=qfRbEkabh~yZfr3E^E@c2
zmgJWt=8&idWG0DP(uz`3Nzjs$pO_M#SeCA!0b(g6mZcUYrl+EK9p;J50tJoC0)@ns
zl%mvP)G&r8UQqaC<QJEK69`f|hnbNMieeB!OcbZ)l@#R{R4QmBmL+E9BqrsgDnNy>
zx-SJ(%0MCp#8ki=Gr9Stc_jt;nRz83Cxg_-Ln8>pCRr~eqR7$;i7=A2LW^Pr4N##B
z&d8wrg%U830u1CoSP7`00V@3P1`I5wk`hZwQj03V1*d`rlm{zz(31#E8WioZ4EkEo
z@+2v-hyk^zOwLFwQYg*K&dV>)D@m;=0hg6ZdHRV;)*x*lA%&8Bh2o6-a)rz^g}i))
zvc#OyRE6ZkJcXoGg`(7wqRiB?)D%$h2s61f4^%9sf{Rdv(gIL;#Df!LSz?ZYt%4!g
z<Rp;2U^z%h3zEysQz%YN&d*CJR?sNUP0YzjEiQrDXRBbSiEIa?pa;7i>esZ=oSf)b
zaK&J&pp=@IT9jTH4-$+|Nd>t_$r|Q9Ouc#e<xs5(2)%jv<@odzB$i}AHQ6dC=@(ZP
z>nG<V78mOm<d>%w#TS<r6y#LuLxK_NL>wMS&PdG5ONBWe<O5p;CEvv2lGGxIc5n>=
zF7v@A=xZqir=}|ScsjfK1-mMM%20*0{33<q{DR7&%=C;BaO%s+Ois-!PE|-rElJGG
JDb@pN1pxcG@I(Lr

literal 0
HcmV?d00001

diff --git a/slstatus.c b/slstatus.c
index 40aaa19..b0e3eef 100644
--- a/slstatus.c
+++ b/slstatus.c
@@ -29,7 +29,7 @@
 #include "strlcat.h"
 #include "strlcpy.h"
 
-typedef char *(*op_fun) (const char *);
+typedef char *(*op_fun)();
 struct arg {
 	op_fun func;
 	const char *format;
@@ -255,14 +255,8 @@ entropy(void)
 static char *
 gid(void)
 {
-	gid_t gid;
-
-	if ((gid = getgid()) < 0) {
-		fprintf(stderr, "Could no get gid.\n");
-		return smprintf(unknowntext);
-	} else
-		return smprintf("%d", gid);
-	return smprintf(unknowntext);
+	gid_t gid = getgid();
+	return smprintf("%d", gid);
 }
 
 static char *
@@ -612,9 +606,21 @@ wifi_essid(const char *wificard)
 int
 main(void)
 {
+	size_t i;
 	char status_string[1024];
+	char *res, *element;
 	struct arg argument;
 
+	/* get rid of unused functions warning */
+	if (0) { setstatus(""); battery_perc(""); cpu_perc();
+		datetime(""); disk_free(""); disk_perc("");
+		disk_total(""); disk_used(""); entropy();
+		gid(); hostname(); ip(""); load_avg();
+		ram_free(); ram_perc(); ram_used(); ram_total();
+		run_command(""); temp(""); uid(); uptime();
+		username(); vol_perc(""); wifi_perc("");
+		wifi_essid(""); }
+
 	if (!(dpy = XOpenDisplay(0x0))) {
 		fprintf(stderr, "Cannot open display!\n");
 		exit(1);
@@ -622,13 +628,13 @@ main(void)
 
 	for (;;) {
 		memset(status_string, 0, sizeof(status_string));
-		for (size_t i = 0; i < sizeof(args) / sizeof(args[0]); ++i) {
+		for (i = 0; i < sizeof(args) / sizeof(args[0]); ++i) {
 			argument = args[i];
 			if (argument.args == NULL)
-				char *res = argument.func();
+				res = argument.func();
 			else
-				char *res = argument.func(argument.args);
-			char *element = smprintf(argument.format, res);
+				res = argument.func(argument.args);
+			element = smprintf(argument.format, res);
 			if (element == NULL) {
 				element = smprintf(unknowntext);
 				fprintf(stderr, "Failed to format output.\n");
-- 
2.54.0