Changeset 3091

Timestamp:

09/18/05 20:30:16 (8 years ago)

Author:

mmh

Message:

(mmh)
This patch moves two macros from lib/proc.c to lib/data.h. The macros
pick up the "sensors_" prefix along the way. The motivation is the
same as the previous patch.

Location:

lm-sensors/trunk/lib

Files:

• data.h (modified) (1 diff)
• proc.c (modified) (5 diffs)

lm-sensors/trunk/lib/data.h

@@ -183 +183 @@
 extern int sensors_proc_chips_max;
 
+#define sensors_add_proc_chips(el) sensors_add_array_el( \
+        (el), &sensors_proc_chips, &sensors_proc_chips_count,\
+        &sensors_proc_chips_max, sizeof(struct sensors_proc_chips_entry))
+
 extern sensors_bus *sensors_proc_bus;
 extern int sensors_proc_bus_count;
 extern int sensors_proc_bus_max;
 
+#define sensors_add_proc_bus(el) sensors_add_array_el( \
+        (el), &sensors_proc_bus, &sensors_proc_bus_count,\
+        &sensors_proc_bus_max, sizeof(struct sensors_bus))
+
 extern sensors_chip_features sensors_chip_features_list[];
 

lm-sensors/trunk/lib/proc.c

@@ -46 +46 @@
 char sysfsmount[NAME_MAX];
 
-#define add_proc_chips(el) sensors_add_array_el(el,\
-                                       &sensors_proc_chips,\
-                                       &sensors_proc_chips_count,\
-                                       &sensors_proc_chips_max,\
-                                       sizeof(struct sensors_proc_chips_entry))
-
-#define add_proc_bus(el) sensors_add_array_el(el,\
-                                       &sensors_proc_bus,\
-                                       &sensors_proc_bus_count,\
-                                       &sensors_proc_bus_max,\
-                                       sizeof(struct sensors_bus))
-
 static int getsysname(const sensors_chip_feature *feature, char *sysname,
         int *sysmag, char *altsysname);
@@ -106 +94 @@
         }
 
-        add_proc_chips(&entry);
+        sensors_add_proc_chips(&entry);
         
         return 1;
@@ -235 +223 @@
     }
     entry.sysctl = ((struct i2c_chips_data *) bufptr)->sysctl_id;
-    add_proc_chips(&entry);
+    sensors_add_proc_chips(&entry);
     bufptr += sizeof(struct i2c_chips_data);
     buflen -= sizeof(struct i2c_chips_data);
@@ -292 +280 @@
                                 if (entry.algorithm == NULL)
                                         goto FAT_ERROR_SYS;
-                                add_proc_bus(&entry);
+                                sensors_add_proc_bus(&entry);
                         }
                 }
@@ -331 +319 @@
     sensors_strip_of_spaces(entry.algorithm);
     sensors_strip_of_spaces(entry.adapter);
-    add_proc_bus(&entry);
+    sensors_add_proc_bus(&entry);
     lineno++;
   }