Changeset 2252

Timestamp:

01/31/04 11:17:15 (9 years ago)

Author:

khali

Message:

Move degrees string construction into a single, common place.

Location:

lm-sensors/trunk/prog/sensors

Files:

• chips.c (modified) (6 diffs)
• main.c (modified) (2 diffs)

lm-sensors/trunk/prog/sensors/chips.c

@@ -35 +35 @@
 
 extern int fahrenheit;
+extern char degstr[5];
 
 char *spacestr(int n)
@@ -63 +64 @@
                      int minmax, int curprec, int limitprec)
 {
-   char degv[5];
-
    if (fahrenheit) {
-      sprintf(degv, "%cF", 176);
       n_cur  = deg_ctof(n_cur);
       n_over = deg_ctof(n_over);
       n_hyst = deg_ctof(n_hyst);
-   } else {
-      sprintf(degv, "%cC", 176);
    }
 
@@ -77 +73 @@
    if(minmax == MINMAX)
         printf("%+6.*f%s  (low  = %+5.*f%s, high = %+5.*f%s)  ",
-            curprec, n_cur, degv,
-            limitprec, n_hyst, degv,
-            limitprec, n_over, degv);
+            curprec, n_cur, degstr,
+            limitprec, n_hyst, degstr,
+            limitprec, n_over, degstr);
    else if(minmax == MAXONLY)
         printf("%+6.*f%s  (high = %+5.*f%s)                    ",
-            curprec, n_cur, degv,
-            limitprec, n_over, degv);
+            curprec, n_cur, degstr,
+            limitprec, n_over, degstr);
    else if(minmax == CRIT)
         printf("%+6.*f%s  (high = %+5.*f%s, crit = %+5.*f%s)  ",
-            curprec, n_cur, degv,
-            limitprec, n_over, degv,
-            limitprec, n_hyst, degv);
+            curprec, n_cur, degstr,
+            limitprec, n_over, degstr,
+            limitprec, n_hyst, degstr);
    else if(minmax == HYST)
         printf("%+6.*f%s  (high = %+5.*f%s, hyst = %+5.*f%s)  ",
-            curprec, n_cur, degv,
-            limitprec, n_over, degv,
-            limitprec, n_hyst, degv);
+            curprec, n_cur, degstr,
+            limitprec, n_over, degstr,
+            limitprec, n_hyst, degstr);
    else if(minmax == SINGLE)
         printf("%+6.*f%s",
-            curprec, n_cur, degv);
+            curprec, n_cur, degstr);
    else if(minmax == HYSTONLY)
         printf( "%+6.*f%s  (hyst = %+5.*f%s)                   ",
-            curprec, n_cur, degv,
-            limitprec, n_over, degv);
+            curprec, n_cur, degstr,
+            limitprec, n_over, degstr);
    else
         printf("Unknown temperature mode!");
@@ -1409 +1405 @@
       !sensors_get_feature(*name,SENSORS_LM80_TEMP_OS_MAX,&max2)) {
     if (valid) {
-      print_label(label,10);
-
-      if ( fahrenheit )
-      {
-      printf("%+3.2f°C (hot:limit = %+3.0f°F,  hysteresis = %+3.0f°F) %s\n",
-           deg_ctof(cur),deg_ctof(max),deg_ctof(min), alarms&LM80_ALARM_TEMP_HOT?"ALARM":"");
-    printf("         (os: limit = %+3.0f°F,  hysteresis = %+3.0f°F) %s\n",
-           deg_ctof(max2),deg_ctof(min2), alarms&LM80_ALARM_TEMP_HOT?"ALARM":"");
-      }
-      else
-      {
-      printf("%+3.2f °C (hot:limit = %+3.0f°C,  hysteresis = %+3.0f°C) %s\n",
-           cur,max,min, alarms&LM80_ALARM_TEMP_HOT?"ALARM":"");
-    printf("         (os: limit = %+3.0f°C,  hysteresis = %+3.0f°C) %s\n",
-           max2,min2, alarms&LM80_ALARM_TEMP_HOT?"ALARM":"");
-      }
+      if (fahrenheit) {
+        cur = deg_ctof(cur);
+        max = deg_ctof(max);
+        min = deg_ctof(min);
+        max2 = deg_ctof(max2);
+        min2 = deg_ctof(min2);
+      }
+
+      print_label(label,10);
+      printf("%+6.2f%s (hot: limit = %+3.0f%s, hyst = %+3.0f%s) %s\n",
+             cur, degstr, max, degstr, min, degstr,
+             alarms&LM80_ALARM_TEMP_HOT?"ALARM":"");
+      print_label("",10);
+      printf("         (os:  limit = %+3.0f%s, hyst = %+3.0f%s) %s\n",
+             max2, degstr, min2, degstr,
+             alarms&LM80_ALARM_TEMP_HOT?"ALARM":"");
     }
   } else
@@ -4020 +4016 @@
 static void lm92_print_temp (float n_cur,float n_high,float n_low,float n_crit,float n_hyst)
 {
-        char suffix[5];
-
         if (fahrenheit) {
-                sprintf (suffix,"%cF",176);
                 n_cur = deg_ctof (n_cur);
                 n_high = deg_ctof (n_high);
@@ -4029 +4022 @@
                 n_crit = deg_ctof (n_crit);
                 n_hyst = deg_ctof (n_hyst);
-        } else sprintf (suffix,"%cC",176);
+        }
 
         printf ("%+6.4f%s (high = %+6.4f%s, low = %+6.4f%s, crit = %+6.4f%s, hyst = %+6.4f%s)",
-                        n_cur,suffix,
-                        n_high,suffix,
-                        n_low,suffix,
-                        n_crit,suffix,
-                        n_hyst,suffix);
+                        n_cur, degstr,
+                        n_high, degstr,
+                        n_low, degstr,
+                        n_crit, degstr,
+                        n_hyst, degstr);
 }
 

lm-sensors/trunk/prog/sensors/main.c

@@ -54 +54 @@
 int chips_count=0;
 int do_sets, do_unknown, fahrenheit, show_algorithm, hide_adapter, hide_unknown;
+
+char degstr[5]; /* store the correct string to print degrees */
 
 void print_short_help(void)
@@ -245 +247 @@
 
   close_config_file();
+
+  /* build the degrees string */
+  sprintf(degstr, "%c", 176);
+  if (fahrenheit) {
+    strcat(degstr, "F");
+  } else {
+    strcat(degstr, "C");
+  }
 
   if(do_the_real_work(&error)) {