fixes utils helper

diff --git a/utils/segment/spseg.cpp b/utils/segment/spseg.cpp
index 073a3d8..b7d6176 100644 (file)
--- 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 (file)
--- 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) {