From 5f1d7039c1d7a32e818d081b577cda25565af9f6 Mon Sep 17 00:00:00 2001 From: wangyongzhong2 Date: Wed, 6 Mar 2024 10:46:24 +0800 Subject: [PATCH] modify hilog Signed-off-by: wangyongzhong2 --- frameworks/datatransmitmgr/dev_slinfo_log.c | 58 ------------------- interfaces/innerkits/datatransmitmgr/BUILD.gn | 1 - .../datatransmitmgr/include/dev_slinfo_log.h | 42 ++++---------- 3 files changed, 12 insertions(+), 89 deletions(-) delete mode 100644 frameworks/datatransmitmgr/dev_slinfo_log.c diff --git a/frameworks/datatransmitmgr/dev_slinfo_log.c b/frameworks/datatransmitmgr/dev_slinfo_log.c deleted file mode 100644 index a8cbc29..0000000 --- a/frameworks/datatransmitmgr/dev_slinfo_log.c +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (C) 2023 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "dev_slinfo_log.h" - -#include -#include "securec.h" - -static void DataSlPrint(const char *buf, DataSlLogLevel level) -{ - switch (level) { - case LOG_LEVEL_DEBUG: - DataSl_LOG_DEBUG(buf); - break; - case LOG_LEVEL_INFO: - DataSl_LOG_INFO(buf); - break; - case LOG_LEVEL_WARN: - DataSl_LOG_WARN(buf); - break; - case LOG_LEVEL_ERROR: - DataSl_LOG_ERROR(buf); - break; - default: - break; - } -} - -void DataSlLogPrint(DataSlLogLevel level, const char *funName, const char *fmt, ...) -{ - int32_t ulPos = 0; - char outStr[LOG_PRINT_MAX_LEN] = {0}; - int32_t ret = sprintf_s(outStr, sizeof(outStr), "%s: ", funName); - if (ret < 0) { - return; - } - ulPos = strlen(outStr); - va_list arg; - va_start(arg, fmt); - ret = vsprintf_s(&outStr[ulPos], sizeof(outStr) - ulPos, fmt, arg); - va_end(arg); - if (ret < 0) { - return; - } - DataSlPrint(outStr, level); -} diff --git a/interfaces/innerkits/datatransmitmgr/BUILD.gn b/interfaces/innerkits/datatransmitmgr/BUILD.gn index a956418..98cfadb 100644 --- a/interfaces/innerkits/datatransmitmgr/BUILD.gn +++ b/interfaces/innerkits/datatransmitmgr/BUILD.gn @@ -31,7 +31,6 @@ ohos_shared_library("data_transit_mgr") { sources = [ "../../../frameworks/datatransmitmgr/dev_slinfo_adpt.c", "../../../frameworks/datatransmitmgr/dev_slinfo_list.c", - "../../../frameworks/datatransmitmgr/dev_slinfo_log.c", "../../../frameworks/datatransmitmgr/dev_slinfo_mgr.c", ] diff --git a/interfaces/innerkits/datatransmitmgr/include/dev_slinfo_log.h b/interfaces/innerkits/datatransmitmgr/include/dev_slinfo_log.h index f726e60..be4a6d6 100644 --- a/interfaces/innerkits/datatransmitmgr/include/dev_slinfo_log.h +++ b/interfaces/innerkits/datatransmitmgr/include/dev_slinfo_log.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2023 Huawei Device Co., Ltd. + * Copyright (C) 2022-2024 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,42 +16,24 @@ #ifndef DEV_SLINFO_LOG_H #define DEV_SLINFO_LOG_H -#define LOG_PRINT_MAX_LEN 1024 - -typedef enum { - LOG_LEVEL_DEBUG = 0, - LOG_LEVEL_INFO = 1, - LOG_LEVEL_WARN = 2, - LOG_LEVEL_ERROR = 3 -} DataSlLogLevel; - -#ifdef __cplusplus -extern "C" { -#endif - -void DataSlLogPrint(DataSlLogLevel level, const char *funName, const char *fmt, ...); - -#ifdef __cplusplus -} -#endif - #ifdef HILOG_ENABLE #include "hilog/log.h" -#ifndef DATASL_LOG_DOMAIN -#define DATASL_LOG_DOMAIN 0xD002F04 +#ifdef LOG_TAG +#undef LOG_TAG #endif +#define LOG_TAG "DataSl" -#define DATA_SEC_LOG_DEBUG(fmt, ...) (DataSlLogPrint(LOG_LEVEL_DEBUG, __FUNCTION__, fmt, ##__VA_ARGS__)) -#define DATA_SEC_LOG_INFO(fmt, ...) (DataSlLogPrint(LOG_LEVEL_INFO, __FUNCTION__, fmt, ##__VA_ARGS__)) -#define DATA_SEC_LOG_WARN(fmt, ...) (DataSlLogPrint(LOG_LEVEL_WARN, __FUNCTION__, fmt, ##__VA_ARGS__)) -#define DATA_SEC_LOG_ERROR(fmt, ...) (DataSlLogPrint(LOG_LEVEL_ERROR, __FUNCTION__, fmt, ##__VA_ARGS__)) +#ifdef LOG_DOMAIN +#undef LOG_DOMAIN +#endif +#define LOG_DOMAIN 0xD002F04 -#define DataSl_LOG_DEBUG(buf) HiLogPrint(LOG_CORE, LOG_DEBUG, DATASL_LOG_DOMAIN, "[DataSl]", "%{public}s", buf) -#define DataSl_LOG_INFO(buf) HiLogPrint(LOG_CORE, LOG_INFO, DATASL_LOG_DOMAIN, "[DataSl]", "%{public}s", buf) -#define DataSl_LOG_WARN(buf) HiLogPrint(LOG_CORE, LOG_WARN, DATASL_LOG_DOMAIN, "[DataSl]", "%{public}s", buf) -#define DataSl_LOG_ERROR(buf) HiLogPrint(LOG_CORE, LOG_ERROR, DATASL_LOG_DOMAIN, "[DataSl]", "%{public}s", buf) +#define DATA_SEC_LOG_DEBUG(fmt, ...) HILOG_DEBUG(LOG_CORE, fmt, ##__VA_ARGS__) +#define DATA_SEC_LOG_INFO(fmt, ...) HILOG_INFO(LOG_CORE, fmt, ##__VA_ARGS__) +#define DATA_SEC_LOG_WARN(fmt, ...) HILOG_WARN(LOG_CORE, fmt, ##__VA_ARGS__) +#define DATA_SEC_LOG_ERROR(fmt, ...) HILOG_ERROR(LOG_CORE, fmt, ##__VA_ARGS__) #else -- Gitee