Changeset 120

Timestamp:

12/25/98 23:15:48 (14 years ago)

Author:

frodo

Message:

Some library cleanup; no interface changes

Location:

lm-sensors/trunk/lib

Files:

• access.c (modified) (8 diffs)
• access.h (modified) (2 diffs)
• error.c (modified) (1 diff)
• proc.c (modified) (6 diffs)

lm-sensors/trunk/lib/access.c

@@ -59 +59 @@
    you want the match that was latest in the config file. */
 sensors_chip *sensors_for_all_config_chips(sensors_chip_name chip_name, 
-                                           sensors_chip *last)
+                                           const sensors_chip *last)
 {
   int nr,i;
@@ -78 +78 @@
    Do not modify the struct the return value points to! Returns NULL if 
    not found.*/
-sensors_chip_feature *sensors_lookup_feature_nr(const char *prefix, int feature)
+const sensors_chip_feature *sensors_lookup_feature_nr(const char *prefix, 
+                                                      int feature)
 {
   int i,j;
-  sensors_chip_feature *features;
+  const sensors_chip_feature *features;
   for (i = 0; sensors_chip_features_list[i].prefix; i++)
     if (!strcmp(sensors_chip_features_list[i].prefix,prefix)) {
@@ -95 +96 @@
    Do not modify the struct the return value points to! Returns NULL if 
    not found.*/
-sensors_chip_feature *sensors_lookup_feature_name(const char *prefix,
-                                                  const char *feature)
+const sensors_chip_feature *sensors_lookup_feature_name(const char *prefix,
+                                                        const char *feature)
 {
   int i,j;
-  sensors_chip_feature *features;
+  const sensors_chip_feature *features;
   for (i = 0; sensors_chip_features_list[i].prefix; i++)
     if (!strcmp(sensors_chip_features_list[i].prefix,prefix)) {
@@ -130 +131 @@
 int sensors_get_label(sensors_chip_name name, int feature, char **result)
 {
-  sensors_chip *chip;
-  sensors_chip_feature *featureptr;
+  const sensors_chip *chip;
+  const sensors_chip_feature *featureptr;
   int i;
 
@@ -152 +153 @@
 /* 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.  */
+   on failure. */
 int sensors_get_feature(sensors_chip_name name, int feature, double *result)
 {
-  sensors_chip_feature *main_feature;
-  sensors_chip_feature *alt_feature;
-  sensors_chip *chip;
-  sensors_expr *expr = NULL;
+  const sensors_chip_feature *main_feature;
+  const sensors_chip_feature *alt_feature;
+  const sensors_chip *chip;
+  const sensors_expr *expr = NULL;
   double val;
   int res,i;
@@ -195 +196 @@
 /* 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.  */
+   on failure. BUGGY! */
 int sensors_set_feature(sensors_chip_name name, int feature, double value)
 {
-  sensors_chip_feature *featureptr;
-  sensors_chip *chip;
-  sensors_expr *expr = NULL;
+  const sensors_chip_feature *featureptr;
+  const sensors_chip *chip;
+  const sensors_expr *expr = NULL;
   int i,res;
 
@@ -281 +282 @@
 }
 
-int sensors_eval_expr(sensors_chip_name chipname, sensors_expr *expr,
+int sensors_eval_expr(sensors_chip_name chipname, const sensors_expr *expr,
                       double val, double *result)
 {
   double res1,res2;
   int res;
-  sensors_chip_feature *feature;
+  const sensors_chip_feature *feature;
 
   if (expr->kind == sensors_kind_val) {
@@ -330 +331 @@
   return 0;
 }
-
-      

lm-sensors/trunk/lib/access.h

@@ -32 +32 @@
    you want the match that was latest in the config file. */
 extern sensors_chip *sensors_for_all_config_chips(sensors_chip_name chip_name,
-                                                  sensors_chip *last);
+                                                  const sensors_chip *last);
 
 /* Look up a resource in the intern chip list, and return a pointer to it.
    Do not modify the struct the return value points to! Returns NULL if
    not found. */
-extern sensors_chip_feature *sensors_lookup_feature_nr(const char *prefix,
-                                                       int feature);
+extern const sensors_chip_feature *sensors_lookup_feature_nr(const char *prefix,
+                                                             int feature);
 
 /* Look up a resource in the intern chip list, and return a pointer to it.
    Do not modify the struct the return value points to! Returns NULL if
    not found.*/
-extern sensors_chip_feature *sensors_lookup_feature_name(const char *prefix,
-                                                         const char *feature);
+extern const sensors_chip_feature *sensors_lookup_feature_name
+                                  (const char *prefix, const char *feature);
 
 /* Substitute configuration bus numbers with real-world /proc bus numbers
@@ -56 +56 @@
 
 /* Evaluate an expression */
-extern int sensors_eval_expr(sensors_chip_name chipname, sensors_expr *expr,
+extern int sensors_eval_expr(sensors_chip_name chipname, 
+                             const sensors_expr *expr,
                              double val, double *result);
 

lm-sensors/trunk/lib/error.c

@@ -53 +53 @@
 void sensors_default_parse_error(const char *err, int lineno)
 {
-  fprintf(stderr,"Line %d: %s\n",lineno,err);
+  fprintf(stderr,"Error: Line %d: %s\n",lineno,err);
 }
 

lm-sensors/trunk/lib/proc.c

@@ -68 +68 @@
   char *bufptr = buf;
   sensors_proc_chips_entry entry;
-  int res;
+  int res,lineno;
 
   if (sysctl(name, 3, bufptr, &buflen, NULL, 0))
     return -SENSORS_ERR_PROC;
 
+  lineno = 1;
   while (buflen >= sizeof(struct sensors_chips_data)) {
     if ((res = 
           sensors_parse_chip_name(((struct sensors_chips_data *) bufptr)->name, 
-                                   &entry.name)))
+                                   &entry.name))) {
+      sensors_parse_error("Parsing /proc/sys/dev/sensors/chips",lineno);
       return res;
+    }
     entry.sysctl = ((struct sensors_chips_data *) bufptr)->sysctl_id;
     add_proc_chips(&entry);
     bufptr += sizeof(struct sensors_chips_data);
     buflen -= sizeof(struct sensors_chips_data);
+    lineno++;
   }
   return 0;
@@ -92 +96 @@
   char *border;
   sensors_bus entry;
+  int lineno;
+
   f = fopen("/proc/bus/i2c","r");
   if (!f)
     return -SENSORS_ERR_PROC;
+  lineno=1;
   while (fgets(line,255,f)) {
     if (strlen(line) > 0)
@@ -118 +125 @@
     sensors_strip_of_spaces(entry.adapter);
     add_bus(&entry);
+    lineno++;
   }
   fclose(f);
@@ -124 +132 @@
   sensors_fatal_error("sensors_read_proc_bus","Allocating entry");
 ERROR:
+  sensors_parse_error("Parsing /proc/bus/i2c",lineno);
   fclose(f);
   return -SENSORS_ERR_PROC;
@@ -143 +152 @@
 {
   int sysctl_name[4] = { CTL_DEV, DEV_SENSORS };
-  sensors_chip_feature *the_feature;
+  const sensors_chip_feature *the_feature;
   int buflen = BUF_LEN;
   int mag;
@@ -165 +174 @@
 {
   int sysctl_name[4] = { CTL_DEV, DEV_SENSORS };
-  sensors_chip_feature *the_feature;
+  const sensors_chip_feature *the_feature;
   int buflen = BUF_LEN;
   int mag;