With the new dynamic chip features enumeration code, the sensors_proc_chips

and sensors_chip_features_list arrays tend to track the same information.
So it's much more simple, and more efficient, to have a single array. I
decided to keep sensors_proc_chips, because it already has memory management
helpers. One nice side effect is that the arbitrary limit to the number of
supported chips is now gone. Another one is that some of the memory leaks
were fixed.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4510 7894878c-1315-0410-8ee3-d5d059ff63e0

1 files changed, 2 insertions, 7 deletions

diff --git a/lib/data.h b/lib/data.h
index b6ad36fe..799feddc 100644
--- a/lib/data.h
+++ b/lib/data.h
@@ -159,13 +159,13 @@ extern sensors_bus *sensors_config_busses;
 extern int sensors_config_busses_count;
 extern int sensors_config_busses_max;
 
-extern sensors_chip_name *sensors_proc_chips;
+extern sensors_chip_features *sensors_proc_chips;
 extern int sensors_proc_chips_count;
 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_chip_name))
+	&sensors_proc_chips_max, sizeof(struct sensors_chip_features))
 
 extern sensors_bus *sensors_proc_bus;
 extern int sensors_proc_bus_count;
@@ -175,9 +175,4 @@ extern int sensors_proc_bus_max;
 	(el), &sensors_proc_bus, &sensors_proc_bus_count,\
 	&sensors_proc_bus_max, sizeof(struct sensors_bus))
 
-extern sensors_chip_features sensors_chip_features_list[];
-
-/* this should match the total number of elements in PLACEHOLDER_ELEMENTS */
-#define N_PLACEHOLDER_ELEMENTS 10
-
 #endif /* def LIB_SENSORS_DATA_H */