Prevent fix

Change-Id: I84bb09bdc6d92fe3cc7b6c1e5908f90d5c082630

diff --git a/src/candidate/efl/candidate-efl.cpp b/src/candidate/efl/candidate-efl.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 14f6031..551139a
--- a/src/candidate/efl/candidate-efl.cpp
+++ b/src/candidate/efl/candidate-efl.cpp
@@ -19,6 +19,8 @@
 #include <vector>
 #include <string>
 #include <algorithm>
+#include <dlog.h>
+
 using namespace std;
 
 #define CANDIDATE_EDJ_FILE_PATH "/usr/share/isf/ise/ise-default/720x1280/default/sdk/edc/candidate-single.edj"
@@ -104,7 +106,7 @@ EflCandidate::create_item() {
     item = edje_object_add(evas_object_evas_get(win));
     ret = edje_object_file_set(item, CANDIDATE_EDJ_FILE_PATH, "candidate_item");
     if (!ret) {
-        printf("getting candidate item failed.\n");
+        LOGW("getting candidate item failed.");
         return NULL;
     }
 
@@ -125,7 +127,7 @@ EflCandidate::create_seperate_line() {
     seperate_line = edje_object_add (evas_object_evas_get (win));
     ret = edje_object_file_set (seperate_line, CANDIDATE_EDJ_FILE_PATH, "seperate_line");
     if (!ret) {
-        printf("getting seperate line failed.\n");
+        LOGW("getting seperate line failed.");
         return NULL;
     }
     evas_object_show (seperate_line);

diff --git a/src/candidate/efl/candidate-multiline-efl.cpp b/src/candidate/efl/candidate-multiline-efl.cpp
index af9488b..aa45885 100644 (file)
--- a/src/candidate/efl/candidate-multiline-efl.cpp
+++ b/src/candidate/efl/candidate-multiline-efl.cpp
@@ -20,6 +20,7 @@
 #include <string>
 #include <assert.h>
 #include <algorithm>
+#include <dlog.h>
 #ifdef WAYLAND
 #include <Ecore_Wayland.h>
 #else
@@ -107,7 +108,7 @@ EflMultiLineCandidate::get_candidate_item()
     ret = edje_object_file_set(edje,
         CANDIDATE_EDJ_FILE_PATH, "candidate_item");
     if (!ret) {
-        printf("getting candidate edje failed.\n");
+        LOGW("getting candidate edje failed.");
         return NULL;
     }
 
@@ -287,7 +288,7 @@ _get_seperate_line(Evas_Object *win) {
     edje = edje_object_add (evas_object_evas_get (win));
     ret = edje_object_file_set (edje, CANDIDATE_EDJ_FILE_PATH, "seperate_line");
     if (!ret) {
-        printf("getting seperate line failed.\n");
+        LOGW("getting seperate line failed.");
         return NULL;
     }
     evas_object_show (edje);
@@ -302,7 +303,7 @@ EflMultiLineCandidate::make_more_view()
     int ret = edje_object_file_set(more_view.layout,
         CANDIDATE_EDJ_FILE_PATH, "candidate_more_view");
     if (!ret) {
-        printf("error while loading more candidate layout\n");
+        LOGW("error while loading more candidate layout");
         throw "failed loading candidate layout.";
     }
 
@@ -338,7 +339,7 @@ EflMultiLineCandidate::make_view()
     int ret = edje_object_file_set(view.layout,
         CANDIDATE_EDJ_FILE_PATH, "candidate");
     if (!ret) {
-        printf("error while loading candidate layout\n");
+        LOGW("error while loading candidate layout");
         throw "failed loading candidate layout.";
     }
     Evas_Coord scr_w, scr_h;

diff --git a/src/ise-emoticon-mode.cpp b/src/ise-emoticon-mode.cpp
index cab7646..0ed917d 100644 (file)
--- a/src/ise-emoticon-mode.cpp
+++ b/src/ise-emoticon-mode.cpp
@@ -157,7 +157,7 @@ void ise_write_recent_emoticon_list_to_scim(void)
     for(std::vector<int>::iterator it = emoticon_list_recent.begin();
         it != emoticon_list_recent.end(); std::advance(it, 1)) {
             char buf[10]= {0};
-            sprintf (buf, "%d", *it);
+            snprintf (buf, sizeof(buf), "%d", *it);
             string_value += std::string(buf);
             string_value += " ";
     }

diff --git a/src/ise.cpp b/src/ise.cpp
old mode 100755 (executable)
new mode 100644 (file)
index 4753a84..e149924
--- a/src/ise.cpp
+++ b/src/ise.cpp
@@ -1225,7 +1225,7 @@ static void update_recent_used_punctuation(const char * key_value)
     for(int i=0; i<10; ++i)
     {
         char buf[5] = {0};
-        sprintf(buf, "%d", i);
+        snprintf(buf, sizeof(buf), "%d", i);
         if(strcmp(key_value, buf) == 0)
         {
             return;

diff --git a/src/sdk/ise_lang_table.cpp b/src/sdk/ise_lang_table.cpp
index aa7a29f..478c2c7 100644 (file)
--- a/src/sdk/ise_lang_table.cpp
+++ b/src/sdk/ise_lang_table.cpp
@@ -128,21 +128,21 @@ Ise_Lang::parsing_languages() {
 
     doc = xmlReadFile(LANG_TABLE_XML_PATH, NULL, 0);
     if (doc == NULL) {
-        LOGD("Could not load file.\n");
-        exit(1);
+        LOGE("Could not load file.\n");
+        return;
     }
 
     cur_node = xmlDocGetRootElement(doc);
     if (cur_node == NULL) {
-        LOGD("empty document.\n");
+        LOGE("empty document.\n");
         xmlFreeDoc(doc);
-        exit(1);
+        return;
     }
     if (0 != xmlStrcmp(cur_node->name, (const xmlChar*)"languages"))
     {
-        LOGD("root name %s error!\n", cur_node->name);
+        LOGE("root name %s error!\n", cur_node->name);
         xmlFreeDoc(doc);
-        exit(1);
+        return;
     }
 
     cur_node = cur_node->xmlChildrenNode;