Add flexible formatting to keyboard_indicators.

[slstatus.git] / components / temperature.c

diff --git a/components/temperature.c b/components/temperature.c
index 32eb691..fe2e0c9 100644 (file)
--- a/components/temperature.c
+++ b/components/temperature.c
@@ -9,13 +9,14 @@
        {
                int temp;
 
        {
                int temp;
 

-               return (pscanf(file, "%d", &temp) == 1) ?
-                      bprintf("%d°C", temp / 1000) : NULL;
+               if(pscanf(file, "%d", &temp) != 1) {
+                       return NULL;
+               }
+
+               return bprintf("%d", temp / 1000);

        }
 #elif defined(__OpenBSD__)
        }
 #elif defined(__OpenBSD__)

-       #include <errno.h>

        #include <stdio.h>
        #include <stdio.h>

-       #include <string.h>

        #include <sys/time.h> /* before <sys/sensors.h> for struct timeval */
        #include <sys/sensors.h>
        #include <sys/sysctl.h>
        #include <sys/time.h> /* before <sys/sensors.h> for struct timeval */
        #include <sys/sensors.h>
        #include <sys/sysctl.h>


@@ -41,6 +42,6 @@
                }
 
                /* kelvin to celsius */
                }
 
                /* kelvin to celsius */

-               return bprintf("%d°C", (temp.value - 273150000) / 1000000);
+               return bprintf("%d", (temp.value - 273150000) / 1E6);

        }
 #endif
        }
 #endif