Compare commits

...

2 Commits

Author SHA1 Message Date
ekzyis
bf9ab0740f Remove battery 2025-12-01 23:53:58 +01:00
4aedc1e9cc Fix return type of gettemperature
I get this error when trying to build my NixOS system with the nixos-25.05 channel:

dwmstatus.c: In function 'gettemperature':
dwmstatus.c:182:24: error: returning 'char *' from a function with return type 'int' makes integer from pointer without a cast []
  182 |                 return smprintf("");
      |                        ^~~~~~~~~~~~
2025-06-08 14:40:37 +02:00

View File

@ -179,9 +179,8 @@ gettemperature(char *base, char *sensor)
co = readfile(base, sensor);
if (co == NULL)
return smprintf("");
return atof(co) / 1000;
// return smprintf("%02.0f°C", atof(co) / 1000);
return 0;
return atof(co) / 1000;
}
char *
@ -227,7 +226,7 @@ main(void)
for (;;sleep(30)) {
avgs = loadavg();
bat = getbattery("/sys/class/power_supply/BAT0");
// bat = getbattery("/sys/class/power_supply/BAT0");
// tmar = mktimes("%H:%M", tzargentina);
// tmutc = mktimes("%H:%M", tzutc);
tmbln = mktimes("%a %d %b %H:%M %Z %Y", tzberlin);
@ -237,7 +236,7 @@ main(void)
t1 = gettemperature("/sys/devices/virtual/thermal/thermal_zone1", "temp");
freeMem = execscript("free -m | grep Mem | awk '{ print $3 }'");
status = smprintf("| %d°C | %s | %sM | %s | %s |", t0 > t1 ? t0 : t1, avgs, freeMem, bat, tmbln);
status = smprintf("| %d°C | %s | %sM | %s |", t0 > t1 ? t0 : t1, avgs, freeMem, tmbln);
setstatus(status);
// free(surfs);
@ -245,7 +244,7 @@ main(void)
// free(t0);
// free(t1);
free(avgs);
free(bat);
// free(bat);
// free(tmar);
// free(tmutc);
free(tmbln);