Use OC_LOG_IS_ENABLED instead of OC_DEBUG

iotivity · Dec 18, 2023 · fabe5f4 · fabe5f4
1 parent 78fbef2
commit fabe5f4
Show file tree

Hide file tree

Showing 26 changed files with 319 additions and 318 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -334,14 +334,6 @@ if(OC_PKI_ENABLED)
     endif()
 endif()
 
-if(OC_DEBUG_ENABLED)
-    list(APPEND PRIVATE_COMPILE_DEFINITIONS "OC_DEBUG")
-    if(BUILD_MBEDTLS)
-        list(APPEND MBEDTLS_COMPILE_DEFINITIONS "OC_DEBUG")
-    endif()
-    list(APPEND TEST_COMPILE_DEFINITIONS "OC_DEBUG")
-endif()
-
 if(OC_CLOUD_ENABLED)
     list(APPEND PUBLIC_COMPILE_DEFINITIONS "OC_CLOUD")
     set(OC_TCP_ENABLED ON)

diff --git a/api/cloud/unittest/cloud_manager_test.cpp b/api/cloud/unittest/cloud_manager_test.cpp
@@ -156,13 +156,13 @@ class TestCloudManagerData : public testing::Test {
   static void PrintJson(const oc_rep_t *rep)
   {
     (void)rep;
-#ifdef OC_DEBUG
+#if OC_DBG_IS_ENABLED
     size_t json_size = oc_rep_to_json(rep, nullptr, 0, true);
     std::vector<char> json{};
     json.resize(json_size + 1);
     oc_rep_to_json(rep, &json[0], json.capacity(), true);
     OC_PRINTF("%s", json.data());
-#endif /* OC_DEBUG */
+#endif /* OC_DBG_IS_ENABLED */
   }
 
   oc::oc_rep_unique_ptr GetPayload(const std::string &access_token,

diff --git a/api/oc_push.c b/api/oc_push.c
@@ -49,7 +49,7 @@
 #include <inttypes.h>
 
 // TODO: add push component to logs and use standard logging functions
-#if defined(OC_PUSHDEBUG) || defined(OC_DEBUG)
+#if defined(OC_PUSHDEBUG) || OC_DBG_IS_ENABLED
 #define OC_PUSH_DBG(...) OC_LOG(OC_LOG_LEVEL_DEBUG, __VA_ARGS__)
 #define OC_PUSH_WRN(...) OC_LOG(OC_LOG_LEVEL_WARNING, __VA_ARGS__)
 #define OC_PUSH_ERR(...) OC_LOG(OC_LOG_LEVEL_ERROR, __VA_ARGS__)

diff --git a/api/unittest/ocapitest.cpp b/api/unittest/ocapitest.cpp
@@ -687,14 +687,14 @@ class TestServerClient : public testing::Test {
     auto *code = static_cast<oc_status_t *>(data->user_data);
     memcpy(code, &data->code, sizeof(oc_status_t));
 
-#ifdef OC_DEBUG
+#if OC_DBG_IS_ENABLED
     if (data->payload != nullptr) {
       std::vector<char> json{};
       json.resize(256);
       oc_rep_to_json(data->payload, &json[0], json.capacity(), true);
       OC_PRINTF("%s\n", json.data());
     }
-#endif /* OC_DEBUG */
+#endif /* OC_DBG_IS_ENABLED */
 
     ApiHelper::terminate();
   }

diff --git a/api/unittest/plgdtimetest.cpp b/api/unittest/plgdtimetest.cpp
@@ -656,12 +656,12 @@ addTCPEventCallback(TCPSessionData *tcp_data)
 {
   auto tcp_events = [](const oc_endpoint_t *endpoint, oc_session_state_t state,
                        void *data) {
-#ifdef OC_DEBUG
+#if OC_DBG_IS_ENABLED
     oc_string_t ep_str{};
     oc_endpoint_to_string(endpoint, &ep_str);
     OC_DBG("session event endpoint=%s state=%d", oc_string(ep_str), (int)state);
     oc_free_string(&ep_str);
-#endif /* OC_DEBUG */
+#endif /* OC_DBG_IS_ENABLED */
     auto *tsd = static_cast<TCPSessionData *>(data);
     if ((oc_endpoint_compare(endpoint, tsd->ep) == 0) &&
         (state == OC_SESSION_DISCONNECTED)) {

diff --git a/deps/mbedtls-patch.cmake b/deps/mbedtls-patch.cmake
@@ -55,10 +55,6 @@ set(MBEDTLS_INCLUDE_DIR "${IOTIVITY_SRC_DIR}/deps/mbedtls/include/mbedtls")
 
 if(ENABLE_TESTING OR ENABLE_PROGRAMS)
 	# configure variables for mbedtls_oc_platform-standalone.in
-	if(OC_DEBUG_ENABLED)
-		set(OC_DEBUG_MACRO "#define OC_DEBUG")
-	endif()
-
 	if(OC_LOG_MAXIMUM_LEVEL)
 		set(OC_LOG_MAXIMUM_LEVEL_MACRO "#define OC_LOG_MAXIMUM_LEVEL (${OC_LOG_MAXIMUM_LEVEL})")
 	endif()