Fix errors and wanings from Tizen Coding Rule Checker

Change-Id: Ifb7c2ed567583f358cd9a03bbd8cc7f2bd2477f1
Signed-off-by: Kiseok Chang <kiso.chang@samsung.com>

diff --git a/setting-accessibility/include/setting-accessibility.h b/setting-accessibility/include/setting-accessibility.h
old mode 100644 (file)
new mode 100755 (executable)
index 8d4f7d0..0d7c061
--- a/setting-accessibility/include/setting-accessibility.h
+++ b/setting-accessibility/include/setting-accessibility.h
@@ -57,7 +57,7 @@
 #define DEVOPTION_STR_ACCESSIBILITY_SCREEN_READER_SETTINGS_STATUS_BAR_INFORMATION \
        "IDS_ACCS_TMBODY_STATUS_BAR_INFORMATION"
 #define DEVOPTION_STR_ACCESSIBILITY_SCREEN_READER_SETTINGS_STATUS_BAR_INFORMATION_DESCRIPTION \
-    "IDS_ACCS_SBODY_SELECT_WHICH_INFORMATION_FROM_INDICATORS_SHOWN_ON_THE_STATUS_BAR_WILL_BE_READ_OUT_WHEN_YOU_TRIPLE_TAP_THE_SCREEN_WITH_TWO_FINGERS_MSG"
+       "IDS_ACCS_SBODY_SELECT_WHICH_INFORMATION_FROM_INDICATORS_SHOWN_ON_THE_STATUS_BAR_WILL_BE_READ_OUT_WHEN_YOU_TRIPLE_TAP_THE_SCREEN_WITH_TWO_FINGERS_MSG"
 
 #define DEVOPTION_STR_ACCESSIBILITY_SCREEN_READER_SETTINGS_SPEECH_RATE_POPUP_DESCRIPTION "IDS_SCR_POP_DRAG_THE_SLIDER_TO_SET_THE_SPEECH_RATE"
 #define DEVOPTION_STR_ACCESSIBILITY_SCREEN_READER_SETTINGS_SPEECH_RATE_POPUP_CANCEL "IDS_ST_BUTTON_CANCEL_ABB"

diff --git a/setting-accessibility/src/setting-accessibility-universal-switch-add-switch-accessories.c b/setting-accessibility/src/setting-accessibility-universal-switch-add-switch-accessories.c
old mode 100644 (file)
new mode 100755 (executable)
index 13f3cfb..e89b5db
--- a/setting-accessibility/src/setting-accessibility-universal-switch-add-switch-accessories.c
+++ b/setting-accessibility/src/setting-accessibility-universal-switch-add-switch-accessories.c
@@ -85,7 +85,7 @@ static void __popup_response_cb(void *data, Evas_Object *obj, void *event_info)
                setting_accessibility_universal_switch_action_page_create(ad);
                setting_accessibility_universal_switch_action_callback_attach(ad, __accessory_switch_action_cb, (void *)strdup(switch_name));
        }
-       
+
        if (ad->popup) {
                evas_object_del(ad->popup);
                ad->popup = NULL;

diff --git a/setting-accessibility/src/setting-accessibility-universal-switch-add-switch-camera.c b/setting-accessibility/src/setting-accessibility-universal-switch-add-switch-camera.c
old mode 100644 (file)
new mode 100755 (executable)
index 1b2d0f0..e689bbf
--- a/setting-accessibility/src/setting-accessibility-universal-switch-add-switch-camera.c
+++ b/setting-accessibility/src/setting-accessibility-universal-switch-add-switch-camera.c
@@ -40,9 +40,8 @@ static void __switch_action_cb(SettingAccessibility *ad, switch_action_t action,
        retm_if(user_data == NULL, "User data parameter is NULL");
        UniversalSwitchSwitchType * camera_switch = (UniversalSwitchSwitchType *)user_data;
 
-       if (ad->camera_switch_added_cb) {
+       if (ad->camera_switch_added_cb)
                ad->camera_switch_added_cb(ad, camera_switch->id, action, camera_switch->name);
-       }
 
        SETTING_TRACE_END;
 }
@@ -111,9 +110,8 @@ void setting_accessibility_universal_switch_add_switch_camera_page_create(Settin
                        item = setting_create_Gendial_field_def(genlist, &itc_1text, __add_camera_switch_cb, camer_switch,
                                        SWALLOW_Type_INVALID, NULL, NULL, 0, camer_switch->name, description, NULL);
 
-                       if (item) {
+                       if (item)
                                item->userdata = ad;
-                       }
                }
        }
 

diff --git a/setting-accessibility/src/setting-accessibility-universal-switch-add-switch.c b/setting-accessibility/src/setting-accessibility-universal-switch-add-switch.c
old mode 100644 (file)
new mode 100755 (executable)
index 1b7687c..f3a715c
--- a/setting-accessibility/src/setting-accessibility-universal-switch-add-switch.c
+++ b/setting-accessibility/src/setting-accessibility-universal-switch-add-switch.c
@@ -53,15 +53,14 @@ static void __add_switch_page_create(SettingAccessibility *ad, const char * prov
 {
        SETTING_TRACE_DEBUG("Create add switch page for %s", providerId);
 
-       if (strncmp(providerId, ACCESSIBILITY_UNIVERSAL_SWITCH_SCREEN_SWITCH_PROVIDER, sizeof(ACCESSIBILITY_UNIVERSAL_SWITCH_SCREEN_SWITCH_PROVIDER)) == 0) {
+       if (strncmp(providerId, ACCESSIBILITY_UNIVERSAL_SWITCH_SCREEN_SWITCH_PROVIDER, sizeof(ACCESSIBILITY_UNIVERSAL_SWITCH_SCREEN_SWITCH_PROVIDER)) == 0)
                setting_accessibility_universal_switch_add_switch_screen_page_create(ad);
-       } else if (strncmp(providerId, ACCESSIBILITY_UNIVERSAL_SWITCH_CAMERA_SWITCH_PROVIDER, sizeof(ACCESSIBILITY_UNIVERSAL_SWITCH_SCREEN_SWITCH_PROVIDER)) == 0) {
+       else if (strncmp(providerId, ACCESSIBILITY_UNIVERSAL_SWITCH_CAMERA_SWITCH_PROVIDER, sizeof(ACCESSIBILITY_UNIVERSAL_SWITCH_SCREEN_SWITCH_PROVIDER)) == 0)
                setting_accessibility_universal_switch_add_switch_camera_page_create(ad);
-       } else if (strncmp(providerId, ACCESSIBILITY_UNIVERSAL_SWITCH_ACCESSORIES_SWITCH_PROVIDER, sizeof(ACCESSIBILITY_UNIVERSAL_SWITCH_ACCESSORIES_SWITCH_PROVIDER)) == 0) {
+       else if (strncmp(providerId, ACCESSIBILITY_UNIVERSAL_SWITCH_ACCESSORIES_SWITCH_PROVIDER, sizeof(ACCESSIBILITY_UNIVERSAL_SWITCH_ACCESSORIES_SWITCH_PROVIDER)) == 0)
                setting_accessibility_universal_switch_add_switch_accessories_page_create(ad);
-       } else {
+       else
                SETTING_TRACE_ERROR("Unknown provider: %s", providerId);
-       }
 }
 
 static void __add_switch_cb(void *data, Evas_Object *obj, void *event_info)
@@ -103,9 +102,8 @@ void setting_accessibility_universal_switch_add_switch_page_create(SettingAccess
                                switch_provider->info->name,
                                switch_provider->info->description, NULL);
 
-               if (item) {
+               if (item)
                        item->userdata = ad;
-               }
        }
 
        Elm_Object_Item *navi_it = elm_naviframe_item_push(ad->md.naviframe, _(DEVOPTION_STR_ACCESSIBILITY_UNIVERSAL_SWITCH_ADD_SWITCH), NULL, NULL, genlist, NULL);

diff --git a/setting-accessibility/src/setting-accessibility-universal-switch-dbus.c b/setting-accessibility/src/setting-accessibility-universal-switch-dbus.c
old mode 100644 (file)
new mode 100755 (executable)
index 134b409..55c0987
--- a/setting-accessibility/src/setting-accessibility-universal-switch-dbus.c
+++ b/setting-accessibility/src/setting-accessibility-universal-switch-dbus.c
@@ -119,11 +119,10 @@ static Eina_Array * __eldbus_getAllSwitchesByProviderId(UniversalSwitchEldbus *e
        eldbus_message_iter_arguments_append(iter, "s", provider_id);
 
        reply = eldbus_proxy_send_and_block(eldbus->proxy, req, ELDBUS_TIMEOUT);
-       if (!reply || eldbus_message_error_get(reply, &errname, &errmsg)) {
+       if (!reply || eldbus_message_error_get(reply, &errname, &errmsg))
                SETTING_TRACE_ERROR("Unable to call method " IFACE ".getAllSwitchesByProviderId: %s %s", errname, errmsg);
-       } else {
+       else
                __eldbus_getInfoArray(switches, reply);
-       }
 
        if (reply)
                eldbus_message_unref(reply);
@@ -188,11 +187,10 @@ static Eina_Array * __eldbus_getAllActivityTypes(UniversalSwitchEldbus *eldbus)
        }
 
        reply = eldbus_proxy_send_and_block(eldbus->proxy, req, ELDBUS_TIMEOUT);
-       if (!reply || eldbus_message_error_get(reply, &errname, &errmsg)) {
+       if (!reply || eldbus_message_error_get(reply, &errname, &errmsg))
                SETTING_TRACE_ERROR("Unable to call method " IFACE ".getAllActivityTypes: %s %s", errname, errmsg);
-       } else {
+       else
                __eldbus_getInfoArray(activity_types, reply);
-       }
 
        if (reply)
                eldbus_message_unref(reply);
@@ -243,11 +241,10 @@ static Eina_Array * __eldbus_getAllSwitchConfigurationItems(UniversalSwitchEldbu
        }
 
        reply = eldbus_proxy_send_and_block(eldbus->proxy, req, ELDBUS_TIMEOUT);
-       if (!reply || eldbus_message_error_get(reply, &errname, &errmsg)) {
+       if (!reply || eldbus_message_error_get(reply, &errname, &errmsg))
                SETTING_TRACE_ERROR("Unable to call method " IFACE ".getAllActivityTypes: %s %s", errname, errmsg);
-       } else {
+       else
                __eldbus_getAllSwitchConfigurationItemsArray(configurationItems, reply);
-       }
 
        if (reply)
                eldbus_message_unref(reply);
@@ -408,9 +405,8 @@ static void __eldbus_on_capture_switch(void *data EINA_UNUSED, const Eldbus_Mess
        if (eldbus_message_error_get(msg, &errname, &errmsg)) {
                SETTING_TRACE_DEBUG("Error: %s %s", errname, errmsg);
        } else {
-               if (!eldbus_message_arguments_get(msg, "s", &switch_id)) {
+               if (!eldbus_message_arguments_get(msg, "s", &switch_id))
                        SETTING_TRACE_ERROR("Could not get switch_id");
-               }
        }
 
        SETTING_TRACE_DEBUG("DBus got captureSwitch %s", switch_id);
@@ -440,9 +436,8 @@ void setting_accessibility_universal_switch_dbus_config_cancelCaptureSwitch(Univ
        UniversalSwitchEldbus * eldbus = &config->eldbus;
        SETTING_TRACE_DEBUG("DBus call captureSwitch canceled");
        eldbus->capture_switch_callback = NULL;
-       if (eldbus->capture_switch_request) {
+       if (eldbus->capture_switch_request)
                eldbus_pending_cancel(eldbus->capture_switch_request);
-       }
        eldbus->capture_switch_request = NULL;
 }
 

diff --git a/setting-accessibility/src/setting-accessibility-universal-switch-settings.c b/setting-accessibility/src/setting-accessibility-universal-switch-settings.c
old mode 100644 (file)
new mode 100755 (executable)
index 06412e5..11b3fbf
--- a/setting-accessibility/src/setting-accessibility-universal-switch-settings.c
+++ b/setting-accessibility/src/setting-accessibility-universal-switch-settings.c
@@ -1431,7 +1431,7 @@ static void __create_additional_settings_group(SettingAccessibility *ad, Evas_Ob
                        !ad->sgl_iaction_int_state, _(DEVOPTION_STR_ACCESSIBILITY_UNIVERSAL_SWITCH_SETTINGS_OFF));
        ad->universal_switch_sgl_iaction_int = __add_menu_item(ad, genlist, _(DEVOPTION_STR_ACCESSIBILITY_UNIVERSAL_SWITCH_SETTINGS_GROUP_ADD_SETTINGS_SGL_IACTION_INT),
                        str, __sgl_iaction_int_cb, true, ad->sgl_iaction_int_state, __sgl_iaction_int_checkbox_cb);
-       
+
        str = __get_value_unit_text(NULL, &ad->auto_tap_value, _(DEVOPTION_STR_ACCESSIBILITY_UNIVERSAL_SWITCH_SETTINGS_SECONDS),
                        !ad->auto_tap_state, _(DEVOPTION_STR_ACCESSIBILITY_UNIVERSAL_SWITCH_SETTINGS_OFF));
        ad->universal_switch_auto_tap = __add_menu_item(ad, genlist, _(DEVOPTION_STR_ACCESSIBILITY_UNIVERSAL_SWITCH_SETTINGS_GROUP_ADD_SETTINGS_AUTO_TAP),

diff --git a/setting-common/src/setting-common-general-func.c b/setting-common/src/setting-common-general-func.c
index 119660037ae1722a91b2ce4dbf6880bf0b5b6af9..fb784f2100584d572424580152e91fe46e698f05 100755 (executable)
--- a/setting-common/src/setting-common-general-func.c
+++ b/setting-common/src/setting-common-general-func.c
@@ -282,9 +282,8 @@ char *get_pa_display_language_str()
                        return g_strdup("Error");
 
                char *q = strchr(locale, '.');
-               if (q) {
+               if (q)
                        *q = '\0';
-               }
 
                setting_lang_entry *pnode;
 

diff --git a/setting-license/src/setting-license-view.c b/setting-license/src/setting-license-view.c
index 24d4756a5c4d6424a2d951ba92eca3c72179656e..0dbe363c6bdd79ce918e7688b23ba6cc9ff397c4 100755 (executable)
--- a/setting-license/src/setting-license-view.c
+++ b/setting-license/src/setting-license-view.c
@@ -114,7 +114,7 @@ static void _app_reply_cb(app_control_h request, app_control_h reply,
 
 #if SUPPORT_COMPRESSED_LICENSE
                // remove temorary file
-               snprintf(tempfilename,256, "%s/license.html", UNCOMPRESSEDFILE_DIR);
+               snprintf(tempfilename, 256, "%s/license.html", UNCOMPRESSEDFILE_DIR);
                remove(tempfilename);
 #endif
        }
@@ -135,10 +135,10 @@ static void _app_reply_cb(app_control_h request, app_control_h reply,
 
 #define WRITEBUFFERSIZE (1024*1024*3) // 3Mb buffer
 
-static int readZipFile(char *zipFile, char *fileInZip) 
+static int readZipFile(char *zipFile, char *fileInZip)
 {
        SETTING_TRACE_BEGIN;
-       
+
        int err = UNZ_OK;                 // error status
        uInt size_buf = WRITEBUFFERSIZE;  // byte size of buffer to store raw data
        void* buf;                        // the buffer
@@ -154,13 +154,13 @@ static int readZipFile(char *zipFile, char *fileInZip)
                return -1;
        } // file is open
 
-       if ( unzLocateFile(uf,fileInZip,1) ) { // try to locate file inside zip
+       if (unzLocateFile(uf, fileInZip, 1)) { // try to locate file inside zip
                // second argument of unzLocateFile: 1 = case sensitive, 0 = case-insensitive
                SETTING_TRACE("File %s not found in %s", fileInZip, zipFile);
                return -1;
        } // file inside zip found
 
-       if (unzGetCurrentFileInfo(uf,&file_info,filename_inzip,sizeof(filename_inzip),NULL,0,NULL,0)) {
+       if (unzGetCurrentFileInfo(uf, &file_info, filename_inzip, sizeof(filename_inzip), NULL, 0, NULL, 0)) {
                SETTING_TRACE("Error %d with zipfile %s in unzGetCurrentFileInfo.", err, zipFile);
                return -1;
        } // obtained the necessary details about file inside zip
@@ -171,16 +171,16 @@ static int readZipFile(char *zipFile, char *fileInZip)
                return -1;
        } // buffer ready
 
-       err = unzOpenCurrentFilePassword(uf,NULL); // Open the file inside the zip (password = NULL)
+       err = unzOpenCurrentFilePassword(uf, NULL); // Open the file inside the zip (password = NULL)
        if (err != UNZ_OK) {
                SETTING_TRACE("Error %d with zipfile %s in unzOpenCurrentFilePassword.", err, zipFile);
                free(buf);
                return -1;
        } // file inside the zip is open
 
-       snprintf(tempfilename,256, "%s/%s", UNCOMPRESSEDFILE_DIR, fileInZip);
+       snprintf(tempfilename, 256, "%s/%s", UNCOMPRESSEDFILE_DIR, fileInZip);
 
-       tempfile_fp = fopen(tempfilename,"w");
+       tempfile_fp = fopen(tempfilename, "w");
        if (tempfile_fp == NULL) {
                SETTING_TRACE("Error to write tempfile :  %s", tempfilename);
                free(buf);
@@ -190,27 +190,26 @@ static int readZipFile(char *zipFile, char *fileInZip)
        // Copy contents of the file inside the zip to the buffer
        printf("Extracting: %s from %s\n", filename_inzip, zipFile);
        do {
-               err = unzReadCurrentFile(uf,buf,size_buf);
+               err = unzReadCurrentFile(uf, buf, size_buf);
                if (err < 0) {
                        SETTING_TRACE("Error %d with zipfile %s in unzReadCurrentFile", err, zipFile);
                        break;
                }
                // copy the buffer to a string
                if (err > 0) {
-                       //for (int i = 0; i < (int) err; i++) 
+                       //for (int i = 0; i < (int) err; i++)
                                //sout.push_back( *(((char*)buf)+i) );
                        fwrite(buf, sizeof(char), err, tempfile_fp);
                }
        } while (err > 0);
 
-       err = unzCloseCurrentFile (uf);  // close the zipfile
-       if (err!=UNZ_OK) {
+       err = unzCloseCurrentFile(uf);  // close the zipfile
+       if (err != UNZ_OK)
                SETTING_TRACE("Error %d with zipfile %s in unzCloseCurrentFile", err, zipFile);
-       }
 
        free(buf); // free up buffer memory
 
-       fclose(tempfile_fp); // close temp file 
+       fclose(tempfile_fp); // close temp file
 
        return 0;
 }
@@ -235,13 +234,13 @@ static void __main_license_clicked(void *data)
 
 #if SUPPORT_COMPRESSED_LICENSE
        ret = readZipFile("/usr/share/license.zip", "license.html");
-       if(ret != 0){
+       if (ret != 0) {
                app_control_destroy(svc);
                return;
        }
 
        // set path of license.html
-       snprintf(tempfilename,256, "file://%s/license.html", UNCOMPRESSEDFILE_DIR);
+       snprintf(tempfilename, 256, "file://%s/license.html", UNCOMPRESSEDFILE_DIR);
        app_control_add_extra_data(svc, "file", tempfilename);
 #else
        app_control_add_extra_data(svc, "file",

diff --git a/setting-network/src/setting-network-mode.c b/setting-network/src/setting-network-mode.c
old mode 100644 (file)
new mode 100755 (executable)
index c05c548..c7e052e
--- a/setting-network/src/setting-network-mode.c
+++ b/setting-network/src/setting-network-mode.c
@@ -283,9 +283,8 @@ static void _show_switch_mobile_network_popup_cb(void *data, Evas_Object *obj, v
        Evas_Object *btn = elm_object_part_content_get(s_info.popup, _("button2"));
        SETTING_TRACE_DEBUG("SWITCH POPUP CLICK, parent=%s, btn=%s", evas_object_type_get(s_info.popup), evas_object_type_get(btn));
 
-       if (obj == btn) {
+       if (obj == btn)
                SETTING_TRACE_DEBUG("++++++++++++++++++++ SWITCH NETWORK ++++++++++++++++++++");
-       }
 
        _change_band_current_card(switch_current_to);
        _change_second_card(switch_current_to == TAPI_NETWORK_MODE_GSM ? TAPI_NETWORK_MODE_WCDMA : TAPI_NETWORK_MODE_GSM);

diff --git a/setting-privacy/src/setting-privacy-main.c b/setting-privacy/src/setting-privacy-main.c
index b10c1daf1e4c1d85a917dc8e811365e0e7a47aa1..84c10957695c287a8906529b536cca8688dcd79b 100755 (executable)
--- a/setting-privacy/src/setting-privacy-main.c
+++ b/setting-privacy/src/setting-privacy-main.c
@@ -118,7 +118,7 @@ static void _vconf_changed_cb(keynode_t *key, void *data)
 
                FREE(ad->encryption_device->keyStr);
                FREE(ad->encryption_device->sub_desc);
-               ad->encryption_device->keyStr= strdup(keystr);
+               ad->encryption_device->keyStr = strdup(keystr);
                ad->encryption_device->sub_desc = strdup(sub_desc);
                elm_object_item_data_set(ad->encryption_device->item,
                                ad->encryption_device);
@@ -137,7 +137,7 @@ static void _vconf_changed_cb(keynode_t *key, void *data)
 
                FREE(ad->encryption_sdcard->keyStr);
                FREE(ad->encryption_sdcard->sub_desc);
-               ad->encryption_sdcard->keyStr= strdup(keystr);
+               ad->encryption_sdcard->keyStr = strdup(keystr);
                ad->encryption_sdcard->sub_desc = strdup(sub_desc);
                elm_object_item_data_set(ad->encryption_sdcard->item,
                                ad->encryption_sdcard);
@@ -206,7 +206,7 @@ int _generate_genlist(SettingPrivacy *ad)
 
        Evas_Object *scroller = ad->md.genlist;
 
-       char *keystr=0,*sub_desc = 0;
+       char *keystr = 0, *sub_desc = 0;
 
        sub_desc = setting_location_is_enabled(ad);
        ad->location_service = setting_create_Gendial_field_def(scroller,
@@ -249,7 +249,7 @@ int _generate_genlist(SettingPrivacy *ad)
                ad->secure_erase->userdata = ad;
        else
                SETTING_TRACE_ERROR("ad->secure_erase is NULL");
-       
+
 
        /* Encryption */
        setting_create_Gendial_field_titleItem(ad->md.genlist,
@@ -271,7 +271,7 @@ int _generate_genlist(SettingPrivacy *ad)
        if (ad->encryption_device) {
                FREE(ad->encryption_device->keyStr);
                FREE(ad->encryption_device->sub_desc);
-               ad->encryption_device->keyStr= strdup(keystr);
+               ad->encryption_device->keyStr = strdup(keystr);
                ad->encryption_device->sub_desc = strdup(sub_desc);
                ad->encryption_device->userdata = ad;
        } else {
@@ -294,7 +294,7 @@ int _generate_genlist(SettingPrivacy *ad)
        if (ad->encryption_sdcard) {
                FREE(ad->encryption_sdcard->keyStr);
                FREE(ad->encryption_sdcard->sub_desc);
-               ad->encryption_sdcard->keyStr= strdup(keystr);
+               ad->encryption_sdcard->keyStr = strdup(keystr);
                ad->encryption_sdcard->sub_desc = strdup(sub_desc);
                ad->encryption_sdcard->userdata = ad;
        } else {

diff --git a/setting-privacy/src/setting-privacy.c b/setting-privacy/src/setting-privacy.c
index 65a133114d9ae8c499446e9a137f5ec854bd1e6a..77aef7681a1e85e251b3686373c873187f93be12 100755 (executable)
--- a/setting-privacy/src/setting-privacy.c
+++ b/setting-privacy/src/setting-privacy.c
@@ -86,8 +86,7 @@ static void on_app_resume(void *priv)
                elm_object_item_data_set(ad->location_service->item,
                                ad->location_service);
                elm_genlist_item_update(ad->location_service->item);
-       }
-       else if (ad->encryption_device) {
+       } else if (ad->encryption_device) {
                bool is_encrypted = setting_device_is_encrypted();
 
                char *keystr = KeyStr_EncryptDevice;
@@ -99,13 +98,12 @@ static void on_app_resume(void *priv)
 
                FREE(ad->encryption_device->keyStr);
                FREE(ad->encryption_device->sub_desc);
-               ad->encryption_device->keyStr= strdup(keystr);
+               ad->encryption_device->keyStr = strdup(keystr);
                ad->encryption_device->sub_desc = strdup(sub_desc);
                elm_object_item_data_set(ad->encryption_device->item,
                                ad->encryption_device);
                elm_genlist_item_update(ad->encryption_device->item);
-       }
-       else if (ad->encryption_sdcard) {
+       } else if (ad->encryption_sdcard) {
                bool is_encrypted = setting_sdcard_is_encrypted();
 
                char *keystr = KeyStr_EncryptSDcard;
@@ -117,7 +115,7 @@ static void on_app_resume(void *priv)
 
                FREE(ad->encryption_sdcard->keyStr);
                FREE(ad->encryption_sdcard->sub_desc);
-               ad->encryption_sdcard->keyStr= strdup(keystr);
+               ad->encryption_sdcard->keyStr = strdup(keystr);
                ad->encryption_sdcard->sub_desc = strdup(sub_desc);
                elm_object_item_data_set(ad->encryption_sdcard->item,
                                ad->encryption_sdcard);

diff --git a/setting-profile/src/setting-profile-sound-main.c b/setting-profile/src/setting-profile-sound-main.c
index f34f40acadf248216ba04a3da6680f2bd7b9ebbc..33e9acb45524c105c1c03deb8846131b06a684fc 100755 (executable)
--- a/setting-profile/src/setting-profile-sound-main.c
+++ b/setting-profile/src/setting-profile-sound-main.c
@@ -195,11 +195,10 @@ const char *setting_do_not_disturb_is_enable(void *data)
        SETTING_TRACE("do_not_disturb: %d", do_not_disturb);
 
        notification_system_setting_free_system_setting(system_setting);
-       if (1 == do_not_disturb) {
+       if (1 == do_not_disturb)
                return "IDS_ST_BODY_ON";
-       } else {
+       else
                return "IDS_ST_BODY_ALERTTYPE_OFF";
-       }
 }
 
 const char *setting_notifiaction_on_lock_screen(void *data)

diff --git a/setting-smartmanager/smartmanager-data/include/smartmanager-data.h b/setting-smartmanager/smartmanager-data/include/smartmanager-data.h
old mode 100644 (file)
new mode 100755 (executable)
index 69edca5..a6fea33
--- a/setting-smartmanager/smartmanager-data/include/smartmanager-data.h
+++ b/setting-smartmanager/smartmanager-data/include/smartmanager-data.h
@@ -89,10 +89,10 @@ typedef struct {
        Eina_List *wifi_apps;
 
        /* Main view data: */
-       Ecore_Timer *main_view_update_timer; /* This timer schedules an update
-                                                                                * for the progress bar item and apps
-                                                                                * list.
-                                                                                */
+       Ecore_Timer *main_view_update_timer;    /* This timer schedules an update
+                                                                                       * for the progress bar item and apps
+                                                                                       * list.
+                                                                                       */
        mv_update_type main_view_update_type;
        setting_view *main_view;
        Elm_Gen_Item_Class gl_header_itc;

diff --git a/setting-smartmanager/smartmanager-data/src/smartmanager-data-main-view.c b/setting-smartmanager/smartmanager-data/src/smartmanager-data-main-view.c
old mode 100644 (file)
new mode 100755 (executable)
index 0f7ebc5..de3bdf7
--- a/setting-smartmanager/smartmanager-data/src/smartmanager-data-main-view.c
+++ b/setting-smartmanager/smartmanager-data/src/smartmanager-data-main-view.c
@@ -376,12 +376,10 @@ static Eina_Bool _update_timer_cb(void *data)
 
        item = elm_toolbar_selected_item_get(ad->toolbar);
 
-       if (item == ad->toolbar_item_sim_1 || item == ad->toolbar_item_sim_2) {
+       if (item == ad->toolbar_item_sim_1 || item == ad->toolbar_item_sim_2)
                smartmanager_stc_get_sim_total_and_apps_data();
-       }
-       if (item == ad->toolbar_item_wifi) {
+       if (item == ad->toolbar_item_wifi)
                smartmanager_stc_get_wifi_total_and_apps_data();
-       }
 
        return ECORE_CALLBACK_RENEW;
 }

diff --git a/setting-smartmanager/smartmanager-data/src/smartmanager-data-usage-mobile-settings.c b/setting-smartmanager/smartmanager-data/src/smartmanager-data-usage-mobile-settings.c
old mode 100644 (file)
new mode 100755 (executable)
index 2fd7176..9cb79d7
--- a/setting-smartmanager/smartmanager-data/src/smartmanager-data-usage-mobile-settings.c
+++ b/setting-smartmanager/smartmanager-data/src/smartmanager-data-usage-mobile-settings.c
@@ -347,9 +347,8 @@ static stc_callback_ret_e _get_and_unset_limit_restrictions_cb(stc_error_e resul
                return STC_CALLBACK_CONTINUE;
        }
 
-       if (iface_type != STC_IFACE_DATACALL) {
+       if (iface_type != STC_IFACE_DATACALL)
                return STC_CALLBACK_CONTINUE;
-       }
 
        ret = stc_restriction_info_get_imsi(info, &imsi);
        if (STC_ERROR_NONE != ret) {
@@ -465,11 +464,10 @@ static void _popup_done_cb(void *data, Evas_Object *obj, void *event_info)
                create_toast_popup(limit_popup_data->popup,
                                "Value must be lower than limit value");
        } else {
-               if (limit_popup_data->element_type == ELEMENT_TYPE_WARNING) {
+               if (limit_popup_data->element_type == ELEMENT_TYPE_WARNING)
                        limit_popup_data->smd->selected_sim_limits->warning = (int64_t)value;
-               } else if (limit_popup_data->element_type == ELEMENT_TYPE_LIMIT) {
+               else if (limit_popup_data->element_type == ELEMENT_TYPE_LIMIT)
                        limit_popup_data->smd->selected_sim_limits->limit = (int64_t)value;
-               }
 
                evas_object_del(limit_popup_data->popup);
        }
@@ -1084,9 +1082,8 @@ static void _radio_cycle_selected_cb(void *data, Evas_Object *obj, void *event_i
 
        complement_data_usage_mobile_genlist(item_data->smd->mobile_data_setting_genlist, item_data->smd);
 
-       if (item_data->smd->selected_sim_limits->cycle_mode == CYCLE_MODE_CUSTOM) {
+       if (item_data->smd->selected_sim_limits->cycle_mode == CYCLE_MODE_CUSTOM)
                _create_custom_cycle_popup(item_data->smd, "Set data usage cycle", item_data->smd->selected_sim_limits->custom_mode_interval);
-       }
 
        evas_object_del(item_data->popup);
 
@@ -1174,9 +1171,8 @@ void _radio_cycle_list_item_selected_cb(void *data, Evas_Object *obj, void *even
 
        complement_data_usage_mobile_genlist(item_data->smd->mobile_data_setting_genlist, item_data->smd);
 
-       if (item_data->smd->selected_sim_limits->cycle_mode == CYCLE_MODE_CUSTOM) {
+       if (item_data->smd->selected_sim_limits->cycle_mode == CYCLE_MODE_CUSTOM)
                _create_custom_cycle_popup(item_data->smd, "Set data usage cycle", item_data->smd->selected_sim_limits->custom_mode_interval);
-       }
 
        evas_object_del(item_data->popup);
 

diff --git a/setting-smartmanager/smartmanager-data/src/smartmanager-data-usage-wifi-settings.c b/setting-smartmanager/smartmanager-data/src/smartmanager-data-usage-wifi-settings.c
old mode 100644 (file)
new mode 100755 (executable)
index 95a96e9..9ae9681
--- a/setting-smartmanager/smartmanager-data/src/smartmanager-data-usage-wifi-settings.c
+++ b/setting-smartmanager/smartmanager-data/src/smartmanager-data-usage-wifi-settings.c
@@ -338,13 +338,12 @@ static char *_item_label_get(void *data, Evas_Object *obj, const char *part)
        Element *element = (Element *)data;
        retv_if(!element, NULL);
 
-       if (!safeStrCmp(part, "elm.text")) {
+       if (!safeStrCmp(part, "elm.text"))
                return strdup(element->value);
-       } else if (!safeStrCmp(part, "elm.text.sub")) {
+       else if (!safeStrCmp(part, "elm.text.sub"))
                return strdup(element->name);
-       } else {
+       else
                return NULL;
-       }
 }
 
 static void _item_selected_cb(void *data, Evas_Object *obj, void *event_info)
@@ -372,11 +371,10 @@ static char *_last_item_label_get(void *data, Evas_Object *obj,
        Element *element = (Element *)data;
        retv_if(!element, NULL);
 
-       if (!safeStrCmp(part, "elm.text.multiline")) {
+       if (!safeStrCmp(part, "elm.text.multiline"))
                return strdup(element->value);
-       } else {
+       else
                return NULL;
-       }
 }
 
 static char *_radio_item_label_get(void *data, Evas_Object *obj,
@@ -384,9 +382,8 @@ static char *_radio_item_label_get(void *data, Evas_Object *obj,
 {
        Radio_Item_Data *radio_item_data = (Radio_Item_Data *)data;
        retv_if(!radio_item_data, NULL);
-       if (!safeStrCmp(part, "elm.text")) {
+       if (!safeStrCmp(part, "elm.text"))
                return strdup(radio_item_data->desc_str);
-       }
 
        return NULL;
 }
@@ -426,9 +423,8 @@ static Evas_Object *_radio_item_content_get(void *data, Evas_Object *glist,
        Radio_Item_Data *radio_item_data = (Radio_Item_Data *)data;
        retv_if(!radio_item_data, NULL);
 
-       if (!safeStrCmp(part, "elm.swallow.end")) {
+       if (!safeStrCmp(part, "elm.swallow.end"))
                return create_radio(radio_item_data->smd, glist, radio_item_data);
-       }
 
        return NULL;
 }

diff --git a/setting-smartmanager/smartmanager-data/src/smartmanager-utils.c b/setting-smartmanager/smartmanager-data/src/smartmanager-utils.c
old mode 100644 (file)
new mode 100755 (executable)
index 6ab3b03..d4a2d1d
--- a/setting-smartmanager/smartmanager-data/src/smartmanager-utils.c
+++ b/setting-smartmanager/smartmanager-data/src/smartmanager-utils.c
@@ -268,9 +268,8 @@ restrictions_result set_mobile_restriction_rule_parameters(
                return RESTRICTIONS_OTHER_ERROR;
        }
 
-       if (limit > MAX_LIMIT_IN_BYTES) {
+       if (limit > MAX_LIMIT_IN_BYTES)
                return RESTRICTIONS_VALUE_HIGHTER_THAN_MAX;
-       }
 
        ret = stc_restriction_rule_set_imsi(rule, imsi);
        if (STC_ERROR_NONE != ret) {
@@ -288,11 +287,10 @@ restrictions_result set_mobile_restriction_rule_parameters(
                return RESTRICTIONS_OTHER_ERROR;
        }
 
-       if (warning_limit > MAX_LIMIT_IN_BYTES) {
+       if (warning_limit > MAX_LIMIT_IN_BYTES)
                return RESTRICTIONS_VALUE_HIGHTER_THAN_MAX;
-       } else if (warning_limit > limit) {
+       else if (warning_limit > limit)
                return RESTRICTIONS_VALUE_HIGHER_THAN_LIMIT;
-       }
 
        ret = stc_restriction_rule_set_warning_limit(rule, warning_limit);
        if (STC_ERROR_NONE != ret) {

diff --git a/setting-storage/src/setting-storage-applications.c b/setting-storage/src/setting-storage-applications.c
index d6663a2546480648846785193e6045b5666bdfe2..24954dfcb8a752c16bd1753df91775205f085450 100755 (executable)
--- a/setting-storage/src/setting-storage-applications.c
+++ b/setting-storage/src/setting-storage-applications.c
@@ -778,19 +778,17 @@ static void __select_all(SettingStorage *ad)
                        removable_count++;
        }
 
-       if (ad->misces_is_select_all) {
+       if (ad->misces_is_select_all)
                ad->misces_checked = removable_count;
-       } else {
+       else
                ad->misces_checked = 0;
-       }
 
-       if (ad->misces_view->is_create) {
+       if (ad->misces_view->is_create)
                storage_update_naviframe_title(ad, _(IDS_ST_BODY_MISCELLANEOUS_FILES),
                                SETTING_STORAGE_STR_SELECT_FILES);
-       } else {
+       else
                storage_update_naviframe_title(ad, _(IDS_ST_BODY_APPLICATION),
                                SETTING_STORAGE_STR_SELECT_APPS);
-       }
 }
 
 static void __select_all_cb(void *data, Evas_Object *obj, void *event_info)

diff --git a/setting-time/src/setting-time-main.c b/setting-time/src/setting-time-main.c
index 09e1a7cbf545ee7dc062b60f6b3c1d82ed0dc437..2c5f91eaf186acbfb212f3edf9c2cd6b710a0fea 100755 (executable)
--- a/setting-time/src/setting-time-main.c
+++ b/setting-time/src/setting-time-main.c
@@ -333,9 +333,8 @@ static void setting_time_main_bool_vconf_change_cb(keynode_t *key, void *data)
                                                                                                EINA_FALSE);
                                }
                        } else {
-                               if (ad->data_tz) {
+                               if (ad->data_tz)
                                        elm_object_item_disabled_set(ad->data_tz->item, EINA_TRUE);
-                               }
 
                                if (ad->data_time) {
                                        ad->data_time->isItemDisableFlag = FALSE;
@@ -376,33 +375,23 @@ static void __sim_time_info_chg_cb(keynode_t *key, void *data)
                                                                &t_offset);
                        char *tzpath = vconf_get_str(VCONFKEY_TELEPHONY_NITZ_ZONE);
                        if (ret != 0 || isEmptyStr(tzpath)) {
-                               if (ad->data_auto) {
-                                       elm_object_item_disabled_set(ad->data_auto->item,
-                                                                                               EINA_TRUE);
+                               if (ad->data_auto)
+                                       elm_object_item_disabled_set(ad->data_auto->item, EINA_TRUE);
+                               if (ad->data_tz)
+                                       elm_object_item_disabled_set(ad->data_tz->item, EINA_FALSE);
+                               if (ad->data_time)
+                                       elm_object_item_disabled_set(ad->data_time->item, EINA_FALSE);
 
-                               }
-                               if (ad->data_tz) {
-                                       elm_object_item_disabled_set(ad->data_tz->item,
-                                                                                               EINA_FALSE);
-                               }
-                               if (ad->data_time) {
-                                       elm_object_item_disabled_set(ad->data_time->item,
-                                                                                               EINA_FALSE);
-                               }
                                return;
                        }
                        FREE(tzpath);
 
-                       if (ad->data_auto) {
-                               elm_object_item_disabled_set(ad->data_auto->item,
-                                                                                       EINA_FALSE);
-                       }
-                       if (ad->data_tz) {
+                       if (ad->data_auto)
+                               elm_object_item_disabled_set(ad->data_auto->item, EINA_FALSE);
+                       if (ad->data_tz)
                                elm_object_item_disabled_set(ad->data_tz->item, EINA_TRUE);
-                       }
-                       if (ad->data_time) {
+                       if (ad->data_time)
                                elm_object_item_disabled_set(ad->data_time->item, EINA_TRUE);
-                       }
 
                        __update_time_via_sim_card(ad);
                }