diff options
| author | Peng Wu <alexepico@gmail.com> | 2012-10-19 13:44:33 +0800 |
|---|---|---|
| committer | Peng Wu <alexepico@gmail.com> | 2012-10-19 13:55:12 +0800 |
| commit | aee9198d0a266429436dfbde4660baeb47429c4b (patch) | |
| tree | cab25703aa31ac20d23fa1933775076597d51a9d | |
| parent | 3d9959ed830c4ae5bc7b4f7a525f25f34fc67313 (diff) | |
| download | libpinyin-aee9198d0a266429436dfbde4660baeb47429c4b.tar.gz libpinyin-aee9198d0a266429436dfbde4660baeb47429c4b.tar.xz libpinyin-aee9198d0a266429436dfbde4660baeb47429c4b.zip | |
fixes utils helper
| -rw-r--r-- | utils/segment/spseg.cpp | 2 | ||||
| -rw-r--r-- | utils/utils_helper.h | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/utils/segment/spseg.cpp b/utils/segment/spseg.cpp index 073a3d8..b7d6176 100644 --- a/utils/segment/spseg.cpp +++ b/utils/segment/spseg.cpp @@ -196,7 +196,7 @@ int main(int argc, char * argv[]){ for ( glong i = 0; i < strings->len; ++i ) { SegmentStep * step = &g_array_index(strings, SegmentStep, i); char * string = g_ucs4_to_utf8( step->m_phrase, step->m_phrase_len, NULL, NULL, NULL); - printf("%s\n", string); + printf("%d %s\n", step->m_handle, string); g_free(string); } diff --git a/utils/utils_helper.h b/utils/utils_helper.h index 520c14f..6a90cce 100644 --- a/utils/utils_helper.h +++ b/utils/utils_helper.h @@ -50,9 +50,13 @@ #define TAGLIB_PARSE_SEGMENTED_LINE(phrase_index, var, line) \ phrase_token_t var = null_token; \ - { \ + do { \ + if (0 == strlen(line)) \ + break; \ + \ gchar ** strs = g_strsplit_set(line, " \t", 2); \ - assert(2 == g_strv_length(strs)); \ + if (2 != g_strv_length(strs)) \ + assert(false); \ \ phrase_token_t token = atoi(strs[0]); \ const char * phrase = strs[1]; \ @@ -63,7 +67,7 @@ var = token; \ \ g_strfreev(strs); \ - } + } while(false); static bool load_phrase_index(FacadePhraseIndex * phrase_index) { |