diff options
| author | Ingo Bürk <admin@airblader.de> | 2018-04-08 15:53:19 +0200 | 
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-08 15:53:19 +0200 | 
| commit | 82d25dc36295bc59cdf37af8e23c644a9c2e6aad (patch) | |
| tree | cd085f07eb0b4ae0d5ca7ac6ff8df588af6c2457 | |
| parent | 199a6a27136a5ddb3d813185f0f8cf9185072f08 (diff) | |
| parent | 46b5c264d177f1e01bd17746071f4b0e1ca42eab (diff) | |
Merge pull request #275 from winks/patch-2
Fix NULL value on OpenBSD when there is no acpitz0
| -rw-r--r-- | src/print_cpu_temperature.c | 6 | 
1 files changed, 4 insertions, 2 deletions
| diff --git a/src/print_cpu_temperature.c b/src/print_cpu_temperature.c index 56ab62a..431664e 100644 --- a/src/print_cpu_temperature.c +++ b/src/print_cpu_temperature.c @@ -112,7 +112,7 @@ static int read_temperature(char *thermal_zone, temperature_t *temperature) {          /* 'path' is the node within the full path (defaults to acpitz0). */          if (BEGINS_WITH(sensordev.xname, thermal_zone)) {              mib[3] = SENSOR_TEMP; -            /* Limit to temo0, but should retrieve from a full path... */ +            /* Limit to temp0, 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) { @@ -205,7 +205,7 @@ error_netbsd1:  /*   * Reads the CPU temperature from /sys/class/thermal/thermal_zone%d/temp (or - * the user provided path) and returns the temperature in degree celcius. + * the user provided path) and returns the temperature in degree celsius.   *   */  void print_cpu_temperature_info(yajl_gen json_gen, char *buffer, int zone, const char *path, const char *format, const char *format_above_threshold, int max_threshold) { @@ -216,6 +216,8 @@ void print_cpu_temperature_info(yajl_gen json_gen, char *buffer, int zone, const      bool colorful_output = false;      char *thermal_zone;      temperature_t temperature; +    temperature.raw_value = 0; +    sprintf(temperature.formatted_value, "%.2f", 0.0);      if (path == NULL)          asprintf(&thermal_zone, THERMAL_ZONE, zone); | 
