Remove #if 0

Change-Id: Ib904d65ddd2ae65ef541f9f0ad53472a960004c0
Signed-off-by: jinwang.an <jinwang.an@samsung.com>

diff --git a/include/system_settings_private.h b/include/system_settings_private.h
index 57f3406..cd9b254 100644 (file)
--- a/include/system_settings_private.h
+++ b/include/system_settings_private.h
@@ -42,6 +42,7 @@ extern "C"
 
 #define LOG_TAG "SYSTEM-SETTINGS"
 
+/* #define DEBUG_DUMP_CONTEXT */
 #define SYSTEM_SETTINGS_ENABLE_TRACE
 
 #ifdef SYSTEM_SETTINGS_ENABLE_TRACE

diff --git a/src/system_setting_platform.c b/src/system_setting_platform.c
index 4a1f52f..4fa9f82 100644 (file)
--- a/src/system_setting_platform.c
+++ b/src/system_setting_platform.c
@@ -298,14 +298,6 @@ int _is_file_accessible(const char *path)
 #define USR_RINGTONE_FILE_PATH "/home/owner/content/Sounds/Ringtones"
 #define JSONFILE "/opt/home/owner/apps_rw/org.tizen.setting/data/.user-ringtones.json"
 
-#if 0
-static char* _get_json_file_path()
-{
-       // for testing
-       return JSONFILE;
-}
-#endif
-
 int system_setting_add_incoming_call_ringtone(system_settings_key_e key, void *value)
 {
        SETTING_TRACE_BEGIN;
@@ -1636,8 +1628,6 @@ int system_setting_unset_changed_callback_time_changed(system_settings_key_e key
        return system_setting_vconf_unset_changed_cb(VCONFKEY_SYSTEM_TIME_CHANGED, SYSTEM_SETTING_CALLBACK_SLOT_3);
 }
 
-
-
 /* SYSTEM_SETTINGS_KEY_SOUND_LOCK */
 int system_setting_get_sound_lock(system_settings_key_e key, void **value)
 {
@@ -1781,21 +1771,6 @@ int system_setting_unset_changed_callback_sound_touch(system_settings_key_e key)
        return system_setting_vconf_unset_changed_cb(VCONFKEY_SETAPPL_TOUCH_SOUNDS_BOOL, SYSTEM_SETTING_CALLBACK_SLOT_2);
 }
 
-#if 0
-/* SYSTEM_SETTINGS_KEY_SOUND_LOCK */
-int system_setting_get_sound_lock(system_settings_key_e key, void **value)
-{
-       bool vconf_value;
-
-       if (system_setting_vconf_get_value_bool(VCONFKEY_SETAPPL_SOUND_LOCK_BOOL, &vconf_value)) {
-               return SYSTEM_SETTINGS_ERROR_IO_ERROR;
-       }
-       *value = (void *)vconf_value;
-
-       return SYSTEM_SETTINGS_ERROR_NONE;
-}
-#endif
-
 int system_setting_get_auto_rotation_mode(system_settings_key_e key, void **value)
 {
        SETTING_TRACE_BEGIN;
@@ -2131,7 +2106,7 @@ int system_setting_get_ads_id(system_settings_key_e key, void **value)
 }
 
 
-#if 0
+#if DEBUG_DUMP_CONTEXT
 void make_ad_id(void)
 {
        uuid_t uuid_value;

diff --git a/src/system_settings.c b/src/system_settings.c
index e7d6e88..3a4479b 100644 (file)
--- a/src/system_settings.c
+++ b/src/system_settings.c
@@ -1,5 +1,4 @@
-/*
- * Copyright (c) 2011 Samsung Electronics Co., Ltd All Rights Reserved
+/* * Copyright (c) 2011 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Licensed under the Apache License, Version 2.0 (the License);
  * you may not use this file except in compliance with the License.
@@ -616,7 +615,7 @@ system_setting_s system_setting_table[] = {
        }
 };
 
-#if 0
+#if DEBUG_DUMP_CONTEXT
 static void _dump_context()
 {
        int i;
@@ -672,7 +671,7 @@ int system_settings_get_item(system_settings_key_e key, system_setting_h *item)
                LOGE("Enter [%s] catch invalid parameter error (%d) ", __FUNCTION__, key);
                return SYSTEM_SETTINGS_ERROR_INVALID_PARAMETER;
        }
-#if 0
+#if DEBUG_DUMP_CONTEXT
        _dump_context();
 #endif
        int index = 0;

diff --git a/unit_test/src/unit_test.c b/unit_test/src/unit_test.c
index cc55f7d..f0efeae 100644 (file)
--- a/unit_test/src/unit_test.c
+++ b/unit_test/src/unit_test.c
@@ -1794,19 +1794,6 @@ RETTYPE utc_system_settings_set_value_string_n8(void)
        ret = system_settings_get_value_string(SYSTEM_SETTINGS_KEY_DEFAULT_FONT_TYPE, &ret_font);
        assert_eq(ret, SYSTEM_SETTINGS_ERROR_NONE);
        RETURN(0);
-
-#if 0
-       int ret;
-       char *new_font = "DefaultFontName";
-       ret = system_settings_set_value_string(SYSTEM_SETTINGS_KEY_DEFAULT_FONT_TYPE, new_font);
-       //assert_eq(ret, SYSTEM_SETTINGS_ERROR_INVALID_PARAMETER);
-
-       char *ret_font = NULL;
-       ret = system_settings_get_value_string(SYSTEM_SETTINGS_KEY_DEFAULT_FONT_TYPE, &ret_font);
-       int ret2 = my_assert_ret(ret);
-       return ret2;
-       //return;
-#endif
 }