mirror of
https://github.com/lm-sensors/lm-sensors.git
synced 2026-11-18 19:30:54 +00:00
Change the prototype of sensors_get_label(). Errors can be reported
with a NULL pointer. git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4694 7894878c-1315-0410-8ee3-d5d059ff63e0
This commit is contained in:
1 parent
12655c1d85
commit
8bcdc331a0
8 files changed
+29
-38
No files matched your search
+1
-1
@@ -163,7 +163,7 @@ applyToFeatures
|
||||
} else if (getRawLabel (chip, labelNumber, &rawLabel)) {
|
||||
sensorLog (LOG_ERR, "Error getting raw sensor label: %s/#%d", chip->prefix, labelNumber);
|
||||
ret = -1;
|
||||
} else if (getLabel (chip, labelNumber, &label)) {
|
||||
} else if (!(label = sensors_get_label (chip, labelNumber))) {
|
||||
sensorLog (LOG_ERR, "Error getting sensor label: %s/#%d", chip->prefix, labelNumber);
|
||||
ret = -1;
|
||||
} else if (valid) {
|
||||
|
||||
+2
-10
@@ -45,14 +45,6 @@ getValid
|
||||
return err;
|
||||
}
|
||||
|
||||
int
|
||||
getLabel
|
||||
(const sensors_chip_name *name, int feature, char **label) {
|
||||
int err;
|
||||
err = sensors_get_label (name, feature, label);
|
||||
return err;
|
||||
}
|
||||
|
||||
int
|
||||
getRawLabel
|
||||
(const sensors_chip_name *name, int feature, const char **label) {
|
||||
@@ -109,7 +101,7 @@ readUnknownChip
|
||||
if (getValid (chip, sensor->number, &valid)) {
|
||||
sensorLog (LOG_ERR, "Error getting sensor validity: %s/%s", chip->prefix, sensor->name);
|
||||
ret = 20;
|
||||
} else if (getLabel (chip, sensor->number, &label)) {
|
||||
} else 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 (!valid) {
|
||||
@@ -169,7 +161,7 @@ doKnownChip
|
||||
} else if (getValid (chip, labelNumber, &valid)) {
|
||||
sensorLog (LOG_ERR, "Error getting sensor validity: %s/#%d", chip->prefix, labelNumber);
|
||||
ret = 22;
|
||||
} else if (getLabel (chip, labelNumber, &label)) {
|
||||
} else if (!(label = sensors_get_label (chip, labelNumber))) {
|
||||
sensorLog (LOG_ERR, "Error getting sensor label: %s/#%d", chip->prefix, labelNumber);
|
||||
ret = 22;
|
||||
} else if (valid) {
|
||||
|
||||
@@ -59,7 +59,6 @@ extern int unloadLib (void);
|
||||
/* from sense.c */
|
||||
|
||||
extern int getValid (const sensors_chip_name *name, int feature, int *valid);
|
||||
extern int getLabel (const sensors_chip_name *name, int feature, char **label);
|
||||
extern int getRawLabel (const sensors_chip_name *name, int feature, const char **label);
|
||||
|
||||
extern int readChips (void);
|
||||
|
||||
@@ -91,7 +91,7 @@ void print_vid_info(const sensors_chip_name *name, int f_vid, int label_size)
|
||||
char *label;
|
||||
double vid;
|
||||
|
||||
if (!sensors_get_label(name, f_vid, &label)
|
||||
if ((label = sensors_get_label(name, f_vid))
|
||||
&& !sensors_get_feature(name, f_vid, &vid)) {
|
||||
print_label(label, label_size);
|
||||
printf("%+6.3f V\n", vid);
|
||||
@@ -108,7 +108,7 @@ void print_unknown_chip(const sensors_chip_name *name)
|
||||
|
||||
a = 0;
|
||||
while((data=sensors_get_all_features(name, &a))) {
|
||||
if (sensors_get_label(name, data->number, &label)) {
|
||||
if (!(label = sensors_get_label(name, data->number))) {
|
||||
printf("ERROR: Can't get feature `%s' data!\n",data->name);
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -69,7 +69,7 @@ static int sensors_get_label_size(const sensors_chip_name *name)
|
||||
|
||||
i = 0;
|
||||
while((iter = sensors_get_all_features(name, &i))) {
|
||||
if (!sensors_get_label(name, iter->number, &label) &&
|
||||
if ((label = sensors_get_label(name, iter->number)) &&
|
||||
strlen(label) > max_size)
|
||||
max_size = strlen(label);
|
||||
free(label);
|
||||
@@ -98,7 +98,7 @@ static void print_generic_chip_temp(const sensors_chip_name *name,
|
||||
short has_features[SENSORS_FEATURE_TEMP_SENS - SENSORS_FEATURE_TEMP] = {0, };
|
||||
double feature_vals[SENSORS_FEATURE_TEMP_SENS - SENSORS_FEATURE_TEMP] = {0.0, };
|
||||
|
||||
if (sensors_get_label(name, feature->number, &label)) {
|
||||
if (!(label = sensors_get_label(name, feature->number))) {
|
||||
printf("ERROR: Can't get temperature label!\n");
|
||||
return;
|
||||
}
|
||||
@@ -211,7 +211,7 @@ static void print_generic_chip_in(const sensors_chip_name *name,
|
||||
double val, alarm_max, alarm_min;
|
||||
char *label;
|
||||
|
||||
if (sensors_get_label(name, feature->number, &label)) {
|
||||
if (!(label = sensors_get_label(name, feature->number))) {
|
||||
printf("ERROR: Can't get in label!\n");
|
||||
return;
|
||||
}
|
||||
@@ -273,7 +273,7 @@ static void print_generic_chip_fan(const sensors_chip_name *name,
|
||||
double feature_vals[SENSORS_FEATURE_FAN_DIV - SENSORS_FEATURE_FAN] = {0.0, };
|
||||
double val;
|
||||
|
||||
if (sensors_get_label(name, feature->number, &label)) {
|
||||
if (!(label = sensors_get_label(name, feature->number))) {
|
||||
printf("ERROR: Can't get fan label!\n");
|
||||
return;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user