Changeset 4737

Timestamp:

08/31/07 17:09:26 (6 years ago)

Author:

khali

Message:

Reorder functions so that forward declarations are no longer needed.

Files:

• lm-sensors/branches/lm-sensors-3.0.0/lib/init.c (modified) (3 diffs)

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

@@ -28 +28 @@
 #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)
 {
@@ -54 +44 @@
                 return res;
         return 0;
+}
+
+static void free_chip_name(sensors_chip_name *name)
+{
+        free(name->prefix);
+        free(name->path);
+}
+
+static void free_chip_features(sensors_chip_feature *features)
+{
+        int i;
+
+        for (i = 0; features[i].data.name; i++)
+                free(features[i].data.name);
+        free(features);
+}
+
+static void free_bus(sensors_bus *bus)
+{
+        free(bus->adapter);
+}
+
+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;
+
+        for (i = 0; i < chip->chips.fits_count; i++)
+                free_chip_name(&chip->chips.fits[i]);
+        free(chip->chips.fits);
+        chip->chips.fits_count = chip->chips.fits_max = 0;
+
+        for (i = 0; i < chip->labels_count; i++)
+                free_label(&chip->labels[i]);
+        free(chip->labels);
+        chip->labels_count = chip->labels_max = 0;
+
+        for (i = 0; i < chip->sets_count; i++)
+                free_set(&chip->sets[i]);
+        free(chip->sets);
+        chip->sets_count = chip->sets_max = 0;
+
+        for (i = 0; i < chip->computes_count; i++)
+                free_compute(&chip->computes[i]);
+        free(chip->computes);
+        chip->computes_count = chip->computes_max = 0;
+
+        for (i = 0; i < chip->ignores_count; i++)
+                free_ignore(&chip->ignores[i]);
+        free(chip->ignores);
+        chip->ignores_count = chip->ignores_max = 0;
 }
 
@@ -88 +165 @@
         sensors_proc_bus_count = sensors_proc_bus_max = 0;
 }
-
-void free_chip_name(sensors_chip_name *name)
-{
-        free(name->prefix);
-        free(name->path);
-}
-
-void free_chip_features(sensors_chip_feature *features)
-{
-        int i;
-
-        for (i = 0; features[i].data.name; i++)
-                free(features[i].data.name);
-        free(features);
-}
-
-void free_bus(sensors_bus *bus)
-{
-        free(bus->adapter);
-}
-
-void free_chip(sensors_chip *chip)
-{
-        int i;
-
-        for (i = 0; i < chip->chips.fits_count; i++)
-                free_chip_name(&chip->chips.fits[i]);
-        free(chip->chips.fits);
-        chip->chips.fits_count = chip->chips.fits_max = 0;
-
-        for (i = 0; i < chip->labels_count; i++)
-                free_label(&chip->labels[i]);
-        free(chip->labels);
-        chip->labels_count = chip->labels_max = 0;
-
-        for (i = 0; i < chip->sets_count; i++)
-                free_set(&chip->sets[i]);
-        free(chip->sets);
-        chip->sets_count = chip->sets_max = 0;
-
-        for (i = 0; i < chip->computes_count; i++)
-                free_compute(&chip->computes[i]);
-        free(chip->computes);
-        chip->computes_count = chip->computes_max = 0;
-
-        for (i = 0; i < chip->ignores_count; i++)
-                free_ignore(&chip->ignores[i]);
-        free(chip->ignores);
-        chip->ignores_count = chip->ignores_max = 0;
-}
-
-void free_label(sensors_label *label)
-{
-        free(label->name);
-        free(label->value);
-}
-
-void free_set(sensors_set *set)
-{
-        free(set->name);
-        free_expr(set->value);
-}
-
-void free_compute(sensors_compute *compute)
-{
-        free(compute->name);
-        free_expr(compute->from_proc);
-        free_expr(compute->to_proc);
-}
-
-void free_ignore(sensors_ignore *ignore)
-{
-        free(ignore->name);
-}
-
-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);
-}