applications-defaultapp: Code cleanup and NPCIaS adaptation

Cleanup of code and Native Platform Coding Idiom and Style adaptation

Change-Id: Ie1a5e7c81c7500a7909f9413a25dd9e398fe27cc
Signed-off-by: Bartlomiej Uliasz <b.uliasz@samsung.com>

diff --git a/setting-applications/src/setting-applications-defaultapp.c b/setting-applications/src/setting-applications-defaultapp.c
index b74ab6841386495107235a0579fdd5fd564b306f..a3e2a8ee20eff2b9d1977ebb0601479c59391f01 100644 (file)
--- a/setting-applications/src/setting-applications-defaultapp.c
+++ b/setting-applications/src/setting-applications-defaultapp.c
@@ -23,26 +23,26 @@
 #include <pkgmgr-info.h>
 #include "setting-applications-defaultapp.h"
 
-static int _view_create(void *cb);
-static int _view_destroy(void *cb);
-static int _view_cleanup(void *cb);
+static int __view_create(void *cb);
+static int __view_destroy(void *cb);
+static int __view_cleanup(void *cb);
 
 static Eina_Bool __cancel_cb(void *data, Elm_Object_Item *it);
-static void _mouse_up_Gendial_list_cb(void *data, Evas_Object *obj,
+static void __mouse_up_Gendial_list_cb(void *data, Evas_Object *obj,
                void *event_info);
 
 setting_view setting_view_applications_defaultapp = {
-               .create = _view_create,
-               .destroy = _view_destroy,
+               .create = __view_create,
+               .destroy = __view_destroy,
                .update = NULL,
-               .cleanup = _view_cleanup
+               .cleanup = __view_cleanup
 };
 /* ***************************************************
  *
  *basic func
  *
  ***************************************************/
-static char *_get_defaultapp_name(const char *appid)
+static char *__get_defaultapp_name(const char *appid)
 {
        SETTING_TRACE_BEGIN;
        int ret = PMINFO_R_ERROR;
@@ -76,7 +76,7 @@ static char *_get_defaultapp_name(const char *appid)
        return ret_name;
 }
 
-void _unset_sel(void *data, Evas_Object *obj, void *event_info)
+static void __unset_sel_cb(void *data, Evas_Object *obj, void *event_info)
 {
        SETTING_TRACE_BEGIN;
        int ret;
@@ -106,7 +106,7 @@ void _unset_sel(void *data, Evas_Object *obj, void *event_info)
        app_control_destroy(app_control);
 }
 
-static int _get_defapp_iter_fn(const char *appid, void *data)
+static int __get_defapp_iter_fn(const char *appid, void *data)
 {
        int ret = 0;
        char *value = NULL;
@@ -158,17 +158,7 @@ static int _get_defapp_iter_fn(const char *appid, void *data)
        return 0;
 }
 
-static int _get_defapp_list(void *data)
-{
-       SETTING_TRACE_BEGIN;
-       int ret = 0;
-       ret = aul_svc_get_all_defapps(_get_defapp_iter_fn, data);
-       warn_if(ret < 0, "aul_svc_get_all_defapps() Fail(%d)", ret);
-
-       return 0;
-}
-
-static int _list_sort_atoz(const void *a, const void *b)
+static int __list_sort_atoz(const void *a, const void *b)
 {
        int len;
        const default_app *info1 = a;
@@ -187,7 +177,7 @@ static int _list_sort_atoz(const void *a, const void *b)
        return strncasecmp(info1->pkg_label, info2->pkg_label, len);
 }
 
-static void _list_init(void *data, Evas_Object *genlist)
+static void __list_init(SettingApplications *ad, Evas_Object *genlist)
 {
        SETTING_TRACE_BEGIN;
        Eina_List *list = NULL;
@@ -195,16 +185,11 @@ static void _list_init(void *data, Evas_Object *genlist)
        default_app *info = NULL;
        Setting_GenGroupItem_Data *item = NULL;
        int ret = -1;
-       SettingApplications *ad = (SettingApplications *)data;
-       ret_if(!ad);
 
        /* Get list of default app by package manager */
        /* init app list */
-       ret = _get_defapp_list(&list);
-       if (ret < 0) {
-               SETTING_TRACE_ERROR("pkgmgrinfo_pkginfo_get_list() Fail(%d)", ret);
-               return;
-       }
+       ret = aul_svc_get_all_defapps(__get_defapp_iter_fn, &list);
+       retm_if(ret < 0, "aul_svc_get_all_defapps() Fail(%d)", ret);
 
        if (NULL == list || eina_list_count(list) == 0) {
                SETTING_TRACE("eina_list_count(list) <= 0");
@@ -219,7 +204,7 @@ static void _list_init(void *data, Evas_Object *genlist)
                        elm_object_item_disabled_set(item->item, EINA_TRUE);
 
        } else {
-               list = eina_list_sort(list, eina_list_count(list), _list_sort_atoz);
+               list = eina_list_sort(list, eina_list_count(list), __list_sort_atoz);
 
                EINA_LIST_FOREACH(list, list_iterator, info) {
                        info = eina_list_data_get(list_iterator);
@@ -230,27 +215,25 @@ static void _list_init(void *data, Evas_Object *genlist)
                        }
 
                        info->item = elm_genlist_item_append(genlist,
-                                       &(ad->itc_1icon_1button), info, NULL,
-                                       ELM_GENLIST_ITEM_NONE,
-                                       _unset_sel, info);
+                                       &(ad->itc_1icon_1button), info, NULL, ELM_GENLIST_ITEM_NONE,
+                                       __unset_sel_cb, info);
                }
        }
        ad->pkg_list = list;
 }
 
-static void _construct_defaultapp(void *data, Evas_Object *genlist)
+static void __construct_defaultapp(SettingApplications *ad, Evas_Object *genlist)
 {
-       ret_if(data == NULL);
-       SettingApplications *ad = (SettingApplications *)data;
-
+       char *appid = NULL;
+       char *sub_desc = NULL;
        /* "Set defaults" */
        setting_create_Gendial_field_titleItem(genlist, &(ad->itc_grp_title),
                        MGRAPP_STR_LAUNCH_BY_DEFAULT, NULL);
-       char *appid = vconf_get_str(VCONFKEY_SETAPPL_SELECTED_PACKAGE_NAME);
-       char *sub_desc = _get_defaultapp_name(appid);
+       appid = vconf_get_str(VCONFKEY_SETAPPL_SELECTED_PACKAGE_NAME);
+       sub_desc = __get_defaultapp_name(appid);
        ad->data_home = setting_create_Gendial_field_def(genlist,
                        &(ad->itc_2text_2),
-                       _mouse_up_Gendial_list_cb,
+                       __mouse_up_Gendial_list_cb,
                        ad, SWALLOW_Type_INVALID, NULL,
                        NULL, 0, KeyStr_Home, sub_desc, NULL);
        if (ad->data_home) {
@@ -263,14 +246,13 @@ static void _construct_defaultapp(void *data, Evas_Object *genlist)
        /* Create default app list */
        setting_create_Gendial_field_titleItem(genlist, &(ad->itc_grp_title),
                        MGRAPP_STR_CLEAR_DEFAULT, NULL);
-       _list_init(ad, genlist);
+       __list_init(ad, genlist);
 }
 
-static void _destruct_defaultapp(void *data)
+static void __destruct_defaultapp(SettingApplications *ad)
 {
        SETTING_TRACE_BEGIN;
        default_app *node = NULL;
-       SettingApplications *ad = data;
 
        EINA_LIST_FREE(ad->pkg_list, node)
        {
@@ -282,11 +264,12 @@ static void _destruct_defaultapp(void *data)
        ad->pkg_list = NULL;
 }
 
-static void _vconf_change_cb(keynode_t *key, void *data)
+static void __vconf_change_cb(keynode_t *key, void *data)
 {
-       ret_if(data == NULL);
-
+       char *pkgname = NULL;
+       char *label = NULL;
        SettingApplications *ad = data;
+       ret_if(!ad);
 
        char *vconf_name = vconf_keynode_get_name(key);
 
@@ -295,44 +278,40 @@ static void _vconf_change_cb(keynode_t *key, void *data)
                        G_FREE(ad->data_home->sub_desc);
                        /*ad->data_home->sub_desc =
                         * get_pa_backlight_time_value_str(); */
-                       char *pkgname = vconf_get_str(
-                                       VCONFKEY_SETAPPL_SELECTED_PACKAGE_NAME);
+                       pkgname = vconf_get_str(VCONFKEY_SETAPPL_SELECTED_PACKAGE_NAME);
 
                        /* pkgname --> label */
-                       char *label = _get_defaultapp_name(
-                                       pkgname);
+                       label = __get_defaultapp_name(pkgname);
                        ad->data_home->sub_desc = label;
-                       elm_object_item_data_set(ad->data_home->item,
-                                       ad->data_home);
+                       elm_object_item_data_set(ad->data_home->item, ad->data_home);
                        elm_genlist_item_update(ad->data_home->item);
                }
        }
 }
 
-static int _view_create(void *cb)
+static int __view_create(void *cb)
 {
        SETTING_TRACE_BEGIN;
+       Evas_Object *genlist = NULL;
+       SettingApplications *ad = (SettingApplications *)cb;
        retv_if(cb == NULL, SETTING_GENERAL_ERR_NULL_DATA_PARAMETER);
 
-       SettingApplications *ad = (SettingApplications *)cb;
-       Evas_Object *genlist = elm_genlist_add(ad->md.layout);
+       genlist = elm_genlist_add(ad->md.layout);
        retvm_if(genlist == NULL, SETTING_RETURN_FAIL,
                        "Cannot set genlist object as content of layout");
        elm_genlist_mode_set(genlist, ELM_LIST_COMPRESS);
 
        setting_push_to_naviframe_with_back_button(KeyStr_DefaultApplications,
-                       _("IDS_ST_BUTTON_BACK"), __cancel_cb,
-                       ad, genlist, ad->md.naviframe);
+                       _("IDS_ST_BUTTON_BACK"), __cancel_cb, ad, genlist,
+                       ad->md.naviframe);
 
        /*ad->genlist = genlist; */
-       evas_object_smart_callback_add(genlist, "realized", __gl_realized_cb,
-                       ad);
+       evas_object_smart_callback_add(genlist, "realized", __gl_realized_cb, ad);
 
-       _construct_defaultapp(ad, genlist);/*------- */
+       __construct_defaultapp(ad, genlist);/*------- */
        /* ad->data_home */
-       int ret = vconf_notify_key_changed(
-                       VCONFKEY_SETAPPL_SELECTED_PACKAGE_NAME,
-                       _vconf_change_cb, ad);
+       int ret = vconf_notify_key_changed(VCONFKEY_SETAPPL_SELECTED_PACKAGE_NAME,
+                       __vconf_change_cb, ad);
        if (ret != 0)
                SETTING_TRACE_ERROR("call vconf_notify_key_changed failed");
 
@@ -341,21 +320,21 @@ static int _view_create(void *cb)
        return SETTING_RETURN_SUCCESS;
 }
 
-static int _view_destroy(void *cb)
+static int __view_destroy(void *cb)
 {
        SETTING_TRACE_BEGIN;
+       SettingApplications *ad = (SettingApplications *)cb;
 
        /* error check */
-       retv_if(cb == NULL, SETTING_GENERAL_ERR_NULL_DATA_PARAMETER);
+       retv_if(!ad, SETTING_GENERAL_ERR_NULL_DATA_PARAMETER);
        retv_if(!(setting_view_applications_defaultapp.is_create),
                        SETTING_GENERAL_ERR_NULL_DATA_PARAMETER);
 
-       _destruct_defaultapp(cb);/*------- */
+       __destruct_defaultapp(ad);/*------- */
 
-       SettingApplications *ad = (SettingApplications *)cb;
 
        vconf_ignore_key_changed(VCONFKEY_SETAPPL_SELECTED_PACKAGE_NAME,
-                       _vconf_change_cb);
+                       __vconf_change_cb);
 
        setting_view_applications_defaultapp.is_create = 0;
        elm_naviframe_item_pop(ad->md.naviframe);
@@ -363,12 +342,12 @@ static int _view_destroy(void *cb)
        return SETTING_RETURN_SUCCESS;
 }
 
-static int _view_cleanup(void *cb)
+static int __view_cleanup(void *cb)
 {
        SETTING_TRACE_BEGIN;
        /* error check */
        retv_if(cb == NULL, SETTING_GENERAL_ERR_NULL_DATA_PARAMETER);
-       _view_destroy(cb);
+       __view_destroy(cb);
 
        return SETTING_RETURN_SUCCESS;
 }
@@ -388,16 +367,16 @@ static int _view_cleanup(void *cb)
 static Eina_Bool __cancel_cb(void *data, Elm_Object_Item *it)
 {
        SETTING_TRACE_BEGIN;
-       /* error check */
-       retv_if(!data, EINA_FALSE);
        SettingApplications *ad = (SettingApplications *)data;
+       /* error check */
+       retv_if(!ad, EINA_FALSE);
 
        setting_view_change(&setting_view_applications_defaultapp,
                        &setting_view_applications_main, ad);
        return EINA_TRUE;
 }
 
-void _mouse_up_Gendial_list_cb(void *data, Evas_Object *obj, void *event_info)
+void __mouse_up_Gendial_list_cb(void *data, Evas_Object *obj, void *event_info)
 {
        SETTING_TRACE_BEGIN;
        Elm_Object_Item *item = (Elm_Object_Item *)event_info;