Reorder functions so that forward declarations are no longer needed.

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

1 files changed, 67 insertions, 77 deletions

diff --git a/lib/init.c b/lib/init.c
index bf7137c1..c2149227 100644
--- a/lib/init.c
+++ b/lib/init.c
@@ -27,16 +27,6 @@
 #include "sysfs.h"
 #include "scanner.h"
 
-static void free_chip_name(sensors_chip_name *name);
-static void free_chip_features(sensors_chip_feature *features);
-static void free_bus(sensors_bus *bus);
-static void free_chip(sensors_chip *chip);
-static void free_label(sensors_label *label);
-static void free_set(sensors_set *set);
-static void free_compute(sensors_compute *compute);
-static void free_ignore(sensors_ignore *ignore);
-static void free_expr(sensors_expr *expr);
-
 int sensors_init(FILE *input)
 {
 	int res;
@@ -55,46 +45,13 @@ int sensors_init(FILE *input)
 	return 0;
 }
 
-void sensors_cleanup(void)
-{
-	int i;
-
-	sensors_scanner_exit();
-
-	for (i = 0; i < sensors_proc_chips_count; i++) {
-		free_chip_name(&sensors_proc_chips[i].chip);
-		free_chip_features(sensors_proc_chips[i].feature);
-	}
-	free(sensors_proc_chips);
-	sensors_proc_chips = NULL;
-	sensors_proc_chips_count = sensors_proc_chips_max = 0;
-
-	for (i = 0; i < sensors_config_busses_count; i++)
-		free_bus(&sensors_config_busses[i]);
-	free(sensors_config_busses);
-	sensors_config_busses = NULL;
-	sensors_config_busses_count = sensors_config_busses_max = 0;
-
-	for (i = 0; i < sensors_config_chips_count; i++)
-		free_chip(&sensors_config_chips[i]);
-	free(sensors_config_chips);
-	sensors_config_chips = NULL;
-	sensors_config_chips_count = sensors_config_chips_max = 0;
-
-	for (i = 0; i < sensors_proc_bus_count; i++)
-		free_bus(&sensors_proc_bus[i]);
-	free(sensors_proc_bus);
-	sensors_proc_bus = NULL;
-	sensors_proc_bus_count = sensors_proc_bus_max = 0;
-}
-
-void free_chip_name(sensors_chip_name *name)
+static void free_chip_name(sensors_chip_name *name)
 {
 	free(name->prefix);
 	free(name->path);
 }
 
-void free_chip_features(sensors_chip_feature *features)
+static void free_chip_features(sensors_chip_feature *features)
 {
 	int i;
 
@@ -103,12 +60,49 @@ void free_chip_features(sensors_chip_feature *features)
 	free(features);
 }
 
-void free_bus(sensors_bus *bus)
+static void free_bus(sensors_bus *bus)
 {
 	free(bus->adapter);
 }
 
-void free_chip(sensors_chip *chip)
+static void free_label(sensors_label *label)
+{
+	free(label->name);
+	free(label->value);
+}
+
+static void free_expr(sensors_expr *expr)
+{
+	if (expr->kind == sensors_kind_var)
+		free(expr->data.var);
+	else if (expr->kind == sensors_kind_sub) {
+		if (expr->data.subexpr.sub1)
+			free_expr(expr->data.subexpr.sub1);
+		if (expr->data.subexpr.sub2)
+			free_expr(expr->data.subexpr.sub2);
+	}
+	free(expr);
+}
+
+static void free_set(sensors_set *set)
+{
+	free(set->name);
+	free_expr(set->value);
+}
+
+static void free_compute(sensors_compute *compute)
+{
+	free(compute->name);
+	free_expr(compute->from_proc);
+	free_expr(compute->to_proc);
+}
+
+static void free_ignore(sensors_ignore *ignore)
+{
+	free(ignore->name);
+}
+
+static void free_chip(sensors_chip *chip)
 {
 	int i;
 
@@ -138,39 +132,35 @@ void free_chip(sensors_chip *chip)
 	chip->ignores_count = chip->ignores_max = 0;
 }
 
-void free_label(sensors_label *label)
+void sensors_cleanup(void)
 {
-	free(label->name);
-	free(label->value);
-}
+	int i;
 
-void free_set(sensors_set *set)
-{
-	free(set->name);
-	free_expr(set->value);
-}
+	sensors_scanner_exit();
 
-void free_compute(sensors_compute *compute)
-{
-	free(compute->name);
-	free_expr(compute->from_proc);
-	free_expr(compute->to_proc);
-}
+	for (i = 0; i < sensors_proc_chips_count; i++) {
+		free_chip_name(&sensors_proc_chips[i].chip);
+		free_chip_features(sensors_proc_chips[i].feature);
+	}
+	free(sensors_proc_chips);
+	sensors_proc_chips = NULL;
+	sensors_proc_chips_count = sensors_proc_chips_max = 0;
 
-void free_ignore(sensors_ignore *ignore)
-{
-	free(ignore->name);
-}
+	for (i = 0; i < sensors_config_busses_count; i++)
+		free_bus(&sensors_config_busses[i]);
+	free(sensors_config_busses);
+	sensors_config_busses = NULL;
+	sensors_config_busses_count = sensors_config_busses_max = 0;
 
-void free_expr(sensors_expr *expr)
-{
-	if ((expr->kind) == sensors_kind_var)
-		free(expr->data.var);
-	else if ((expr->kind) == sensors_kind_sub) {
-		if (expr->data.subexpr.sub1)
-			free_expr(expr->data.subexpr.sub1);
-		if (expr->data.subexpr.sub2)
-			free_expr(expr->data.subexpr.sub2);
-	}
-	free(expr);
+	for (i = 0; i < sensors_config_chips_count; i++)
+		free_chip(&sensors_config_chips[i]);
+	free(sensors_config_chips);
+	sensors_config_chips = NULL;
+	sensors_config_chips_count = sensors_config_chips_max = 0;
+
+	for (i = 0; i < sensors_proc_bus_count; i++)
+		free_bus(&sensors_proc_bus[i]);
+	free(sensors_proc_bus);
+	sensors_proc_bus = NULL;
+	sensors_proc_bus_count = sensors_proc_bus_max = 0;
 }