Changeset 4728 for lm-sensors/branches/lm-sensors-3.0.0/prog/sensors/chips.c

Timestamp:

08/26/07 23:26:20 (6 years ago)

Author:

khali

Message:

Remove "generic" from all printing function names. This is the default
mode now so no need to mention it explicitly.
Rename print_vid_info to print_chip_vid and move it around for
consistency.

Files:

• lm-sensors/branches/lm-sensors-3.0.0/prog/sensors/chips.c (modified) (6 diffs)

lm-sensors/branches/lm-sensors-3.0.0/prog/sensors/chips.c

@@ -68 +68 @@
 }
 
-static void print_vid_info(const sensors_chip_name *name, int f_vid,
-                           int label_size)
-{
-        char *label;
-        double vid;
-
-        if ((label = sensors_get_label(name, f_vid))
-         && !sensors_get_value(name, f_vid, &vid)) {
-                print_label(label, label_size);
-                printf("%+6.3f V\n", vid);
-        }
-        free(label);
-}
-
 static void sensors_get_available_features(const sensors_chip_name *name,
                                            const sensors_feature_data *feature,
@@ -151 +137 @@
 #define TEMP_FEATURE(x)         has_features[x - SENSORS_FEATURE_TEMP - 1]
 #define TEMP_FEATURE_VAL(x)     feature_vals[x - SENSORS_FEATURE_TEMP - 1]
-static void print_generic_chip_temp(const sensors_chip_name *name,
-                                    const sensors_feature_data *feature,
-                                    int i, int label_size)
+static void print_chip_temp(const sensors_chip_name *name,
+                            const sensors_feature_data *feature, int i,
+                            int label_size)
 {
         double val, limit1, limit2;
@@ -273 +259 @@
 #define IN_FEATURE(x)           has_features[x - SENSORS_FEATURE_IN - 1]
 #define IN_FEATURE_VAL(x)       feature_vals[x - SENSORS_FEATURE_IN - 1]
-static void print_generic_chip_in(const sensors_chip_name *name,
-                                  const sensors_feature_data *feature,
-                                  int i, int label_size)
+static void print_chip_in(const sensors_chip_name *name,
+                          const sensors_feature_data *feature, int i,
+                          int label_size)
 {
         const int size = SENSORS_FEATURE_IN_MAX_ALARM - SENSORS_FEATURE_IN;
@@ -338 +324 @@
 #define FAN_FEATURE(x)          has_features[x - SENSORS_FEATURE_FAN - 1]
 #define FAN_FEATURE_VAL(x)      feature_vals[x - SENSORS_FEATURE_FAN - 1]
-static void print_generic_chip_fan(const sensors_chip_name *name,
-                                   const sensors_feature_data *feature,
-                                   int i, int label_size)
+static void print_chip_fan(const sensors_chip_name *name,
+                           const sensors_feature_data *feature, int i,
+                           int label_size)
 {
         char *label;
@@ -391 +377 @@
 }
 
-void print_generic_chip(const sensors_chip_name *name)
+static void print_chip_vid(const sensors_chip_name *name, int f_vid,
+                           int label_size)
+{
+        char *label;
+        double vid;
+
+        if ((label = sensors_get_label(name, f_vid))
+         && !sensors_get_value(name, f_vid, &vid)) {
+                print_label(label, label_size);
+                printf("%+6.3f V\n", vid);
+        }
+        free(label);
+}
+
+void print_chip(const sensors_chip_name *name)
 {
         const sensors_feature_data *feature;
@@ -405 +405 @@
                 switch (feature->type) {
                 case SENSORS_FEATURE_TEMP:
-                        print_generic_chip_temp(name, feature, i, label_size);
+                        print_chip_temp(name, feature, i, label_size);
                         break;
                 case SENSORS_FEATURE_IN:
-                        print_generic_chip_in(name, feature, i, label_size);
+                        print_chip_in(name, feature, i, label_size);
                         break;
                 case SENSORS_FEATURE_FAN:
-                        print_generic_chip_fan(name, feature, i, label_size);
+                        print_chip_fan(name, feature, i, label_size);
                         break;
                 case SENSORS_FEATURE_VID:
-                        print_vid_info(name, feature->number, label_size);
+                        print_chip_vid(name, feature->number, label_size);
                         break;
                 default: