Simplify ipv* functions

[slstatus.git] / components / cpu.c

diff --git a/components/cpu.c b/components/cpu.c
index 02e7671..60a7991 100644 (file)
--- a/components/cpu.c
+++ b/components/cpu.c
@@ -12,7 +12,7 @@
                int freq;
 
                return (pscanf("/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq",
                int freq;
 
                return (pscanf("/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq",

-                              "%i", &freq) == 1) ?
+                              "%d", &freq) == 1) ?

                       bprintf("%d", (freq + 500) / 1000) : NULL;
        }
 
                       bprintf("%d", (freq + 500) / 1000) : NULL;
        }
 


@@ -57,7 +57,7 @@
                size = sizeof(freq);
 
                if (sysctl(mib, 2, &freq, &size, NULL, 0) < 0) {
                size = sizeof(freq);
 
                if (sysctl(mib, 2, &freq, &size, NULL, 0) < 0) {

-                       fprintf(stderr, "sysctl 'HW_CPUSPEED': %s\n", strerror(errno));
+                       warn("sysctl 'HW_CPUSPEED':");

                        return NULL;
                }
 
                        return NULL;
                }
 


@@ -80,7 +80,7 @@
 
                memcpy(b, a, sizeof(b));
                if (sysctl(mib, 2, &a, &size, NULL, 0) < 0) {
 
                memcpy(b, a, sizeof(b));
                if (sysctl(mib, 2, &a, &size, NULL, 0) < 0) {

-                       fprintf(stderr, "sysctl 'KERN_CPTIME': %s\n", strerror(errno));
+                       warn("sysctl 'KERN_CPTIME':");

                        return NULL;
                }
                if (!valid) {
                        return NULL;
                }
                if (!valid) {