From afddd2555290f2a3a05046dbbf774057ef2c527d Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Wed, 19 Sep 2007 15:16:14 +0000 Subject: [PATCH] Drop support for printing unknown chips: all chips are known now. git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4819 7894878c-1315-0410-8ee3-d5d059ff63e0 --- prog/sensord/sense.c | 34 +--------------------------------- 1 file changed, 1 insertion(+), 33 deletions(-) diff --git a/prog/sensord/sense.c b/prog/sensord/sense.c index a21c75d1..5f569447 100644 --- a/prog/sensord/sense.c +++ b/prog/sensord/sense.c @@ -72,37 +72,6 @@ idChip return 0; } -static int -readUnknownChip -(const sensors_chip_name *chip) { - const sensors_feature_data *sensor; - int index0 = 0; - int ret = 0; - - ret = idChip (chip); - - while ((ret == 0) && ((sensor = sensors_get_all_features (chip, &index0)) != NULL)) { - char *label = NULL; - double value; - - if (!(label = sensors_get_label (chip, sensor->number))) { - sensorLog (LOG_ERR, "Error getting sensor label: %s/%s", chip->prefix, sensor->name); - ret = 21; - } else if (!(sensor->flags & SENSORS_MODE_R)) { - sensorLog (LOG_INFO, "%s: %s", sensor->name, label); - } else if ((ret = sensors_get_value (chip, sensor->number, &value))) { - sensorLog (LOG_ERR, "Error getting sensor data: %s/%s: %s", chip->prefix, sensor->name, sensors_strerror (ret)); - ret = 22; - } else { - sensorLog (LOG_INFO, " %s%s: %.2f", (sensor->mapping == SENSORS_NO_MAPPING) ? "" : "-", label, value); - } - if (label) - free (label); - } - - return ret; -} - static int doKnownChip (const sensors_chip_name *chip, const ChipDescriptor *descriptor, int action) { @@ -203,8 +172,7 @@ doChip ret = doKnownChip (chip, descriptor, action); free (descriptor->features); free (descriptor); - } else if (action == DO_READ) - ret = readUnknownChip (chip); + } } return ret; }