Allow libpinyin to build in cross compile mode.

[platform/upstream/libpinyin.git] / src / storage / phrase_index.cpp

diff --git a/src/storage/phrase_index.cpp b/src/storage/phrase_index.cpp
index 5f468b3..5fe61c2 100644 (file)
--- a/src/storage/phrase_index.cpp
+++ b/src/storage/phrase_index.cpp
@@ -458,8 +458,12 @@ bool SubPhraseIndex::merge(PhraseIndexLogger * logger){
 
             olditem.m_chunk.set_chunk(oldchunk.begin(), oldchunk.size(),
                                       NULL);
-            if (olditem != *tmpitem)
+
+            if (olditem != *tmpitem) {
+                delete tmpitem;
                 return false;
+            }
+
             delete tmpitem;
 
             break;
@@ -519,14 +523,18 @@ bool FacadePhraseIndex::load_text(guint8 phrase_index, FILE * infile){
     char phrase[256];
     phrase_token_t token;
     size_t freq;
+
     PhraseItem * item_ptr = new PhraseItem;
     phrase_token_t cur_token = 0;
-    while ( !feof(infile)){
-        fscanf(infile, "%s", pinyin);
-        fscanf(infile, "%s", phrase);
-        fscanf(infile, "%u", &token);
-       fscanf(infile, "%ld", &freq);
-       if ( feof(infile) )
+
+    while (!feof(infile)){
+        int num = fscanf(infile, "%s %s %u %ld",
+                         pinyin, phrase, &token, &freq);
+
+        if (4 != num)
+            continue;
+
+       if (feof(infile))
            break;
 
         assert(PHRASE_INDEX_LIBRARY_INDEX(token) == phrase_index );