Tizen Coding Rule applied to /setting-phone source folder

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

diff --git a/setting-phone/src/setting-phone-display-language.c b/setting-phone/src/setting-phone-display-language.c
index 390e279cfccebc74c3c742154e415da194ed310c..c8b2447c97e179df205f7e7ef148dc39c8519f5f 100644 (file)
--- a/setting-phone/src/setting-phone-display-language.c
+++ b/setting-phone/src/setting-phone-display-language.c
@@ -46,9 +46,8 @@ static void setting_phone_display_language_caller_exist_right_cb(void *data,
        SettingPhoneUG *ad = (SettingPhoneUG *)data;
        /*      Create Bundle and send message */
        app_control_h svc;
-       if (app_control_create(&svc)) {
+       if (app_control_create(&svc))
                return;
-       }
 
        app_control_add_extra_data(svc, "result", "rbutton_click");
        ug_send_result(ad->ug, svc);
@@ -108,9 +107,8 @@ static void setting_phone_display_language_close_popup_ex(void *data)
        setting_retm_if(data == NULL, "Data parameter is NULL");
        SettingPhoneUG *ad = (SettingPhoneUG *)data;
 
-       if (ad->selected_locale == NULL) {
+       if (ad->selected_locale == NULL)
                return;
-       }
 
        if (safeStrCmp(ad->selected_locale,
                        "IDS_ST_BODY_ANSWERINGMODE_AUTOMATIC") == 0) {
@@ -178,9 +176,8 @@ static void setting_phone_display_language_close_popup_ex(void *data)
        const char *pa_lang = vconf_get_str(VCONFKEY_LANGSET);
        if (pa_lang) { /* remove the */
                char *q = strchr(pa_lang, '.');
-               if (q) {
+               if (q)
                        *q = '\0';
-               }
        }
        SETTING_TRACE("pa_lang:%s", pa_lang);
        int err = -1;
@@ -197,9 +194,8 @@ static void setting_phone_display_language_close_popup_ex(void *data)
        if (caller) {
                int ret = setting_phone_region_format_set_dateformat(pa_lang,
                                ad);
-               if (ret == SETTING_RETURN_FAIL) {
+               if (ret == SETTING_RETURN_FAIL)
                        SETTING_TRACE_ERROR("[Error] set date format fail");
-               }
 
                char *lang = vconf_get_str(VCONFKEY_LANGSET);
                if (lang) {
@@ -214,9 +210,8 @@ static void setting_phone_display_language_close_popup_ex(void *data)
 
                /*      Create Bundle and send message */
                app_control_h svc;
-               if (app_control_create(&svc)) {
+               if (app_control_create(&svc))
                        return;
-               }
 
                app_control_add_extra_data(svc, "result", "rbutton_click");
                ug_send_result(ad->ug, svc);

diff --git a/setting-phone/src/setting-phone-language-region.c b/setting-phone/src/setting-phone-language-region.c
index 70310e2eaccfd943446afa04a7ab92e66bf1ab69..cd46252954bbcdbf85039e162e6e656a1fd89e34 100644 (file)
--- a/setting-phone/src/setting-phone-language-region.c
+++ b/setting-phone/src/setting-phone-language-region.c
@@ -72,7 +72,7 @@ static Eina_Bool setting_phone_language_region_freeze_event_timer_cb(void *cb)
  * @brief Finds appid with specific category
  *
  * @return 0 if success, negative value(<0) if fail. Callback is not called if
- *     return value is negative
+ *     return value is negative
  */
 static int _find_appid_ime_list(const pkgmgrinfo_appinfo_h handle,
                void *user_data)
@@ -84,11 +84,10 @@ static int _find_appid_ime_list(const pkgmgrinfo_appinfo_h handle,
 
                /* Get appid */
                ret = pkgmgrinfo_appinfo_get_appid(handle, &appid);
-               if (ret == PMINFO_R_OK) {
+               if (ret == PMINFO_R_OK)
                        *result = strdup(appid);
-               } else {
+               else
                        LOGW("pkgmgrinfo_appinfo_get_appid failed!");
-               }
        } else {
                LOGW("user_data is null!");
        }
@@ -317,41 +316,40 @@ static int setting_phone_language_region_create(void *cb)
                        NULL, NULL, 0, "IDS_ST_HEADER_DISPLAY_LANGUAGE",
                        _(pa_display_lang),
                        NULL);
-       if (ad->data_display_language) {
+       if (ad->data_display_language)
                ad->data_display_language->userdata = ad;
-       } else {
+       else
                SETTING_TRACE_ERROR("ad->data_display_language is NULL");
-       }
+
        G_FREE(pa_display_lang);
 
        char *pa_region = vconf_get_str(VCONFKEY_REGIONFORMAT);
-       if (pa_region == NULL) {
+       if (pa_region == NULL)
                SETTING_TRACE_ERROR(
                                "[Error] get value of VCONFKEY_REGIONFORMAT fail.");
-       }
+
        ad->prev_locale = (char *)g_strdup(pa_region);
        /*check if the region is set to auto */
        char *region_format_str = NULL;
        vconf_get_bool(VCONFKEY_SETAPPL_REGION_AUTOMATIC_BOOL,
                        &region_automatic);
-       if (region_automatic == 1) {
+       if (region_automatic == 1)
                region_format_str = (char *)g_strdup(
                                _("IDS_ST_BODY_ANSWERINGMODE_AUTOMATIC"));
-       } else {
+       else
                region_format_str = setting_phone_lang_get_region_str(
                                pa_region);
-       }
+
        ad->data_region_fmt = setting_create_Gendial_field_def(scroller,
                        &(ad->itc_2text_2),
                        setting_phone_lang_item_Gendial_mouse_up_cb, ad,
                        SWALLOW_Type_INVALID,
                        NULL, NULL, 0, _(REGION_FORMAT_LOWER),
                        region_format_str, NULL);
-       if (ad->data_region_fmt) {
+       if (ad->data_region_fmt)
                ad->data_region_fmt->userdata = ad;
-       } else {
+       else
                SETTING_TRACE_ERROR("ad->data_region_fmt is NULL");
-       }
 
        char *example_desc = setting_phone_lang_get_example_desc(pa_region, ad);
        ad->data_region_fmt_example = setting_create_Gendial_field_def(scroller,
@@ -388,12 +386,11 @@ static int setting_phone_language_region_create(void *cb)
                        SWALLOW_Type_INVALID, NULL,
                        NULL, 0, "IDS_ST_BODY_TTS",
                        NULL, NULL);
-       if (pa_region) {
+       if (pa_region)
                FREE(pa_region);
-       }
-       if (example_desc) {
+
+       if (example_desc)
                FREE(example_desc);
-       }
 
        setting_view_phone_language_region.is_create = 1;
        return SETTING_RETURN_SUCCESS;

diff --git a/setting-phone/src/setting-phone-license-main.c b/setting-phone/src/setting-phone-license-main.c
index 54d9c2c98ef1deb3de292c6675611951cdca9204..b1e6bc96b65681532cfc220f2a63ac4f0f8496f7 100644 (file)
--- a/setting-phone/src/setting-phone-license-main.c
+++ b/setting-phone/src/setting-phone-license-main.c
@@ -121,29 +121,23 @@ static int setting_phone_license_main_cleanup(void *cb)
        /* error check */
        retv_if(cb == NULL, SETTING_GENERAL_ERR_NULL_DATA_PARAMETER);
 
+       /*
        SettingPhoneUG *ad = (SettingPhoneUG *)cb;
 
-       if (ad->ly_license != NULL) {
-               /*      evas_object_hide(ad->ly_license); */
-       }
+       if (ad->ly_license != NULL)
+               evas_object_hide(ad->ly_license);
+       */
 
        return SETTING_RETURN_SUCCESS;
 }
 
 static void __ug_layout_cb(ui_gadget_h ug, enum ug_mode mode, void *priv)
 {
-
-       Evas_Object *base;
-
-       if (!priv) {
-               return;
-       }
        SETTING_TRACE_BEGIN;
-
+       Evas_Object *base;
+       ret_if(!priv);
        base = (Evas_Object *)ug_get_layout(ug);
-       if (!base) {
-               return;
-       }
+       ret_if(!base);
 
        switch (mode) {
        case UG_MODE_FULLVIEW:
@@ -226,17 +220,15 @@ static void __main_license_clicked(void *data)
        app_control_add_extra_data(svc, "title",
                        "IDS_ST_BODY_OPEN_SOURCE_LICENCES");
 
-       if (ad->ly_language) {
+       if (ad->ly_language)
                elm_object_tree_focus_allow_set(ad->ly_language, EINA_FALSE);
-       }
 
        ad->ug_loading = setting_ug_create(ad->ug, "setting-fileview-efl",
                        UG_MODE_FULLVIEW, svc, cbs);
-       if (NULL == ad->ug_loading) { /* error handling */
+       if (NULL == ad->ug_loading)     /* error handling */
                setting_create_popup(ad, ad->win_get, NULL,
                                _(UNSUPPORTED_FUNCTION), NULL, 0, false, false,
                                0);
-       }
 
        app_control_destroy(svc);
        FREE(cbs);
@@ -269,17 +261,12 @@ void setting_phone_license_main_mouse_up_Gendial_list_cb(void *data,
 void setting_phone_license_main_popup_resp_cb(void *data, Evas_Object *obj,
                void *event_info)
 {
-       int response_type = btn_type(obj);
-       if (POPUP_RESPONSE_OK == response_type) {
-       }
-
        setting_retm_if(data == NULL, "Data parameter is NULL");
        SettingPhoneUG *ad = (SettingPhoneUG *)data;
        if (ad->popup) {
                evas_object_del(ad->popup);
                ad->popup = NULL;
        }
-
 }
 
 void setting_phone_license_main_click_softkey_cancel(void *data,

diff --git a/setting-phone/src/setting-phone-region-format.c b/setting-phone/src/setting-phone-region-format.c
index 6eb37222c4347c5c4ef8729f132e39cae53de01e..2cbf4d05ff20fdd9233a28064d146450ec57f24f 100644 (file)
--- a/setting-phone/src/setting-phone-region-format.c
+++ b/setting-phone/src/setting-phone-region-format.c
@@ -198,9 +198,8 @@ static int setting_phone_region_format_get_region_fmt(char *list[],
 
        for (; i < loc_count; i++) {
 
-               if (tmp_region_num >= REGION_ITEM_MAX) {
+               if (tmp_region_num >= REGION_ITEM_MAX)
                        break;
-               }
 
                loc_list = uloc_getAvailable(i);
                setting_retvm_if(NULL == loc_list,
@@ -442,15 +441,13 @@ EXPORT_PUBLIC int setting_phone_region_format_set_dateformat(const char *region,
        /* default is "Mdy" */
        int date_format_vconf_value = DATA_FORMAT_DEFAULT;
        for (i = 0; i < DATA_FORMAT_CATEGORY_NUM; i++) {
-               if (!safeStrCmp(region_format, date_format_str[i])) {
+               if (!safeStrCmp(region_format, date_format_str[i]))
                        date_format_vconf_value = i;
-               }
        }
 
        /* if region_format is null, should be set as default */
-       if (isEmptyStr(region_format) || isSpaceStr(region_format)) {
+       if (isEmptyStr(region_format) || isSpaceStr(region_format))
                date_format_vconf_value = 1;
-       }
 
        SETTING_TRACE("bestPatternString : %s, format: %s, index: %d",
                        bestPatternString, region_format,
@@ -615,13 +612,12 @@ static Eina_Bool __region_genlist_update(void *data)
        int automatic_select = 0;
        vconf_get_bool(VCONFKEY_SETAPPL_REGION_AUTOMATIC_BOOL,
                        &automatic_select);
-       if (automatic_select) {
+
+       if (automatic_select)
                ad->selected_region_idx = 0;
-       }
 
-       if (ad->selected_region_idx > -1) {
+       if (ad->selected_region_idx > -1)
                elm_radio_value_set(ad->chk_region, ad->selected_region_idx);
-       }
 #endif
 
        ad->search_idler = NULL;
@@ -643,22 +639,16 @@ static void __searchbar_changed_cb(void *data, Evas_Object *obj,
 
        Evas_Object *entry = elm_object_part_content_get(ad->search_bar,
                        "elm.swallow.content");
-       if (!entry) {
-               return;
-       }
+       ret_if(!entry);
 
        const char *str = elm_entry_entry_get(entry);
        /* empty string is useful */
-       if (!str) {
-               return;
-       }
+       ret_if(!str);
 
        SETTING_TRACE_DEBUG("str: %s", str);
 
        int len = setting_entry_str_get_displaying_part(str, ad->search_text);
-       if (len < 0) {
-               return;
-       }
+       ret_if(len < 0);
 
        SETTING_TRACE_DEBUG("ad->search_text: %s", ad->search_text);
 
@@ -687,21 +677,15 @@ static void __searchbar_prediction_changed_cb(void *data, Evas_Object *obj,
 
        Evas_Object *entry = elm_object_part_content_get(ad->search_bar,
                        "elm.swallow.content");
-       if (!entry) {
-               return;
-       }
+       ret_if(!entry);
 
        const char *str = elm_entry_entry_get(entry);
        /* empty string is useful */
-       if (!str) {
-               return;
-       }
+       ret_if(!str);
        SETTING_TRACE_DEBUG("str: %s", str);
 
        int len = setting_entry_str_get_displaying_part(str, ad->search_text);
-       if (len < 0) {
-               return;
-       }
+       ret_if(len < 0);
 
        SETTING_TRACE_DEBUG("ad->search_text: %s", ad->search_text);
 
@@ -833,17 +817,15 @@ static Eina_Bool __region_animator_cb(void *data)
                                NULL, ad->region_index[i],
                                ad->region_desc[i]/* HERE */, NULL, NULL);
 
-               if (item_data) {
+               if (item_data)
                        item_data->userdata = ad;
-               } else {
+               else
                        SETTING_TRACE_ERROR("item_data is NULL");
-               }
 
                if (!safeStrCmp(ad->region_vconf_str, ad->region_keyStr[i])) {
                        ad->selected_region_idx = i;
-                       if (item_data) {
+                       if (item_data)
                                ad->selected_item = item_data->item;
-                       }
                }
        }
 
@@ -869,9 +851,8 @@ static Eina_Bool __region_popup_timer_cb(void *data)
        }
 
        /* recover it when popup disappear */
-       if (ad->ly_region) {
+       if (ad->ly_region)
                elm_object_tree_focus_allow_set(ad->ly_region, EINA_TRUE);
-       }
 
        ad->popup_timer = NULL;
        return ECORE_CALLBACK_CANCEL;
@@ -948,9 +929,8 @@ static void __region_genlist_create(void *data)
                        if (!safeStrCmp(ad->region_vconf_str,
                                        ad->region_keyStr[i])) {
                                ad->selected_region_idx = i;
-                               if (item_data) {
+                               if (item_data)
                                        ad->selected_item = item_data->item;
-                               }
                        }
                        ad->gl_region_index++;
                }
@@ -1034,9 +1014,8 @@ static Eina_Bool setting_phone_region_format_caller_exist_right_cb(void *data,
        SettingPhoneUG *ad = (SettingPhoneUG *)data;
        /* Create Bundle and send message */
        app_control_h svc;
-       if (app_control_create(&svc)) {
+       if (app_control_create(&svc))
                return EINA_FALSE;
-       }
 
        app_control_add_extra_data(svc, "result", "rbutton_click");
        ug_send_result(ad->ug, svc);
@@ -1135,9 +1114,8 @@ static int setting_phone_region_format_create(void *cb)
 
        int ret = setting_phone_region_format_get_region_fmt(ad->region_desc,
                        ad->region_index, ad->region_keyStr, &ad->region_num);
-       if (ret != 0) {
+       if (ret != 0)
                SETTING_TRACE_ERROR("get region format list failed");
-       }
 
        ad->prev_region = 0;
        memset(ad->search_text, '\0', MAX_SEARCH_STR_LEN + 1);
@@ -1159,11 +1137,10 @@ static int setting_phone_region_format_create(void *cb)
        ret = system_settings_get_value_int(SYSTEM_SETTINGS_KEY_FONT_SIZE,
                        &value);
 
-       if (value == SYSTEM_SETTINGS_FONT_SIZE_GIANT) {
+       if (value == SYSTEM_SETTINGS_FONT_SIZE_GIANT)
                elm_object_signal_emit(ad->search_bar, "set,show,giant", "*");
-       } else {
+       else
                elm_object_signal_emit(ad->search_bar, "set,show,normal", "*");
-       }
 
        elm_object_part_content_set(sub_layout, "elm.swallow.content",
                        ad->gl_region);
@@ -1195,9 +1172,9 @@ static int setting_phone_region_format_destroy(void *cb)
 
        /* FIXED : destroy only if it was created. */
        if (setting_view_phone_region_format.is_create) {
-               if (ad->region_search_id) {
+               if (ad->region_search_id)
                        FREE(ad->region_search_id);
-               }
+
                if (ad->search_idler) {
                        ecore_idler_del(ad->search_idler);
                        ad->search_idler = NULL;

diff --git a/setting-phone/src/setting-phone.c b/setting-phone/src/setting-phone.c
index b8bda550135ae6d3a89d67f9907c05be1aab1acb..91224f97790e671af6d392a33659bced798a92ba 100644 (file)
--- a/setting-phone/src/setting-phone.c
+++ b/setting-phone/src/setting-phone.c
@@ -52,9 +52,7 @@ setting_view *__get_phone_view_to_load(app_control_h service)
 
        char *viewtype = NULL;
        app_control_get_extra_data(service, "viewtype", &viewtype);
-       if (!viewtype) {
-               return NULL;
-       }
+       retv_if(!viewtype, NULL);
 
        SETTING_TRACE("viewtype:%s", viewtype);
 
@@ -118,9 +116,7 @@ Evas_Object *__get_phone_layout_to_return(app_control_h service, void *priv)
        char *viewtype = NULL;
 
        app_control_get_extra_data(service, "viewtype", &viewtype);
-       if (!viewtype) {
-               return NULL;
-       }
+       retv_if(!viewtype, NULL);
        SETTING_TRACE("viewtype:%s", viewtype);
 
        if (!safeStrCmp(viewtype, "language")) {
@@ -150,11 +146,9 @@ const char *get_language_by_mobile_country_code(char *mcc)
        setting_lang_entry *pnode = NULL;
        Eina_List *langlist = setting_get_language_list();
 
-       EINA_LIST_FOREACH(langlist, elist, pnode)
-       {
-               if (strstr(pnode->mcc, mcc) != NULL) {
+       EINA_LIST_FOREACH(langlist, elist, pnode) {
+               if (strstr(pnode->mcc, mcc) != NULL)
                        snprintf(temp, 127, "%s.UTF-8", pnode->locale);
-               }
        }
 
        if (safeStrLen(temp) > 0) {
@@ -195,9 +189,8 @@ static void setting_phone_update_item(void *data)
                int region_automatic = 1;
                int ret = vconf_get_bool(VCONFKEY_SETAPPL_REGION_AUTOMATIC_BOOL,
                                &region_automatic);
-               if (ret == VCONF_ERROR) {
+               if (ret == VCONF_ERROR)
                        SETTING_TRACE_ERROR("get vconf region automatic err.");
-               }
 
                if (region_automatic == 1) {
                        item_to_update->sub_desc = (char *)g_strdup(
@@ -240,9 +233,9 @@ char *setting_phone_lang_get_region_str(const char *region)
        const char *pa_lang = vconf_get_str(VCONFKEY_LANGSET);
        if (pa_lang) {
                char *q = strchr(pa_lang, '.');
-               if (q) {
+               if (q)
                        *q = '\0';
-               }
+
                SETTING_TRACE("pa_lang:%s", pa_lang);
                int err = -1;
                uloc_setDefault(pa_lang, &err);
@@ -300,9 +293,7 @@ char *setting_phone_lang_str_to_utf8(const UChar *unichars)
        len = u_strlen(unichars);
        len_str = sizeof(char) * 4 * (len + 1);
        str = (char *)calloc(1, len_str);
-       if (!str) {
-               return NULL;
-       }
+       retv_if(!str, NULL);
 
        u_strToUTF8(str, len_str, &len_utf8, unichars, len, &status);
        return str;
@@ -318,15 +309,14 @@ char *setting_phone_lang_get_by_pattern(const char *locale,
 
        /*remove ".UTF-8" in locale */
        char locale_tmp[32] = { 0, };
-       if (strlen(locale) < 32) {
+       if (strlen(locale) < 32)
                strncpy(locale_tmp, locale, 32);
-       } else {
+       else
                return NULL;
-       }
+
        char *p = safeStrStr(locale_tmp, ".UTF-8");
-       if (p) {
+       if (p)
                *p = 0;
-       }
 
        char *ret_str = NULL;
        UChar customSkeleton[SETTING_STR_SLP_LEN] = { 0, };
@@ -399,17 +389,16 @@ static char *__setting_phone_number_format_get(const char *region)
        int len_seq = safeStrLen(separator);
        decimal_ch = decimal[0];
        separator_ch = separator[0];
-       if (len_seq == 2 || len_seq == 0) {
+       if (len_seq == 2 || len_seq == 0)
                separator_ch = 32;
-       }
-       if (len_seq == 3 && !safeStrCmp(separator, "\xe2\x80\x99")) {
+
+       if (len_seq == 3 && !safeStrCmp(separator, "\xe2\x80\x99"))
                separator_ch = 39;
-       }
 
        len_seq = safeStrLen(decimal);
-       if (len_seq == 2 || len_seq == 0) {
+       if (len_seq == 2 || len_seq == 0)
                decimal_ch = 44;
-       }
+
        SETTING_TRACE("separator, decimal = %c, %c", separator_ch, decimal_ch);
 
        unum_close(fmt);
@@ -461,9 +450,9 @@ static char *__setting_phone_number_format_get(const char *region)
        int len_seq = safeStrLen(separator);
        decimal_ch = decimal[0];
        separator_ch = separator[0];
-       if (len_seq == 2 || len_seq == 0) {
+       if (len_seq == 2 || len_seq == 0)
                separator_ch = 32;
-       }
+
        SETTING_TRACE("separator, decimal = %c, %c", separator_ch, decimal_ch);
 
        /*make example */
@@ -490,9 +479,8 @@ char *setting_phone_lang_get_example_desc(const char *region, void *data)
        }
 
        char *time_skeleton = "hhmm";
-       if (timeformat == APPCORE_TIME_FORMAT_24) {
+       if (timeformat == APPCORE_TIME_FORMAT_24)
                time_skeleton = "HHmm";
-       }
 
        /*char *region_jp = vconf_get_str(VCONFKEY_REGIONFORMAT); */
        char *time = NULL;
@@ -542,9 +530,8 @@ static void _rot_changed_cb(void *data, Evas_Object *obj, void *event_info)
 {
        SETTING_TRACE_BEGIN;
        SettingPhoneUG *phoneUG = (SettingPhoneUG *)data;
-       if (phoneUG == NULL || phoneUG->win_get == NULL) {
-               return;
-       }
+       ret_if(phoneUG == NULL || phoneUG->win_get == NULL);
+
        int change_ang = elm_win_rotation_get(phoneUG->win_get);
        SETTING_TRACE_DEBUG("....change_ang:%d", change_ang);
        SETTING_TRACE_DEBUG("current_rotation:%d", phoneUG->current_rotation);
@@ -572,17 +559,18 @@ static void _rot_changed_cb(void *data, Evas_Object *obj, void *event_info)
 
        if (change_ang != phoneUG->current_rotation) {
                int diff = change_ang - phoneUG->current_rotation;
-               if (diff < 0) {
+               if (diff < 0)
                        diff = -diff;
-               }
+
                /**
                 * @todo if app didn't launch UG, is the call required to
                 * invoke?
                 */
                ug_send_event(event);
-               if (diff == 180) {
-                       /* do nothing */
-               }
+
+               /* if (diff == 180) {
+                       do nothing
+               } */
                phoneUG->current_rotation = change_ang;
        }
 }
@@ -635,9 +623,9 @@ bindtextdomain(SETTING_PACKAGE, SETTING_LOCALEDIR);
        int err;
        int ret = setting_get_int_slp_key(INT_SLP_SETTING_SIM_SLOT, &value,
                        &err);
-       if (ret != 0) {
+       if (ret != 0)
                SETTING_TRACE("fail to get vconf");
-       }
+
        if (value == VCONFKEY_TELEPHONY_SIM_INSERTED) {
                phoneUG->handle = tel_init(NULL);
                SETTING_TRACE("phoneUG->handle:%d", phoneUG->handle);
@@ -754,9 +742,9 @@ static void setting_phone_ug_on_destroy(ui_gadget_h ug, app_control_h service,
                                phoneUG);
                setting_view_destroy(&setting_view_phone_language_region,
                                phoneUG);
-       }
+
 #ifdef ENABLE_TICKER_NOTI
-       else if (&setting_view_phone_ticker_notification ==
+       } else if (&setting_view_phone_ticker_notification ==
                        phoneUG->view_to_load) {
                setting_view_destroy(&setting_view_phone_ticker_notification,
                                phoneUG);
@@ -764,9 +752,9 @@ static void setting_phone_ug_on_destroy(ui_gadget_h ug, app_control_h service,
                                &setting_view_phone_ticker_notification_details,
                                phoneUG);
 
-       }
+
 #endif
-       else if (&setting_view_phone_license_main == phoneUG->view_to_load) {
+       } else if (&setting_view_phone_license_main == phoneUG->view_to_load) {
                setting_view_destroy(&setting_view_phone_license_main, phoneUG);
        }
 
@@ -894,9 +882,8 @@ UG_MODULE_API void UG_MODULE_EXIT(struct ug_module_ops *ops)
        setting_retm_if(!ops, "ops == NULL");
 
        phoneUG = ops->priv;
-       if (phoneUG) {
+       if (phoneUG)
                FREE(phoneUG);
-       }
 }
 
 /************* n-depth search **************/