diff options
| -rw-r--r-- | tests/tests_helper.h | 8 | ||||
| -rw-r--r-- | utils/utils_helper.h | 16 |
2 files changed, 12 insertions, 12 deletions
diff --git a/tests/tests_helper.h b/tests/tests_helper.h index daaa68a..af1b38a 100644 --- a/tests/tests_helper.h +++ b/tests/tests_helper.h @@ -25,16 +25,16 @@ static bool load_phrase_index(FacadePhraseIndex * phrase_index){ MemoryChunk * chunk = NULL; for (size_t i = 0; i < PHRASE_INDEX_LIBRARY_COUNT; ++i) { - const char * bin_file = pinyin_phrase_files[i]; - if (NULL == bin_file) + const char * binfile = pinyin_phrase_files[i]; + if (NULL == binfile) continue; gchar * filename = g_build_filename("..", "..", "data", - bin_file, NULL); + binfile, NULL); chunk = new MemoryChunk; bool retval = chunk->load(filename); if (!retval) { - fprintf(stderr, "open %s failed!\n", bin_file); + fprintf(stderr, "open %s failed!\n", binfile); return false; } diff --git a/utils/utils_helper.h b/utils/utils_helper.h index 2f143c9..29e776a 100644 --- a/utils/utils_helper.h +++ b/utils/utils_helper.h @@ -26,14 +26,14 @@ static bool load_phrase_index(FacadePhraseIndex * phrase_index) { MemoryChunk * chunk = NULL; for (size_t i = 0; i < PHRASE_INDEX_LIBRARY_COUNT; ++i) { - const char * bin_file = pinyin_phrase_files[i]; - if (NULL == bin_file) + const char * binfile = pinyin_phrase_files[i]; + if (NULL == binfile) continue; chunk = new MemoryChunk; - bool retval = chunk->load(bin_file); + bool retval = chunk->load(binfile); if (!retval) { - fprintf(stderr, "load %s failed!\n", bin_file); + fprintf(stderr, "load %s failed!\n", binfile); return false; } @@ -45,15 +45,15 @@ static bool load_phrase_index(FacadePhraseIndex * phrase_index) { static bool save_phrase_index(FacadePhraseIndex * phrase_index) { MemoryChunk * new_chunk = NULL; for (size_t i = 0; i < PHRASE_INDEX_LIBRARY_COUNT; ++i) { - const char * bin_file = pinyin_phrase_files[i]; - if (NULL == bin_file) + const char * binfile = pinyin_phrase_files[i]; + if (NULL == binfile) continue; new_chunk = new MemoryChunk; phrase_index->store(i, new_chunk); - bool retval = new_chunk->save(bin_file); + bool retval = new_chunk->save(binfile); if (!retval) { - fprintf(stderr, "save %s failed.", bin_file); + fprintf(stderr, "save %s failed.", binfile); return false; } |