CustomEventPublish函数优化

diff --git a/code/sdk/zhihui/utilscpp/custom_utilscpp.cpp b/code/sdk/zhihui/utilscpp/custom_utilscpp.cpp
index 7cc718f..04f6912 100644 (file)
--- a/code/sdk/zhihui/utilscpp/custom_utilscpp.cpp
+++ b/code/sdk/zhihui/utilscpp/custom_utilscpp.cpp
@@ -527,20 +527,20 @@ void uapi_dump_meminfo(void)
 void CustomEventPublish(uint16_t topic, uint8_t *data, uint32_t size) {  
     int32_t ret;  
 
-    BroadcastApi *broadcastApi = NULL;  
-    IUnknown *api = NULL;  
-    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ChargerEventPublish topic=%u!!", topic);  
+    BroadcastApi *broadcastApi = nullptr;  
+    IUnknown *api = nullptr;  
+    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CustomEventPublish topic=%u!!", topic);  
 
     void *publishData = nullptr;  
     if (size > 0) {  
         publishData = malloc(size);  
         if (publishData == nullptr) {  
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ChargerEventPublish malloc failed! size = %u", size);  
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CustomEventPublish malloc failed! size = %u", size);  
             return;  
         }  
         ret = memcpy_s(publishData, size, (const void *)data, size);  
         if (ret != EOK) {  
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ChargerEventPublish memcpy_s failed! ret = %d", ret);  
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CustomEventPublish memcpy_s failed! ret = %d", ret);  
             free(publishData);  
             return;  
         }  
@@ -550,14 +550,14 @@ void CustomEventPublish(uint16_t topic, uint8_t *data, uint32_t size) {
 
     /* public request */  
     api = SAMGR_GetInstance()->GetFeatureApi(BROADCAST_SERVICE_NAME, BROADCAST_FEATURE_NAME);  
-    if (api == NULL) {  
+    if (api == nullptr) {  
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "GetFeatureApi failed for service: %s, feature: %s", BROADCAST_SERVICE_NAME, BROADCAST_FEATURE_NAME);  
         free(publishData);  
         return;  
     }  
 
     ret = api->QueryInterface(api, DEFAULT_VERSION, (void **)&broadcastApi);  
-    if (ret != 0 || broadcastApi == NULL) {  
+    if (ret != 0 || broadcastApi == nullptr) {  
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "QueryInterface failed! ret = %d, api = %p", ret, api);  
         free(publishData);  
         return;  
@@ -569,10 +569,8 @@ void CustomEventPublish(uint16_t topic, uint8_t *data, uint32_t size) {
     }  
 
     broadcastApi->Release((IUnknown *)broadcastApi);  
-    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CustomEventPublish end!!");  
+    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "CustomEventPublish end!!");  
 
-    // // 释放内存  
-    // free(publishData);  
     return;  
 }