summaryrefslogtreecommitdiff
path: root/sysstatus.c
diff options
context:
space:
mode:
authornorly <ny-git@enpas.org>2012-02-14 01:27:32 +0000
committernorly <ny-git@enpas.org>2012-02-14 01:27:32 +0000
commit504ab94abcd8209ce96bcb747db7536f9d49c083 (patch)
treed8ddffea203769f5460348f74ac85c63c33c3f7e /sysstatus.c
parent38a130597b1f52028f7df79ab5f348dc306afa85 (diff)
Cleaned up 'netif'.
Replaced 'netif' with 'netif_named'. Fixed memory leak in new 'netif'. Outsourced raw file reading to tools.c.
Diffstat (limited to 'sysstatus.c')
-rw-r--r--sysstatus.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/sysstatus.c b/sysstatus.c
index bbdb2fe..4e5d6c8 100644
--- a/sysstatus.c
+++ b/sysstatus.c
@@ -5,7 +5,7 @@
#include "statuses/uptime.h"
#include "statuses/memusage.h"
#include "statuses/cpuusage.h"
-#include "statuses/netif_named.h"
+#include "statuses/netif.h"
#include "statuses/power.h"
#include "statuses/volume_alsa.h"
#include "statuses/temp.h"
@@ -22,11 +22,11 @@ void updatestatus()
status_memusage();
- status_netif_named("eth0");
- status_netif_named("eth1");
- status_netif_named("wlan0");
- status_netif_named("wlan1");
- status_netif_named("ppp0");
+ status_netif("eth0");
+ status_netif("eth1");
+ status_netif("wlan0");
+ status_netif("wlan1");
+ status_netif("ppp0");
status_temp("GPU: ", "/sys/class/hwmon/hwmon0/device/temp4_input");
status_temp("CPU: ", "/sys/class/hwmon/hwmon0/device/temp2_input");
@@ -43,16 +43,14 @@ int main()
{
struct timeval tv;
- updatestatus();
-
for(;;)
{
+ updatestatus();
+
tv.tv_sec = UPDATE_SECS;
tv.tv_usec = 0;
select(0, NULL, NULL, NULL, &tv);
-
- updatestatus();
}
return 0;