[numex] using module init method for building, otherwise passing NULL path uses the default path

This commit is contained in:
Al
2015-09-16 21:13:05 -04:00
parent 3cba2e8df3
commit b11362ab98
3 changed files with 9 additions and 5 deletions

View File

@@ -559,14 +559,17 @@ bool numex_table_save(char *filename) {
}
}
bool numex_module_init(void) {
numex_table = numex_table_new();
return numex_table != NULL;
}
/* Initializes numex trie/module
Must be called only once before the module can be used
*/
bool numex_module_setup(char *filename) {
if (filename == NULL && numex_table == NULL) {
numex_table = numex_table_new();
return numex_table != NULL;
} else if (numex_table == NULL) {
if (numex_table == NULL) {
return numex_table_load(filename == NULL ? DEFAULT_NUMEX_PATH : filename);
}
return false;

View File

@@ -146,6 +146,7 @@ char *get_ordinal_suffix(char *numeric_string, char *lang, numex_result_t result
bool numex_table_write(FILE *file);
bool numex_table_save(char *filename);
bool numex_module_init(void);
bool numex_module_setup(char *filename);
void numex_module_teardown(void);

View File

@@ -26,7 +26,7 @@ int main(int argc, char **argv) {
exit(1);
}
if (!numex_module_setup(NULL)) {
if (!numex_module_init()) {
log_error("Numex table initialization unsuccessful\n");
numex_module_teardown();
exit(1);