From 4a2b11867048187300f1c798ef516e97323a1b54 Mon Sep 17 00:00:00 2001
From: Andreas Gattringer <andreas.gattringer@univie.ac.at>
Date: Tue, 1 Aug 2023 13:57:34 +0200
Subject: [PATCH] code and memory clean-ups
---
src/cats/configuration/configuration.c | 2 ++
src/cats/configuration/load_configuration.c | 2 +-
src/cats/configuration/load_configuration_overlays.c | 1 +
src/cats/data/cats_global.c | 1 +
src/cats/lambda/lambda.c | 2 +-
5 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/cats/configuration/configuration.c b/src/cats/configuration/configuration.c
index 6d6fb2a..689e5b5 100644
--- a/src/cats/configuration/configuration.c
+++ b/src/cats/configuration/configuration.c
@@ -301,6 +301,8 @@ void cleanup_configuration(struct cats_configuration **conf_orig)
free(conf->global_stats.populated_by_classes);
free_string_array(&conf->output.needed_output_directories);
free_string_array(&conf->output.needed_module_output_directories);
+ free_string_array(&conf->overlays.registered_custom_overlay_names);
+
free(conf->param);
conf->param = NULL;
free(conf->run_name);
diff --git a/src/cats/configuration/load_configuration.c b/src/cats/configuration/load_configuration.c
index 8fa6900..a6f431c 100644
--- a/src/cats/configuration/load_configuration.c
+++ b/src/cats/configuration/load_configuration.c
@@ -84,7 +84,7 @@ load_configuration_from_file(const char *filename, const struct program_options
conf->command_line_options = *command_line_options;
if (command_line_options->need_conf) {
- conf->command_line_options.configuration_file = strdup(command_line_options->configuration_file);
+ //conf->command_line_options.configuration_file = strdup(command_line_options->configuration_file);
} else {
conf->command_line_options.configuration_file = strdup("auto-generated");
}
diff --git a/src/cats/configuration/load_configuration_overlays.c b/src/cats/configuration/load_configuration_overlays.c
index bbacc6f..b60962d 100644
--- a/src/cats/configuration/load_configuration_overlays.c
+++ b/src/cats/configuration/load_configuration_overlays.c
@@ -102,6 +102,7 @@ void load_overlay_configuration(struct cats_configuration *conf, struct cats_ini
exit(EXIT_FAILURE);
}
free(type_name);
+ free(overlay_name);
}
free_string_array(&overlay_names);
diff --git a/src/cats/data/cats_global.c b/src/cats/data/cats_global.c
index c18ad9e..c59722c 100644
--- a/src/cats/data/cats_global.c
+++ b/src/cats/data/cats_global.c
@@ -78,6 +78,7 @@ _Noreturn void exit_cats(int status)
exit(status);
+
}
diff --git a/src/cats/lambda/lambda.c b/src/cats/lambda/lambda.c
index cbd08c6..8c1e371 100644
--- a/src/cats/lambda/lambda.c
+++ b/src/cats/lambda/lambda.c
@@ -65,7 +65,7 @@ cats_dt_rates calculate_lambda(struct cats_configuration *conf, struct lambda_pa
//
double *matrix_copy = NULL;
- matrix_copy = copy_matrix(matrix, N, N);
+
if (silent == false || conf->command_line_options.debug_flags & DEBUG_LAMBDA) {
matrix_copy = copy_matrix(matrix, N, N);
--
GitLab