libsensors: Free bus statements sooner
PATCH 2/4 libsensors: Free bus statements sooner
Free bus statements from the configuration file as soon as we are done with them.
--- lib/init.c | 47 +++++++++++++++++++++++++++++------------------ 1 file changed, 29 insertions(+), 18 deletions(-)
lib/init.c +29 -18
@@ -61,18 +61,42 @@ static int sensors_parse(void)return res; } +static void free_bus (sensors_bus *bus) +{ +free (bus->adapter); +} + +static void free_config_busses (void ) +{ +int i; + +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 ; +} +static int parse_config (FILE *input) {int err; -if (sensors_scanner_init (input)) -return -SENSORS_ERR_PARSE ; +if (sensors_scanner_init (input)) { + err = -SENSORS_ERR_PARSE ; + goto exit_cleanup; + } err =sensors_parse ();sensors_scanner_exit (); -if (err) -return -SENSORS_ERR_PARSE ; +if (err) { + err = -SENSORS_ERR_PARSE ; + goto exit_cleanup; + } -return 0 ; + err =sensors_substitute_busses (); + +exit_cleanup: +free_config_busses (); +return err; }int sensors_init (FILE *input)
@@ -102,8 +126,6 @@ int sensors_init(FILE *input) } } -if ((res =sensors_substitute_busses ())) - goto exit_cleanup;return 0 ; exit_cleanup:
@@ -129,11 +151,6 @@ static void free_chip_features(sensors_cfree (features->feature); } -static void free_bus (sensors_bus *bus) -{ -free (bus->adapter); -} -static void free_label (sensors_label *label) {free (label->name);
@@ -213,12 +230,6 @@ void sensors_cleanup(void) 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);
Signature · 6 lines
Jean Delvare _______________________________________________ lm-sensors mailing list [email protected] http://lists.lm-sensors.org/mailman/listinfo/lm-sensors