From: Youngjae Shin Date: Tue, 10 Mar 2020 07:34:48 +0000 (+0900) Subject: revise NULL pointer to nullptr X-Git-Tag: submit/tizen/20200406.072014~3 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=734d744fc54ce85879b2a28fa6ef186cc77eb50c;p=platform%2Fcore%2Fsystem%2Fmodes-plugins.git revise NULL pointer to nullptr --- diff --git a/unittests/mdsp_test_bt.cpp b/unittests/mdsp_test_bt.cpp index f07937b..18a0abc 100644 --- a/unittests/mdsp_test_bt.cpp +++ b/unittests/mdsp_test_bt.cpp @@ -37,7 +37,7 @@ protected: void TearDown() override { objectDelete(plugin); - plugin = NULL; + plugin = nullptr; g_main_loop_unref(loop); loop = NULL; modes_disconnect(handle); @@ -99,7 +99,7 @@ TEST_F(BtPluginTest, btTest) { int ret; - ASSERT_TRUE(plugin != NULL); + ASSERT_TRUE(nullptr != plugin); ret = plugin->set("power", false, nullptr); EXPECT_EQ(ret, MODES_ERROR_NONE); diff --git a/unittests/mdsp_test_pkg.cpp b/unittests/mdsp_test_pkg.cpp index f8d441b..1f3a9ef 100644 --- a/unittests/mdsp_test_pkg.cpp +++ b/unittests/mdsp_test_pkg.cpp @@ -38,7 +38,7 @@ protected: g_main_loop_unref(loop); loop = NULL; objectDelete(plugin); - plugin = NULL; + plugin = nullptr; } static gboolean pkgPluginIdler(gpointer data) diff --git a/unittests/mdsp_test_wifi.cpp b/unittests/mdsp_test_wifi.cpp index a9152a7..fdb2ff9 100644 --- a/unittests/mdsp_test_wifi.cpp +++ b/unittests/mdsp_test_wifi.cpp @@ -34,7 +34,7 @@ protected: void TearDown() override { objectDelete(plugin); - plugin = NULL; + plugin = nullptr; } Plugin *plugin; @@ -44,7 +44,7 @@ TEST_F(WifiPluginTest, wifiTest) { int ret; - ASSERT_TRUE(plugin != NULL); + ASSERT_TRUE(nullptr != plugin); ret = plugin->set("power", false, nullptr); EXPECT_EQ(ret, MODES_ERROR_NONE); diff --git a/vconf/VconfActionBool.cpp b/vconf/VconfActionBool.cpp index 23209ad..4540990 100644 --- a/vconf/VconfActionBool.cpp +++ b/vconf/VconfActionBool.cpp @@ -83,7 +83,7 @@ int VconfActionBool::parse(const std::string &archive) int VconfActionBool::setChangedCallback(valueChangedCB callback, void *userData) { - RETV_IF(NULL == callback, MODES_ERROR_INVALID_PARAMETER); + RETV_IF(nullptr == callback, MODES_ERROR_INVALID_PARAMETER); int ret = cbHandler.setChangedCB(key, this); if (MODES_ERROR_NONE != ret) { @@ -99,12 +99,12 @@ int VconfActionBool::setChangedCallback(valueChangedCB callback, void *userData) void VconfActionBool::unSetChangedCallback(valueChangedCB callback, void *userData) { - RET_IF(NULL == callback); + RET_IF(nullptr == callback); cbHandler.unSetChangedCB(key); - cbData = NULL; - cb = NULL; + cbData = nullptr; + cb = nullptr; } void VconfActionBool::vconfChangedCB() diff --git a/vconf/VconfActionDbl.cpp b/vconf/VconfActionDbl.cpp index 15bca08..913124f 100644 --- a/vconf/VconfActionDbl.cpp +++ b/vconf/VconfActionDbl.cpp @@ -81,7 +81,7 @@ int VconfActionDbl::parse(const std::string &archive) int VconfActionDbl::setChangedCallback(valueChangedCB callback, void *userData) { - RETV_IF(NULL == callback, MODES_ERROR_INVALID_PARAMETER); + RETV_IF(nullptr == callback, MODES_ERROR_INVALID_PARAMETER); int ret = cbHandler.setChangedCB(key, this); if (MODES_ERROR_NONE != ret) { @@ -97,12 +97,12 @@ int VconfActionDbl::setChangedCallback(valueChangedCB callback, void *userData) void VconfActionDbl::unSetChangedCallback(valueChangedCB callback, void *userData) { - RET_IF(NULL == callback); + RET_IF(nullptr == callback); cbHandler.unSetChangedCB(key); - cbData = NULL; - cb = NULL; + cbData = nullptr; + cb = nullptr; } void VconfActionDbl::vconfChangedCB() diff --git a/vconf/VconfActionInt.cpp b/vconf/VconfActionInt.cpp index 08504f5..268caa2 100644 --- a/vconf/VconfActionInt.cpp +++ b/vconf/VconfActionInt.cpp @@ -81,7 +81,7 @@ int VconfActionInt::parse(const std::string &archive) int VconfActionInt::setChangedCallback(valueChangedCB callback, void *userData) { - RETV_IF(NULL == callback, MODES_ERROR_INVALID_PARAMETER); + RETV_IF(nullptr == callback, MODES_ERROR_INVALID_PARAMETER); int ret = cbHandler.setChangedCB(key, this); if (MODES_ERROR_NONE != ret) { @@ -97,12 +97,12 @@ int VconfActionInt::setChangedCallback(valueChangedCB callback, void *userData) void VconfActionInt::unSetChangedCallback(valueChangedCB callback, void *userData) { - RET_IF(NULL == callback); + RET_IF(nullptr == callback); cbHandler.unSetChangedCB(key); - cbData = NULL; - cb = NULL; + cbData = nullptr; + cb = nullptr; } void VconfActionInt::vconfChangedCB() diff --git a/vconf/VconfActionStr.cpp b/vconf/VconfActionStr.cpp index b483261..67b7db6 100644 --- a/vconf/VconfActionStr.cpp +++ b/vconf/VconfActionStr.cpp @@ -37,7 +37,7 @@ int VconfActionStr::set(const std::string &val) } char *prev = vconf_get_str(key.c_str()); - if (NULL == prev) { + if (nullptr == prev) { ERR("vconf_get_str(%s) Fail()", key.c_str()); return MODES_ERROR_SYSTEM; } diff --git a/wifi/WifiActionPower.cpp b/wifi/WifiActionPower.cpp index 62af0d4..5eda9c8 100644 --- a/wifi/WifiActionPower.cpp +++ b/wifi/WifiActionPower.cpp @@ -78,7 +78,7 @@ int WifiActionPower::parse(const std::string &archive) int WifiActionPower::setChangedCallback(valueChangedCB callback, void *userData) { - RETV_IF(NULL == callback, MODES_ERROR_INVALID_PARAMETER); + RETV_IF(nullptr == callback, MODES_ERROR_INVALID_PARAMETER); int ret = wifi_manager_set_device_state_changed_cb(handle, wifiStateChangedCB, this); if (WIFI_MANAGER_ERROR_NONE != ret) { @@ -94,7 +94,7 @@ int WifiActionPower::setChangedCallback(valueChangedCB callback, void *userData) void WifiActionPower::unSetChangedCallback(valueChangedCB callback, void *userData) { - RET_IF(NULL == callback); + RET_IF(nullptr == callback); int ret = wifi_manager_unset_device_state_changed_cb(handle); if (WIFI_MANAGER_ERROR_NONE != ret) { @@ -102,8 +102,8 @@ void WifiActionPower::unSetChangedCallback(valueChangedCB callback, void *userDa get_error_message(ret)); } - cb = NULL; - cbData = NULL; + cb = nullptr; + cbData = nullptr; } void WifiActionPower::activateCB(wifi_manager_error_e result, void *user_data) @@ -126,7 +126,7 @@ void WifiActionPower::wifiStateChangedCB(wifi_manager_device_state_e state, void { WifiActionPower *action = (WifiActionPower*)userData; - RET_IF(NULL == userData); + RET_IF(nullptr == userData); bool changedVal = action->requestVal; if (state == WIFI_MANAGER_DEVICE_STATE_ACTIVATED)