Changeset 5795

Timestamp:

11/04/09 20:11:41 (4 years ago)

Author:

andy

Message:

sensord: Evaluate return value of idChip()

Evaluate return value of idChip().

Some of the functions called from idChip() can fail which means
idChip() can return an error. Callers of idChip() should be aware of
this.

Files:

• lm-sensors/trunk/prog/sensord/sense.c (modified) (2 diffs)

lm-sensors/trunk/prog/sensord/sense.c

@@ -46 +46 @@
 static int idChip(const sensors_chip_name *chip)
 {
-        const char *adapter;
-
-        sensorLog(LOG_INFO, "Chip: %s", chipName(chip));
+        const char *name, *adapter;
+
+        name = chipName(chip);
+        if (!name) {
+                sensorLog(LOG_ERR, "Error getting chip name");
+                return -1;
+        }
+
+        sensorLog(LOG_INFO, "Chip: %s", name);
+
         adapter = sensors_get_adapter_name(&chip->bus);
-        if (adapter)
+        if (!adapter)
+                sensorLog(LOG_INFO, "Error getting adapter name");
+        else
                 sensorLog(LOG_INFO, "Adapter: %s", adapter);
 
@@ -152 +161 @@
         int i, ret = 0;
 
-        if (action == DO_READ)
+        if (action == DO_READ) {
                 ret = idChip(chip);
+                if (ret)
+                        return ret;
+        }
 
         for (i = 0; features[i].format; i++) {