From 851618278f7668ce3dbe602fa179140bf7593708 Mon Sep 17 00:00:00 2001 From: zhaowenli Date: Wed, 6 Mar 2024 02:54:46 +0000 Subject: [PATCH] =?UTF-8?q?hilog=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhaowenli Change-Id: Ie3d9cb0636246b3ff7b7c9d313bc1ce2fd938831 --- frameworks/common/include/sec_comp_log.h | 34 +++++++++++------------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/frameworks/common/include/sec_comp_log.h b/frameworks/common/include/sec_comp_log.h index a366b4e..bc729d9 100644 --- a/frameworks/common/include/sec_comp_log.h +++ b/frameworks/common/include/sec_comp_log.h @@ -19,31 +19,27 @@ #include "hilog/log.h" -#ifndef __cplusplus #undef LOG_DOMAIN #define LOG_DOMAIN 0xD005A05 -#define SC_LOG_DEBUG(fmt, ...) HILOG_DEBUG(LOG_CORE, "[%{public}s]:" fmt, __func__, ##__VA_ARGS__) -#define SC_LOG_INFO(fmt, ...) HILOG_INFO(LOG_CORE, "[%{public}s]:" fmt, __func__, ##__VA_ARGS__) -#define SC_LOG_WARN(fmt, ...) HILOG_WARN(LOG_CORE, "[%{public}s]:" fmt, __func__, ##__VA_ARGS__) -#define SC_LOG_ERROR(fmt, ...) HILOG_ERROR(LOG_CORE, "[%{public}s]:" fmt, __func__, ##__VA_ARGS__) -#define SC_LOG_FATAL(fmt, ...) HILOG_FATAL(LOG_CORE, "[%{public}s]:" fmt, __func__, ##__VA_ARGS__) - -#else - static constexpr unsigned int SECURITY_DOMAIN_SECURITY_COMPONENT = 0xD005A05; -#define SC_LOG_DEBUG(label, fmt, ...) \ - OHOS::HiviewDFX::HiLog::Debug(label, "[%{public}s]:" fmt, __func__, ##__VA_ARGS__) -#define SC_LOG_INFO(label, fmt, ...) OHOS::HiviewDFX::HiLog::Info(label, "[%{public}s]:" fmt, __func__, ##__VA_ARGS__) -#define SC_LOG_WARN(label, fmt, ...) OHOS::HiviewDFX::HiLog::Warn(label, "[%{public}s]:" fmt, __func__, ##__VA_ARGS__) -#define SC_LOG_ERROR(label, fmt, ...) \ - OHOS::HiviewDFX::HiLog::Error(label, "[%{public}s]:" fmt, __func__, ##__VA_ARGS__) -#define SC_LOG_FATAL(label, fmt, ...) \ - OHOS::HiviewDFX::HiLog::Fatal(label, "[%{public}s]:" fmt, __func__, ##__VA_ARGS__) - -#endif // __cplusplus +#define SC_LOG_FATAL(label, fmt, ...) \ + ((void)HILOG_IMPL(label.type, LOG_FATAL, label.domain, label.tag, \ + "[%{public}s:%{public}d]" fmt, __FUNCTION__, __LINE__, ##__VA_ARGS__)) +#define SC_LOG_ERROR(label, fmt, ...) \ + ((void)HILOG_IMPL(label.type, LOG_ERROR, label.domain, label.tag, \ + "[%{public}s:%{public}d]" fmt, __FUNCTION__, __LINE__, ##__VA_ARGS__)) +#define SC_LOG_WARN(label, fmt, ...) \ + ((void)HILOG_IMPL(label.type, LOG_WARN, label.domain, label.tag, \ + "[%{public}s:%{public}d]" fmt, __FUNCTION__, __LINE__, ##__VA_ARGS__)) +#define SC_LOG_INFO(label, fmt, ...) \ + ((void)HILOG_IMPL(label.type, LOG_INFO, label.domain, label.tag, \ + "[%{public}s:%{public}d]" fmt, __FUNCTION__, __LINE__, ##__VA_ARGS__)) +#define SC_LOG_DEBUG(label, fmt, ...) \ + ((void)HILOG_IMPL(label.type, LOG_DEBUG, label.domain, label.tag, \ + "[%{public}s:%{public}d]" fmt, __FUNCTION__, __LINE__, ##__VA_ARGS__)) #else -- Gitee