lhark/slstatus
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #2 from pfannkuchengesicht/master

Browse source 
fixed some memory leaks
This commit is contained in:
Aaron Marcher 2016-03-09 07:45:51 +01:00
commit 16d01e8ded
2 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config.def.h
View file

@ -19,4 +19,4 @@ static const char timeformat[] = "%y-%m-%d %H:%M:%S";
/* statusbar */ /* statusbar */
#define FORMATSTRING "wifi %4s | bat %4s | cpu %4s %3s | ram %3s | vol %4s | %3s" #define FORMATSTRING "wifi %4s | bat %4s | cpu %4s %3s | ram %3s | vol %4s | %3s"
#define ARGUMENTS wifi_signal(), battery(), cpu_usage(), cpu_temperature(), ram_usage(), volume(), datetime() #define ARGUMENTS pWifi_signal, pBattery, pCpu_usage, pCpu_temperature, pRam_usage, pVolume, pDatetime

24
slstatus.c
View file

@ -247,7 +247,7 @@ volume()
/* return the string (mute) */ /* return the string (mute) */
if (!mute) if (!mute)
return "mute"; return smprintf("mute");
else else
return smprintf("%d%%", (vol * 100) / max); return smprintf("%d%%", (vol * 100) / max);
} }
@ -322,10 +322,32 @@ main()
exit(1); exit(1);
} }
char *pWifi_signal = NULL;
char *pBattery = NULL;
char *pCpu_usage = NULL;
char *pCpu_temperature = NULL;
char *pRam_usage = NULL;
char *pVolume = NULL;
char *pDatetime = NULL;
/* return status every second */ /* return status every second */
for (;;) { for (;;) {
pWifi_signal = wifi_signal();
pBattery = battery();
pCpu_usage = cpu_usage();
pCpu_temperature = cpu_temperature();
pRam_usage = ram_usage();
pVolume = volume();
pDatetime = datetime();
sprintf(status, FORMATSTRING, ARGUMENTS); sprintf(status, FORMATSTRING, ARGUMENTS);
setstatus(status); setstatus(status);
free(pWifi_signal);
free(pBattery);
free(pCpu_usage);
free(pCpu_temperature);
free(pRam_usage);
free(pVolume);
free(pDatetime);
} }
/* close display */ /* close display */