Changeset 4336

Timestamp:

03/03/07 16:07:00 (6 years ago)

Author:

khali

Message:

Warning fixes.

Files:

• lm-sensors/trunk/prog/sensors/chips.c (modified) (8 diffs)

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

@@ -2897 +2897 @@
   char *label;
   int i, valid, num_in;
-  double cur, min, div, max, alarm, over, hyst;
+  double cur, min, fdiv, max, alarm, over, hyst;
 
   if (!strcmp(name->prefix, "w83627dhg"))
@@ -2930 +2930 @@
         print_label(label,10);
         printf("%4.0f RPM  (min = %4.0f RPM", cur, min);
-        if (!sensors_get_feature(*name, SENSORS_W83627EHF_FAN1_DIV+i, &div))
-          printf(", div = %1.0f", div);
+        if (!sensors_get_feature(*name, SENSORS_W83627EHF_FAN1_DIV+i, &fdiv))
+          printf(", div = %1.0f", fdiv);
         printf(")");
         if (!sensors_get_feature(*name, SENSORS_W83627EHF_FAN1_ALARM+i,
@@ -4594 +4594 @@
 {
   char *label;
-  double cur, min, div;
+  double cur, min, fdiv;
   int alarms, valid, i;
   int is_m2 = !strcmp(name->prefix, "smsc47m2");
@@ -4608 +4608 @@
     if (!sensors_get_label_and_valid(*name, SENSORS_SMSC47M1_FAN1+i, &label, &valid)
      && !sensors_get_feature(*name, SENSORS_SMSC47M1_FAN1+i, &cur)
-     && !sensors_get_feature(*name, SENSORS_SMSC47M1_FAN1_DIV+i, &div)
+     && !sensors_get_feature(*name, SENSORS_SMSC47M1_FAN1_DIV+i, &fdiv)
      && !sensors_get_feature(*name, SENSORS_SMSC47M1_FAN1_MIN+i, &min)) {
       if (valid) {
         print_label(label, 10);
         printf("%4.0f RPM  (min = %4.0f RPM, div = %1.0f)          %s\n",
-               cur, min, div, alarms&(SMSC47M1_ALARM_FAN1<<i) ?
+               cur, min, fdiv, alarms&(SMSC47M1_ALARM_FAN1<<i) ?
                "ALARM" : "");
       }
@@ -5544 +5544 @@
 {
   char *label;
-  double cur, high, low, crit, div;
+  double cur, high, low, crit, fdiv;
   int valid, alarms, i;
   int is_1031 = !strncmp("adm1031", name->prefix, 7);
@@ -5560 +5560 @@
           && !sensors_get_feature(*name, SENSORS_ADM1031_FAN1+i*10, &cur)
           && !sensors_get_feature(*name, SENSORS_ADM1031_FAN1_MIN+i*10, &low)
-          && !sensors_get_feature(*name, SENSORS_ADM1031_FAN1_DIV+i*10, &div)) {
+          && !sensors_get_feature(*name, SENSORS_ADM1031_FAN1_DIV+i*10, &fdiv)) {
           if (valid) {
               print_label(label, 10);
-              printf("%4.0f RPM  (min = %4.0f RPM, div = %1.0f)", cur, low, div);
+              printf("%4.0f RPM  (min = %4.0f RPM, div = %1.0f)", cur, low, fdiv);
               printf(" %s\n",
                      alarms&(ADM1031_ALARM_FAN1_FLT<<(i*8))?"FAULT":
@@ -5742 +5742 @@
   {
     int tag;
-    char *name;
+    const char *name;
   }
   tach_list[] =
@@ -5819 +5819 @@
 {
   char *label;
-  double cur, div, min;
+  double cur, fdiv, min;
   int valid;
 
   if (!sensors_get_label_and_valid(*name,fan,&label,&valid) &&
       !sensors_get_feature(*name,fan,&cur) &&
-      !sensors_get_feature(*name,fan_div,&div) &&
+      !sensors_get_feature(*name,fan_div, &fdiv) &&
       !sensors_get_feature(*name,fan_min,&min)) {
     if (valid) {
       print_label(label,10);
       printf("%4.0f RPM  (min = %4.0f RPM, div = %1.0f)              %s\n",
-           cur, min, div, alarm ? "ALARM" : "");
+           cur, min, fdiv, alarm ? "ALARM" : "");
     }
   } else