From d5ec005787031a0077cd072e2b662b941bbaa436 Mon Sep 17 00:00:00 2001 From: Al Date: Wed, 16 Sep 2015 21:14:02 -0400 Subject: [PATCH] [transliteration] Similar init method for transliteration --- src/transliterate.c | 11 ++++++----- src/transliterate.h | 1 + src/transliteration_table_builder.c | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/transliterate.c b/src/transliterate.c index 06a723b5..bb11349e 100644 --- a/src/transliterate.c +++ b/src/transliterate.c @@ -1903,12 +1903,13 @@ bool transliteration_table_save(char *filename) { } +bool transliteration_module_init(void) { + trans_table = transliteration_table_new(); + return trans_table != NULL; +} + bool transliteration_module_setup(char *filename) { - if (filename == NULL && trans_table == NULL) { - // Just init the table - trans_table = transliteration_table_new(); - return true; - } else if (trans_table == NULL) { + if (trans_table == NULL) { return transliteration_table_load(filename == NULL ? DEFAULT_TRANSLITERATION_PATH : filename); } diff --git a/src/transliterate.h b/src/transliterate.h index 693d33cb..1ea2febf 100644 --- a/src/transliterate.h +++ b/src/transliterate.h @@ -167,6 +167,7 @@ bool transliteration_table_write(FILE *file); bool transliteration_table_save(char *filename); // Module setup/teardown +bool transliteration_module_init(void); bool transliteration_module_setup(char *filename); void transliteration_module_teardown(void); diff --git a/src/transliteration_table_builder.c b/src/transliteration_table_builder.c index 9a5f498c..3636253a 100644 --- a/src/transliteration_table_builder.c +++ b/src/transliteration_table_builder.c @@ -244,7 +244,7 @@ int main(int argc, char **argv) { char *group_regex_str; size_t group_regex_len; - transliteration_module_setup(NULL); + transliteration_module_init(); transliteration_table_t *trans_table = get_transliteration_table();