Fix warning informations. 85/41785/1
authorshoum.chen@samsung.com <shoum.chen@samsung.com>
Thu, 11 Jun 2015 08:12:20 +0000 (16:12 +0800)
committerJihoon Kim <jihoon48.kim@samsung.com>
Wed, 17 Jun 2015 11:28:57 +0000 (20:28 +0900)
Change-Id: I66bb37681f2d980f431e72e17dd24ed54c1427cf
Signed-off-by: shoum.chen@samsung.com <shoum.chen@samsung.com>
im_setting_list/input_method_setting_list_ui.cpp
im_setting_selector/input_method_setting_selector_ui.cpp

index 0590ee18d8bf9c36bc184cdbed419cb9b17a7384..21ff1277c30167712896c0b8568020e4ce98a72b 100644 (file)
@@ -75,7 +75,7 @@ static void im_setting_list_text_domain_set(void)
 }
 
 static Evas_Object *
-im_setting_list_main_window_create(char *name)
+im_setting_list_main_window_create(const char *name)
 {
     Evas_Object *eo = NULL;
     int w = -1, h = -1;
@@ -135,12 +135,15 @@ static int im_setting_list_get_active_ime_index(void)
     std::vector<ime_info_s>::iterator end = g_ime_info_list.end();
     for (; iter != end; ++iter)
     {
-        if(!strcmp(active_ime_appid, iter->appid))
+        if(active_ime_appid && (!strcmp(active_ime_appid, iter->appid)))
         {
             break;
         }
     }
-    free(active_ime_appid);
+    if(active_ime_appid)
+    {
+        free(active_ime_appid);
+    }
     return (iter-g_ime_info_list.begin());
 }
 
@@ -230,8 +233,10 @@ static void im_setting_list_show_popup(void *data, Evas_Object *obj, popup_ok_cb
     Evas_Object *popup = elm_popup_add(top_widget);
     eext_object_event_callback_add (popup, EEXT_CALLBACK_BACK, eext_popup_back_cb, NULL);
     elm_object_part_text_set(popup, "title,text", IM_SETTING_LIST_POPUP_TITLE);
+    char chFormatMsg[255] = {'\0'};
     char chPopupMsg[255] = {'\0'};
-    sprintf(chPopupMsg, IM_SETTING_LIST_POPUP_TEXT, g_ime_info_list[index].label);
+    snprintf(chFormatMsg, sizeof(chFormatMsg), "%s", IM_SETTING_LIST_POPUP_TEXT);
+    snprintf(chPopupMsg, sizeof(chPopupMsg), chFormatMsg, g_ime_info_list[index].label);
     elm_object_text_set(popup, chPopupMsg);
 
     popup_cb_data *cb_data = new popup_cb_data;
@@ -378,14 +383,6 @@ static char *im_setting_list_genlist_group_label_get(void *data, Evas_Object *ob
     return NULL;
 }
 
-static Evas_Object *im_setting_list_genlist_group_icon_get(void *data, Evas_Object *obj, const char *part)
-{
-    Evas_Object *item = NULL;
-    if (!strcmp(part, "elm.icon.right")) {
-    }
-    return item;
-}
-
 static char *im_setting_list_genlist_keyboard_list_item_label_get(void *data, Evas_Object *obj, const char *part)
 {
     int index = (int)(data);
@@ -523,7 +520,7 @@ static void im_setting_list_genlist_item_class_create(int app_type)
 
 static void im_setting_list_add_ime(void *data) {
     appdata *ad = (appdata *)data;
-    unsigned int i = 0;
+    int i = 0;
     im_setting_list_genlist_item_class_create(ad->app_type);
 
     if(NULL != ad->genlist)
@@ -575,7 +572,8 @@ static void im_setting_list_add_ime(void *data) {
             NULL);
 
     /* keyboard list */
-    for (i = 0; i < g_ime_info_list.size(); i++) {
+    int info_list_size = g_ime_info_list.size();
+    for (i = 0; i < info_list_size; i++) {
         gen_item_data item_data;
 
         if(g_ime_info_list[i].is_preinstalled || (i == g_active_ime_index)){
index bc9c63ddbc56da7a5f8520a55867a3db0b30e4fa..686baed9808ef6ec35a52e63ce7815ea2bdedf50 100644 (file)
@@ -47,7 +47,7 @@ static void im_setting_selector_text_domain_set(void)
 }
 
 static Evas_Object *
-im_setting_selector_main_window_create(char *name)
+im_setting_selector_main_window_create(const char *name)
 {
     Evas_Object *eo = NULL;
     int w = -1, h = -1;
@@ -69,17 +69,6 @@ im_setting_selector_main_window_create(char *name)
     return eo;
 }
 
-static Evas_Object* im_setting_selector_bg_create(Evas_Object *parent)
-{
-    Evas_Object *bg;
-    if (parent == NULL) return NULL;
-    bg = elm_bg_add(parent);
-    evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-    elm_win_resize_object_add(parent, bg);
-    evas_object_show(bg);
-    return bg;
-}
-
 static void im_setting_selector_load_ime_info(void)
 {
     g_ime_info_list.clear();