wt/lm-sensors
1
0 Fork 0
mirror of https://github.com/lm-sensors/lm-sensors.git synced 2026-11-01 13:20:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

We no longer need sensors_get_label_and_valid(), as it does hardly

Browse Source 
more than sensors_get_label(). This allows for some cleanups.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4645 7894878c-1315-0410-8ee3-d5d059ff63e0
This commit is contained in:
Jean Delvare committed 2007-07-24 08:21:23 +00:00
1 parent e9c8c5fb06
commit 9896986247
3 files changed
+15 -42
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

prog/sensors/chips.c
+5 -19
View File
@@ -86,46 +86,32 @@ void print_label(const char *label, int space)
printf("%s:%*s", label, space - len, "");
}
int sensors_get_label_and_valid(sensors_chip_name name, int feature, char **label,
int *valid)
{
int err;
err = sensors_get_label(name,feature,label);
*valid = !err;
return err;
}
void print_vid_info(const sensors_chip_name *name, int f_vid, int label_size)
{
char *label;
int valid;
double vid;
if (!sensors_get_label_and_valid(*name,f_vid,&label,&valid)
if (!sensors_get_label(*name, f_vid, &label)
&& !sensors_get_feature(*name,f_vid,&vid) ) {
if (valid) {
print_label(label, label_size);
printf("%+6.3f V\n", vid);
}
print_label(label, label_size);
printf("%+6.3f V\n", vid);
}
free(label);
}
void print_unknown_chip(const sensors_chip_name *name)
{
int a, valid;
int a;
const sensors_feature_data *data;
char *label;
double val;
a = 0;
while((data=sensors_get_all_features(*name, &a))) {
if (sensors_get_label_and_valid(*name,data->number,&label,&valid)) {
if (sensors_get_label(*name, data->number, &label)) {
printf("ERROR: Can't get feature `%s' data!\n",data->name);
continue;
}
if (! valid)
continue;
if (data->mode & SENSORS_MODE_R) {
if(sensors_get_feature(*name,data->number,&val)) {
printf("ERROR: Can't get feature `%s' data!\n",data->name);
prog/sensors/chips.h
-2
View File
@@ -38,6 +38,4 @@ void print_vid_info(const sensors_chip_name *name, int f_vid, int label_size);
void print_label(const char *label, int space);
int sensors_get_label_and_valid(sensors_chip_name name, int feature, char **label,
int *valid);
#endif /* def PROG_SENSORS_CHIPS_H */
prog/sensors/chips_generic.c
+10 -21
View File
@@ -62,15 +62,15 @@ static void sensors_get_available_features(const sensors_chip_name *name,
static int sensors_get_label_size(const sensors_chip_name *name)
{
int i, valid;
int i;
const sensors_feature_data *iter;
char *label;
unsigned int max_size = 11; /* Initialised to 11 as minumum label-width */
i = 0;
while((iter = sensors_get_all_features(*name, &i))) {
if (!sensors_get_label_and_valid(*name, iter->number, &label, &valid) &&
valid && strlen(label) > max_size)
if (!sensors_get_label(*name, iter->number, &label) &&
strlen(label) > max_size)
max_size = strlen(label);
free(label);
}
@@ -93,18 +93,15 @@ static void print_generic_chip_temp(const sensors_chip_name *name,
{
double val, max, min;
char *label;
int valid, type;
int type;
const int size = SENSORS_FEATURE_TEMP_SENS - SENSORS_FEATURE_TEMP;
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_and_valid(*name, feature->number, &label, &valid)) {
if (sensors_get_label(*name, feature->number, &label)) {
free(label);
printf("ERROR: Can't get temperature data!\n");
printf("ERROR: Can't get temperature label!\n");
return;
} else if (!valid) {
free(label);
return; /* ignored */
}
if (get_feature_value(name, feature, &val)) {
@@ -210,19 +207,15 @@ static void print_generic_chip_in(const sensors_chip_name *name,
int i, int label_size)
{
const int size = SENSORS_FEATURE_IN_MAX_ALARM - SENSORS_FEATURE_IN;
int valid;
short has_features[SENSORS_FEATURE_IN_MAX_ALARM - SENSORS_FEATURE_IN] = {0, };
double feature_vals[SENSORS_FEATURE_IN_MAX_ALARM - SENSORS_FEATURE_IN] = {0.0, };
double val, alarm_max, alarm_min;
char *label;
if (sensors_get_label_and_valid(*name, feature->number, &label, &valid)) {
if (sensors_get_label(*name, feature->number, &label)) {
free(label);
printf("ERROR: Can't get in data!\n");
printf("ERROR: Can't get in label!\n");
return;
} else if (!valid) {
free(label);
return; /* ignored */
}
if (get_feature_value(name, feature, &val)) {
@@ -277,19 +270,15 @@ static void print_generic_chip_fan(const sensors_chip_name *name,
int i, int label_size)
{
char *label;
int valid;
const int size = SENSORS_FEATURE_FAN_DIV - SENSORS_FEATURE_FAN;
short has_features[SENSORS_FEATURE_FAN_DIV - SENSORS_FEATURE_FAN] = {0, };
double feature_vals[SENSORS_FEATURE_FAN_DIV - SENSORS_FEATURE_FAN] = {0.0, };
double val;
if (sensors_get_label_and_valid(*name, feature->number, &label, &valid)) {
printf("ERROR: Can't get fan data!\n");
if (sensors_get_label(*name, feature->number, &label)) {
printf("ERROR: Can't get fan label!\n");
free(label);
return;
} else if (!valid) {
free(label);
return; /* ignored */
}
if (get_feature_value(name, feature, &val))