Changeset 945

Timestamp:

12/14/00 02:20:52 (12 years ago)

Author:

mds

Message:

(mds) print message if no sensors are found rather than just silently returning.

Location:

lm-sensors/trunk

Files:

• CHANGES (modified) (1 diff)
• prog/sensors/main.c (modified) (3 diffs)

lm-sensors/trunk/CHANGES

@@ -37 +37 @@
   Program sensors: Add ds1621, mtp008 support; add -f (Fahrenheit) option;
                    add adm1025 temp2; report temp limits correctly as
-                   min/max or limit/hysteresis
+                   min/max or limit/hysteresis; print message if no
+                   sensors are found.
   Program sensors-detect: Add ds1621, mtp008 detection;
                           add ServerWorks detection (no driver yet)

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

@@ -46 +46 @@
 static void do_a_print(sensors_chip_name name);
 static void do_a_set(sensors_chip_name name);
-static void do_the_real_work(void);
+static int do_the_real_work(void);
 static const char *sprintf_chip_name(sensors_chip_name name);
 
@@ -207 +207 @@
   }
 
-  do_the_real_work();
-  exit(0);
-}
-
-void do_the_real_work(void)
+  if(do_the_real_work()) {
+    exit(0);
+  } else {
+    if(chips[0].prefix == SENSORS_CHIP_NAME_PREFIX_ANY)
+            fprintf(stderr,"No sensors found!\n");
+    else
+            fprintf(stderr,"Specified sensor(s) not found!\n");
+    exit(1);
+  }
+}
+
+/* returns number of chips found */
+int do_the_real_work(void)
 {
   const sensors_chip_name *chip;
   int chip_nr,i;
+  int cnt = 0;
 
   for (chip_nr = 0; (chip = sensors_get_detected_chips(&chip_nr));)
@@ -224 +233 @@
           do_a_print(*chip);
         i = chips_count;
+        cnt++;
       }
+   return(cnt);
 }