]> git.sur5r.net Git - i3/i3status/commitdiff
retab! print_cpu_temperature
authorMichael Stapelberg <michael@stapelberg.de>
Mon, 28 Jan 2013 10:37:23 +0000 (11:37 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Mon, 28 Jan 2013 10:37:23 +0000 (11:37 +0100)
src/print_cpu_temperature.c

index e25cea5b6b1772e5ba0bd7741fc3fdb30691c37f..0e02070085c37a76495e2b6b0245f5aa4f2586ec 100644 (file)
@@ -56,7 +56,7 @@ void print_cpu_temperature_info(yajl_gen json_gen, char *buffer, int zone, const
 
                 if (BEGINS_WITH(walk+1, "degrees")) {
 #if defined(LINUX)
-                       static char buf[16];
+                        static char buf[16];
                         long int temp;
                         if (!slurp(path, buf, sizeof(buf)))
                                 goto error;
@@ -82,49 +82,49 @@ void print_cpu_temperature_info(yajl_gen json_gen, char *buffer, int zone, const
 
                         outwalk += sprintf(outwalk, "%d.%d", TZ_KELVTOC(sysctl_rslt));
 #elif defined(__OpenBSD__)
-       struct sensordev sensordev;
-       struct sensor sensor;
-       size_t sdlen, slen;
-       int dev, numt, mib[5] = { CTL_HW, HW_SENSORS, 0, 0, 0 };
+        struct sensordev sensordev;
+        struct sensor sensor;
+        size_t sdlen, slen;
+        int dev, numt, mib[5] = { CTL_HW, HW_SENSORS, 0, 0, 0 };
 
-       sdlen = sizeof(sensordev);
-       slen = sizeof(sensor);
+        sdlen = sizeof(sensordev);
+        slen = sizeof(sensor);
 
-       for (dev = 0; ; dev++) {
-               mib[2] = dev;
-               if (sysctl(mib, 3, &sensordev, &sdlen, NULL, 0) == -1) {
-                       if (errno == ENXIO)
-                               continue;
-                       if (errno == ENOENT)
-                               break;
-                       goto error;
-               }
-               /* 'path' is the node within the full path (defaults to acpitz0). */
-               if (strncmp(sensordev.xname, path, strlen(path)) == 0) {
-                       mib[3] = SENSOR_TEMP;
-                       /* Limit to temo0, but should retrieve from a full path... */
-                       for (numt = 0; numt < 1 /*sensordev.maxnumt[SENSOR_TEMP]*/; numt++) {
-                               mib[4] = numt;
-                               if (sysctl(mib, 5, &sensor, &slen, NULL, 0) == -1) {
-                                       if (errno != ENOENT) {
-                                               warn("sysctl");
-                                               continue;
-                                       }
-                               }
-                               if ((int)MUKTOC(sensor.value) >= max_threshold) {
-                                       START_COLOR("color_bad");
-                                       colorful_output = true;
-                               }
+        for (dev = 0; ; dev++) {
+                mib[2] = dev;
+                if (sysctl(mib, 3, &sensordev, &sdlen, NULL, 0) == -1) {
+                        if (errno == ENXIO)
+                                continue;
+                        if (errno == ENOENT)
+                                break;
+                        goto error;
+                }
+                /* 'path' is the node within the full path (defaults to acpitz0). */
+                if (strncmp(sensordev.xname, path, strlen(path)) == 0) {
+                        mib[3] = SENSOR_TEMP;
+                        /* Limit to temo0, but should retrieve from a full path... */
+                        for (numt = 0; numt < 1 /*sensordev.maxnumt[SENSOR_TEMP]*/; numt++) {
+                                mib[4] = numt;
+                                if (sysctl(mib, 5, &sensor, &slen, NULL, 0) == -1) {
+                                        if (errno != ENOENT) {
+                                                warn("sysctl");
+                                                continue;
+                                        }
+                                }
+                                if ((int)MUKTOC(sensor.value) >= max_threshold) {
+                                        START_COLOR("color_bad");
+                                        colorful_output = true;
+                                }
 
-                               outwalk += sprintf(outwalk, "%.2f", MUKTOC(sensor.value));
+                                outwalk += sprintf(outwalk, "%.2f", MUKTOC(sensor.value));
 
-                               if (colorful_output) {
-                                       END_COLOR;
+                                if (colorful_output) {
+                                        END_COLOR;
                                         colorful_output = false;
                                 }
-                       }
-               }
-       }
+                        }
+                }
+        }
 #endif
                         walk += strlen("degrees");
                 }