Changeset 4695

Timestamp:

08/22/07 19:06:13 (6 years ago)

Author:

khali

Message:

sensors_get_value() and sensors_set_value(), respectively.
The new names better reflect what the functions do.

Location:

lm-sensors/branches/lm-sensors-3.0.0

Files:

• lib/access.c (modified) (4 diffs)
• lib/libsensors.3 (modified) (2 diffs)
• lib/sensors.h (modified) (1 diff)
• prog/sensord/sense.c (modified) (4 diffs)
• prog/sensors/chips.c (modified) (2 diffs)
• prog/sensors/chips_generic.c (modified) (1 diff)

lm-sensors/branches/lm-sensors-3.0.0/lib/access.c

@@ -217 +217 @@
    contain wildcard values! This function will return 0 on success, and <0
    on failure. */
-int sensors_get_feature(const sensors_chip_name *name, int feature,
-                        double *result)
+int sensors_get_value(const sensors_chip_name *name, int feature,
+                      double *result)
 {
         const sensors_chip_feature *main_feature;
@@ -262 +262 @@
    contain wildcard values! This function will return 0 on success, and <0
    on failure. */
-int sensors_set_feature(const sensors_chip_name *name, int feature,
-                        double value)
+int sensors_set_value(const sensors_chip_name *name, int feature,
+                      double value)
 {
         const sensors_chip_feature *main_feature;
@@ -378 +378 @@
                                                             expr->data.var)))
                         return SENSORS_ERR_NO_ENTRY;
-                if (!(res = sensors_get_feature(name, feature->data.number, result)))
+                if (!(res = sensors_get_value(name, feature->data.number, result)))
                         return res;
                 return 0;
@@ -462 +462 @@
                                 continue;
                         }
-                        if ((res = sensors_set_feature(name, feature_nr, value))) {
+                        if ((res = sensors_set_value(name, feature_nr, value))) {
                                 sensors_parse_error("Failed to set feature",
                                                 chip->sets[i].lineno);

lm-sensors/branches/lm-sensors-3.0.0/lib/libsensors.3

@@ -40 +40 @@
 .B const char *sensors_get_adapter_name(int bus_nr);
 .B char *sensors_get_label(const sensors_chip_name *name, int feature);\fP
-.B int sensors_get_feature(const sensors_chip_name *name, int feature,
-                        \fBdouble *result);\fP
-.B int sensors_set_feature(const sensors_chip_name *name, int feature,
-                        \fBdouble value);\fP
+.B int sensors_get_value(const sensors_chip_name *name, int feature,
+                      \fBdouble *value);\fP
+.B int sensors_set_value(const sensors_chip_name *name, int feature,
+                      \fBdouble value);\fP
 .B int sensors_do_chip_sets(const sensors_chip_name *name);
 .B const sensors_chip_name *sensors_get_detected_chips(int *nr);
@@ -85 +85 @@
 If no label exists for this feature, its name is returned itself.
 
-\fBint sensors_get_feature(const sensors_chip_name *name,
-                        int feature, double *result);\fP
+\fBint sensors_get_value(const sensors_chip_name *name,
+                      int feature, double *value);\fP
 .br
 Read the value of a feature of a certain chip. Note that chip should not contain wildcard values! This function will return 0 on success, and <0 on failure.
 
-\fBint sensors_set_feature(const sensors_chip_name *name,
-                        int feature, double value);\fP
+\fBint sensors_set_value(const sensors_chip_name *name,
+                      int feature, double value);\fP
 .br
 Set the value of a feature of a certain chip. Note that chip should not contain wildcard values! This function will return 0 on success, and <0 on failure.

lm-sensors/branches/lm-sensors-3.0.0/lib/sensors.h

@@ -97 +97 @@
    contain wildcard values! This function will return 0 on success, and <0
    on failure.  */
-int sensors_get_feature(const sensors_chip_name *name, int feature,
-                        double *result);
+int sensors_get_value(const sensors_chip_name *name, int feature,
+                      double *value);
 
 /* Set the value of a feature of a certain chip. Note that chip should not
    contain wildcard values! This function will return 0 on success, and <0
    on failure. */
-int sensors_set_feature(const sensors_chip_name *name, int feature,
-                        double value);
+int sensors_set_value(const sensors_chip_name *name, int feature,
+                      double value);
 
 /* Execute all set statements for this particular chip. The chip may contain

lm-sensors/branches/lm-sensors-3.0.0/prog/sensord/sense.c

@@ -109 +109 @@
     } else if (!(sensor->mode & SENSORS_MODE_R)) {
       sensorLog (LOG_INFO, "%s: %s", sensor->name, label);
-    } else if ((ret = sensors_get_feature (chip, sensor->number, &value))) {
+    } 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;
@@ -134 +134 @@
     ret = idChip (chip);
   if (!ret && descriptor->alarmNumber) {
-    if ((ret = sensors_get_feature (chip, descriptor->alarmNumber, &tmp))) {
+    if ((ret = sensors_get_value (chip, descriptor->alarmNumber, &tmp))) {
       sensorLog (LOG_ERR, "Error getting sensor data: %s/#%d: %s", chip->prefix, descriptor->alarmNumber, sensors_strerror (ret));
       ret = 20;
@@ -142 +142 @@
   }
   if (!ret && descriptor->beepNumber) {
-    if ((ret = sensors_get_feature (chip, descriptor->beepNumber, &tmp))) {
+    if ((ret = sensors_get_value (chip, descriptor->beepNumber, &tmp))) {
       sensorLog (LOG_ERR, "Error getting sensor data: %s/#%d: %s", chip->prefix, descriptor->beepNumber, sensors_strerror (ret));
       ret = 21;
@@ -169 +169 @@
 
       for (subindex = 0; !ret && (feature->dataNumbers[subindex] >= 0); ++ subindex) {
-        if ((ret = sensors_get_feature (chip, feature->dataNumbers[subindex], values + subindex))) {
+        if ((ret = sensors_get_value (chip, feature->dataNumbers[subindex], values + subindex))) {
           sensorLog (LOG_ERR, "Error getting sensor data: %s/#%d: %s", chip->prefix, feature->dataNumbers[subindex], sensors_strerror (ret));
           ret = 23;

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

@@ -93 +93 @@
 
   if ((label = sensors_get_label(name, f_vid))
-      && !sensors_get_feature(name, f_vid, &vid)) {
+      && !sensors_get_value(name, f_vid, &vid)) {
     print_label(label, label_size);
     printf("%+6.3f V\n", vid);
@@ -114 +114 @@
     }
     if (data->mode & SENSORS_MODE_R) {
-      if(sensors_get_feature(name, data->number, &val)) {
+      if (sensors_get_value(name, data->number, &val)) {
         printf("ERROR: Can't get feature `%s' data!\n",data->name);
         continue;

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

@@ -31 +31 @@
                              double *val)
 {
-  return sensors_get_feature(name, feature->number, val);
+  return sensors_get_value(name, feature->number, val);
 }