From b244aa30f274205c315199c7d1e518c9138fb80b Mon Sep 17 00:00:00 2001 From: Al Date: Thu, 4 Jun 2015 23:57:52 -0400 Subject: [PATCH] [numex] Setting numex_table to NULL during teardown, adding some logging --- src/numex.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/numex.c b/src/numex.c index fa4e5b71..dae23fb0 100644 --- a/src/numex.c +++ b/src/numex.c @@ -372,6 +372,7 @@ bool ordinal_indicator_write(ordinal_indicator_t *ordinal, FILE *f) { bool numex_table_read(FILE *f) { if (f == NULL) { + log_warn("FILE pointer was NULL in numex_table_read\n"); return false; } @@ -393,6 +394,8 @@ bool numex_table_read(FILE *f) { goto exit_numex_table_load_error; } + log_debug("read num_languages = %d\n", num_languages); + int i = 0; numex_language_t *language; @@ -404,12 +407,17 @@ bool numex_table_read(FILE *f) { } } + log_debug("read languages\n"); + + size_t num_rules; if (!file_read_uint64(f, (uint64_t *)&num_rules)) { goto exit_numex_table_load_error; } + log_debug("read num_rules = %zu\n", num_rules); + numex_rule_t rule; for (i = 0; i < num_rules; i++) { @@ -419,6 +427,8 @@ bool numex_table_read(FILE *f) { numex_rule_array_push(numex_table->rules, rule); } + log_debug("read rules\n"); + size_t num_ordinals; if (!file_read_uint64(f, (uint64_t *)&num_ordinals)) { @@ -440,6 +450,8 @@ bool numex_table_read(FILE *f) { goto exit_numex_table_load_error; } + log_debug("read trie\n"); + return true; exit_numex_table_load_error: @@ -541,7 +553,7 @@ bool numex_module_setup(char *filename) { } else if (numex_table == NULL) { return numex_table_load(filename); } - + return false; } /* Teardown method for the module @@ -550,4 +562,5 @@ the end of a main method) */ void numex_module_teardown(void) { numex_table_destroy(); + numex_table = NULL; }