From 9a09efc5721b911051f7a1ba9e36c5074df9f0e6 Mon Sep 17 00:00:00 2001 From: yijian Date: Sat, 12 Feb 2022 11:39:33 +0800 Subject: [PATCH] remove the duplicate define __FILENAME__ Signed-off-by: yijian --- services/include/log.h | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/services/include/log.h b/services/include/log.h index a771dfc5..db1322ef 100644 --- a/services/include/log.h +++ b/services/include/log.h @@ -23,16 +23,14 @@ #define LOG_DOMAIN 0xD00430A #define LOG_TAG "FileManagerment:FMS" -#define __FILENAME__ (__builtin_strrchr(__FILE__, '/') ? __builtin_strrchr(__FILE__, '/') + 1 : __FILE__) - #define DEBUG_LOG(fmt, args...) \ - HILOG_DEBUG(LOG_CORE, "{%{public}s()-%{public}s:%{public}d} " fmt, __FUNCTION__, __FILENAME__, __LINE__, ##args) + HILOG_DEBUG(LOG_CORE, "{%{public}s():%{public}d} " fmt, __FUNCTION__, __LINE__, ##args) #define ERR_LOG(fmt, args...) \ - HILOG_ERROR(LOG_CORE, "{%{public}s()-%{public}s:%{public}d} " fmt, __FUNCTION__, __FILENAME__, __LINE__, ##args) + HILOG_ERROR(LOG_CORE, "{%{public}s():%{public}d} " fmt, __FUNCTION__, __LINE__, ##args) #define WARNING_LOG(fmt, args...) \ - HILOG_WARN(LOG_CORE, "{%{public}s()-%{public}s:%{public}d} " fmt, __FUNCTION__, __FILENAME__, __LINE__, ##args) + HILOG_WARN(LOG_CORE, "{%{public}s():%{public}d} " fmt, __FUNCTION__, __LINE__, ##args) #define INFO_LOG(fmt, args...) \ - HILOG_INFO(LOG_CORE, "{%{public}s()-%{public}s:%{public}d} " fmt, __FUNCTION__, __FILENAME__, __LINE__, ##args) + HILOG_INFO(LOG_CORE, "{%{public}s():%{public}d} " fmt, __FUNCTION__, __LINE__, ##args) #define FATAL_LOG(fmt, args...) \ - HILOG_FATAL(LOG_CORE, "{%{public}s()-%{public}s:%{public}d} " fmt, __FUNCTION__, __FILENAME__, __LINE__, ##args) -#endif // STORAGE_SERIVCE_INCLUDE_LOG_H \ No newline at end of file + HILOG_FATAL(LOG_CORE, "{%{public}s():%{public}d} " fmt, __FUNCTION__, __LINE__, ##args) +#endif // STORAGE_SERIVCE_INCLUDE_LOG_H -- Gitee