From 632a3d5aa69ca6aef06dd4cb3fabc702ea1b270f Mon Sep 17 00:00:00 2001
From: gwx1278443 <guoshuai48@h-partners.com>
Date: Mon, 11 Mar 2024 17:45:27 +0800
Subject: [PATCH] =?UTF-8?q?hilopg=E8=BD=BB=E9=87=8F=E5=8C=96=E6=95=B4?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: gwx1278443 <guoshuai48@h-partners.com>
---
 utils/filemgmt_libhilog/filemgmt_libhilog.h | 34 +++++++++++++--------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/utils/filemgmt_libhilog/filemgmt_libhilog.h b/utils/filemgmt_libhilog/filemgmt_libhilog.h
index 5f4c18b87..40f10a8bb 100644
--- a/utils/filemgmt_libhilog/filemgmt_libhilog.h
+++ b/utils/filemgmt_libhilog/filemgmt_libhilog.h
@@ -23,19 +23,19 @@
 namespace OHOS {
 namespace FileManagement {
 
-static constexpr int FILEFS_LOG_DOMAIN = 0xD004388;
-static constexpr HiviewDFX::HiLogLabel FILEMGMT_LOG_LABEL = {LOG_CORE, FILEFS_LOG_DOMAIN, "file_api"};
-
 #if defined __FILE_NAME__
 #define FILEMGMT_FILE_NAME __FILE_NAME__
 #else
-#include <cstring>
 #define FILEMGMT_FILE_NAME (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILE__)
 #endif
 
-#define FILEMGMT_PRINT_LOG(Level, fmt, ...)                                                                     \
-    HiviewDFX::HiLog::Level(FILEMGMT_LOG_LABEL, "[%{public}s:%{public}d->%{public}s] " fmt, FILEMGMT_FILE_NAME, \
-                            __LINE__, __FUNCTION__, ##__VA_ARGS__)
+#ifndef FILEMGMT_LOG_DOMAIN
+#define FILEMGMT_LOG_DOMAIN 0xD004388
+#endif
+
+#undef FILEMGMT_LOG_TAG
+#define FILEMGMT_LOG_TAG "file_api"
+
 
 #ifdef HILOGD
 #undef HILOGD
@@ -57,11 +57,21 @@ static constexpr HiviewDFX::HiLogLabel FILEMGMT_LOG_LABEL = {LOG_CORE, FILEFS_LO
 #undef HILOGI
 #endif
 
-#define HILOGD(fmt, ...) FILEMGMT_PRINT_LOG(Debug, fmt, ##__VA_ARGS__)
-#define HILOGI(fmt, ...) FILEMGMT_PRINT_LOG(Info, fmt, ##__VA_ARGS__)
-#define HILOGW(fmt, ...) FILEMGMT_PRINT_LOG(Warn, fmt, ##__VA_ARGS__)
-#define HILOGE(fmt, ...) FILEMGMT_PRINT_LOG(Error, fmt, ##__VA_ARGS__)
-#define HILOGF(fmt, ...) FILEMGMT_PRINT_LOG(Fatal, fmt, ##__VA_ARGS__)
+#define HILOGF(fmt, ...)            \
+    ((void)HILOG_IMPL(LOG_CORE, LOG_FATAL, FILEMGMT_LOG_DOMAIN, FILEMGMT_LOG_TAG, \
+    "[%{public}s:%{public}d->%{public}s] " fmt, FILEMGMT_FILE_NAME, __LINE__, __FUNCTION__, ##__VA_ARGS__))
+#define HILOGE(fmt, ...)            \
+    ((void)HILOG_IMPL(LOG_CORE, LOG_ERROR, FILEMGMT_LOG_DOMAIN, FILEMGMT_LOG_TAG, \
+    "[%{public}s:%{public}d->%{public}s] " fmt, FILEMGMT_FILE_NAME, __LINE__, __FUNCTION__, ##__VA_ARGS__))
+#define HILOGW(fmt, ...)            \
+    ((void)HILOG_IMPL(LOG_CORE, LOG_WARN, FILEMGMT_LOG_DOMAIN, FILEMGMT_LOG_TAG, \
+    "[%{public}s:%{public}d->%{public}s] " fmt, FILEMGMT_FILE_NAME, __LINE__, __FUNCTION__, ##__VA_ARGS__))
+#define HILOGI(fmt, ...)            \
+    ((void)HILOG_IMPL(LOG_CORE, LOG_INFO, FILEMGMT_LOG_DOMAIN, FILEMGMT_LOG_TAG, \
+    "[%{public}s:%{public}d->%{public}s] " fmt, FILEMGMT_FILE_NAME, __LINE__, __FUNCTION__, ##__VA_ARGS__))
+#define HILOGD(fmt, ...)            \
+    ((void)HILOG_IMPL(LOG_CORE, LOG_DEBUG, FILEMGMT_LOG_DOMAIN, FILEMGMT_LOG_TAG, \
+    "[%{public}s:%{public}d->%{public}s] " fmt, FILEMGMT_FILE_NAME, __LINE__, __FUNCTION__, ##__VA_ARGS__))
 } // namespace FileManagement
 } // namespace OHOS
 
-- 
Gitee