openharmony/communication_dsoftbus
1
0
Fork 0
mirror of https://gitee.com/openharmony/communication_dsoftbus synced 2024-11-23 08:49:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix:remove code path

Browse Source 
Signed-off-by: fangdong7 <fangdong7@huawei.com>
This commit is contained in:
fangdong7 2024-08-26 12:15:14 +00:00
parent cdc7336ff3
commit f50d1cfbd1
3 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
components/nstackx/nstackx_util/interface/nstackx_log.h
View File

@ -57,13 +57,12 @@ NSTACKX_EXPORT_VARIABLE extern NstakcxLogCallback g_nstackxLogCallBack;
NSTACKX_EXPORT int32_t SetLogCallback(NstakcxLogCallback logCb);
NSTACKX_EXPORT void SetDefaultLogCallback(void);
#define FILE_NAME (__builtin_strrchr("/" __FILE__, '/') + 1)
#define NSTACKX_LOG_COMMON(moduleName, logLevel, moduleDebugLevel, format, ...) \
do { \
if (logLevel <= moduleDebugLevel && g_nstackxLogCallBack != NULL) { \
g_nstackxLogCallBack( \
moduleName, logLevel, "[%s:%d] %s# " format "\n", FILE_NAME, __LINE__, __FUNCTION__, ##__VA_ARGS__); \
} \
#define NSTACKX_LOG_COMMON(moduleName, logLevel, moduleDebugLevel, format, ...) \
do { \
if (logLevel <= moduleDebugLevel && g_nstackxLogCallBack != NULL) { \
g_nstackxLogCallBack(moduleName, logLevel, "%s:[%d] :" format "\n", \
__FUNCTION__, __LINE__, ##__VA_ARGS__); \
} \
} while (0)
#define LOGF(moduleName, format, ...) \

25
core/common/dfx/interface/include/softbus_log.h
View File

@ -42,11 +42,16 @@ extern "C" {
#define NSTACKX_LOG_DOMAIN 0xd0057ff
#define DOMAIN_ID_TEST 0xd000f00
#define FILE_NAME (__builtin_strrchr("/" __FILE__, '/') + 1)
#define FILE_NAME (__builtin_strrchr("/" __FILE_NAME__, '/') + 1)
#ifdef BUILD_VARIANT_ENG
#define FORMAT(fmt) "[%{public}s:%{public}d] %{public}s# " fmt
#else
#define FORMAT(fmt) "%{public}s# " fmt
#endif
/* For inner use only */
#if defined(SOFTBUS_LITEOS_M)
#ifdef BUILD_VARIANT_ENG
#define SOFTBUS_LOGF_INNER(label, fmt, ...) \
HILOG_FATAL(HILOG_MODULE_SOFTBUS, FORMAT(fmt), FILE_NAME, __LINE__, __FUNCTION__, ##__VA_ARGS__)
#define SOFTBUS_LOGE_INNER(label, fmt, ...) \
@ -57,14 +62,32 @@ extern "C" {
HILOG_INFO(HILOG_MODULE_SOFTBUS, FORMAT(fmt), FILE_NAME, __LINE__, __FUNCTION__, ##__VA_ARGS__)
#define SOFTBUS_LOGD_INNER(label, fmt, ...) \
HILOG_DEBUG(HILOG_MODULE_SOFTBUS, FORMAT(fmt), FILE_NAME, __LINE__, __FUNCTION__, ##__VA_ARGS__)
#else
#define SOFTBUS_LOGF_INNER(label, fmt, ...) HILOG_FATAL(HILOG_MODULE_SOFTBUS, FORMAT(fmt), __FUNCTION__, ##__VA_ARGS__)
#define SOFTBUS_LOGE_INNER(label, fmt, ...) HILOG_ERROR(HILOG_MODULE_SOFTBUS, FORMAT(fmt), __FUNCTION__, ##__VA_ARGS__)
#define SOFTBUS_LOGW_INNER(label, fmt, ...) HILOG_WARN(HILOG_MODULE_SOFTBUS, FORMAT(fmt), __FUNCTION__, ##__VA_ARGS__)
#define SOFTBUS_LOGI_INNER(label, fmt, ...) HILOG_INFO(HILOG_MODULE_SOFTBUS, FORMAT(fmt), __FUNCTION__, ##__VA_ARGS__)
#define SOFTBUS_LOGD_INNER(label, fmt, ...) HILOG_DEBUG(HILOG_MODULE_SOFTBUS, FORMAT(fmt), __FUNCTION__, ##__VA_ARGS__)
#endif
#elif defined(SOFTBUS_LITEOS_A)
#ifdef BUILD_VARIANT_ENG
#define SOFTBUS_LOG_INNER(level, label, fmt, ...) \
(void)HiLogPrint( \
LOG_CORE, level, label.domain, label.tag, FORMAT(fmt), FILE_NAME, __LINE__, __FUNCTION__, ##__VA_ARGS__)
#else
#define SOFTBUS_LOG_INNER(level, label, fmt, ...) \
(void)HiLogPrint(LOG_CORE, level, label.domain, label.tag, FORMAT(fmt), __FUNCTION__, ##__VA_ARGS__)
#endif
#else
#ifdef BUILD_VARIANT_ENG
#define SOFTBUS_LOG_INNER(level, label, fmt, ...) \
(void)HILOG_IMPL( \
LOG_CORE, level, label.domain, label.tag, FORMAT(fmt), FILE_NAME, __LINE__, __FUNCTION__, ##__VA_ARGS__)
#else
#define SOFTBUS_LOG_INNER(level, label, fmt, ...) \
(void)HILOG_IMPL( \
LOG_CORE, level, label.domain, label.tag, FORMAT(fmt), __FUNCTION__, ##__VA_ARGS__)
#endif
#endif
typedef struct {

2
dsoftbus.gni
View File

@ -89,6 +89,8 @@ if (defined(ohos_lite)) {
}
}
defines += [ "OPENSSL_NO_FILENAMES" ]
if (defined(global_parts_info) &&
!defined(global_parts_info.distributeddatamgr_kv_store)) {
dsoftbus_feature_lnn_cloud_sync = false