From eac8ffac7d0c851eae9adceef9265c740f6fc6ae Mon Sep 17 00:00:00 2001 From: houpengfei Date: Thu, 24 Mar 2022 10:03:22 +0000 Subject: [PATCH] Signed-off-by:hhh2 Signed-off-by: houpengfei Change-Id: Iabd0182c01e96c537967cb43649fd20359037197 --- .../miscdevice/src/light_service_client.cpp | 2 +- utils/include/miscdevice_log.h | 8 ++--- utils/include/sensors_errors.h | 32 +++++++++---------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/frameworks/native/miscdevice/src/light_service_client.cpp b/frameworks/native/miscdevice/src/light_service_client.cpp index ffd6c3f..4d5072d 100644 --- a/frameworks/native/miscdevice/src/light_service_client.cpp +++ b/frameworks/native/miscdevice/src/light_service_client.cpp @@ -54,7 +54,7 @@ int32_t LightServiceClient::InitServiceClient() } return ERR_OK; } - MISC_LOGW("get service failed, retry : %{public}d", retry); + MISC_HILOGW("get service failed, retry : %{public}d", retry); std::this_thread::sleep_for(std::chrono::milliseconds(WAIT_MS)); retry++; } diff --git a/utils/include/miscdevice_log.h b/utils/include/miscdevice_log.h index 1a4b298..fa3e8f2 100755 --- a/utils/include/miscdevice_log.h +++ b/utils/include/miscdevice_log.h @@ -33,16 +33,16 @@ constexpr uint32_t MISC_LOG_DOMAIN = 0xD002800; #define MISC_FUNC_INFO __FUNCTION__, __LINE__ #endif -#define MISC_LOGD(fmt, ...) do { \ +#define MISC_HILOGD(fmt, ...) do { \ OHOS::HiviewDFX::HiLog::Debug(LABEL, MISC_FUNC_FMT fmt, MISC_FUNC_INFO, ##__VA_ARGS__); \ } while (0) -#define MISC_LOGI(fmt, ...) do { \ +#define MISC_HILOGI(fmt, ...) do { \ OHOS::HiviewDFX::HiLog::Info(LABEL, MISC_FUNC_FMT fmt, MISC_FUNC_INFO, ##__VA_ARGS__); \ } while (0) -#define MISC_LOGW(fmt, ...) do { \ +#define MISC_HILOGW(fmt, ...) do { \ OHOS::HiviewDFX::HiLog::Warn(LABEL, MISC_FUNC_FMT fmt, MISC_FUNC_INFO, ##__VA_ARGS__); \ } while (0) -#define MISC_LOGE(fmt, ...) do { \ +#define MISC_HILOGE(fmt, ...) do { \ OHOS::HiviewDFX::HiLog::Error(LABEL, MISC_FUNC_FMT fmt, MISC_FUNC_INFO, ##__VA_ARGS__); \ } while (0) #define MISC_LOGF(fmt, ...) do { \ diff --git a/utils/include/sensors_errors.h b/utils/include/sensors_errors.h index 45f027f..508f44d 100644 --- a/utils/include/sensors_errors.h +++ b/utils/include/sensors_errors.h @@ -102,7 +102,7 @@ private: #define CHKPL(cond, ...) \ do { \ if ((cond) == nullptr) { \ - MISC_LOGE("%{public}s, (%{public}d), CHKPL(%{public}s) is null, do nothing", \ + MISC_HILOGE("%{public}s, (%{public}d), CHKPL(%{public}s) is null, do nothing", \ __FILE__, __LINE__, #cond); \ } \ } while (0) @@ -110,7 +110,7 @@ private: #define CHKPV(cond) \ do { \ if ((cond) == nullptr) { \ - MISC_LOGE("%{public}s, (%{public}d), CHKPV(%{public}s) is null", \ + MISC_HILOGE("%{public}s, (%{public}d), CHKPV(%{public}s) is null", \ __FILE__, __LINE__, #cond); \ return; \ } \ @@ -119,7 +119,7 @@ private: #define CHKPF(cond) \ do { \ if ((cond) == nullptr) { \ - MISC_LOGE("%{public}s, (%{public}d), CHKPF(%{public}s) is null", \ + MISC_HILOGE("%{public}s, (%{public}d), CHKPF(%{public}s) is null", \ __FILE__, __LINE__, #cond); \ return false; \ } \ @@ -128,7 +128,7 @@ private: #define CHKPC(cond) \ { \ if ((cond) == nullptr) { \ - MISC_LOGE("%{public}s, (%{public}d), CHKPC(%{public}s) is null, skip then continue", \ + MISC_HILOGE("%{public}s, (%{public}d), CHKPC(%{public}s) is null, skip then continue", \ __FILE__, __LINE__, #cond); \ continue; \ } \ @@ -137,7 +137,7 @@ private: #define CHKPB(cond) \ { \ if ((cond) == nullptr) { \ - MISC_LOGE("%{public}s, (%{public}d), CHKPC(%{public}s) is null, skip then break", \ + MISC_HILOGE("%{public}s, (%{public}d), CHKPC(%{public}s) is null, skip then break", \ __FILE__, __LINE__, #cond); \ break; \ } \ @@ -146,7 +146,7 @@ private: #define CHKPR(cond, r) \ do { \ if ((cond) == nullptr) { \ - MISC_LOGE("%{public}s, (%{public}d), CHKPR(%{public}s) is null, return value is %{public}d", \ + MISC_HILOGE("%{public}s, (%{public}d), CHKPR(%{public}s) is null, return value is %{public}d", \ __FILE__, __LINE__, #cond, r); \ return r; \ } \ @@ -155,7 +155,7 @@ private: #define CHKPP(cond) \ do { \ if ((cond) == nullptr) { \ - MISC_LOGE("%{public}s, (%{public}d), CHKPP(%{public}s) is null, return value is null", \ + MISC_HILOGE("%{public}s, (%{public}d), CHKPP(%{public}s) is null, return value is null", \ __FILE__, __LINE__, #cond); \ return nullptr; \ } \ @@ -164,7 +164,7 @@ private: #define CK(cond, ec) \ do { \ if (!(cond)) { \ - MISC_LOGE("%{public}s, (%{public}d), CK(%{public}s), errCode:%{public}d", \ + MISC_HILOGE("%{public}s, (%{public}d), CK(%{public}s), errCode:%{public}d", \ __FILE__, __LINE__, #cond, ec); \ } \ } while (0) @@ -173,14 +173,14 @@ private: #define CHKPL(cond) \ do { \ if ((cond) == nullptr) { \ - MISC_LOGE("CHKPL(%{public}s) is null, do nothing", #cond); \ + MISC_HILOGE("CHKPL(%{public}s) is null, do nothing", #cond); \ } \ } while (0) #define CHKPV(cond) \ do { \ if ((cond) == nullptr) { \ - MISC_LOGE("CHKPV(%{public}s) is null", #cond); \ + MISC_HILOGE("CHKPV(%{public}s) is null", #cond); \ return; \ } \ } while (0) @@ -188,7 +188,7 @@ private: #define CHKPF(cond) \ do { \ if ((cond) == nullptr) { \ - MISC_LOGE("CHKPF(%{public}s) is null", #cond); \ + MISC_HILOGE("CHKPF(%{public}s) is null", #cond); \ return false; \ } \ } while (0) @@ -196,7 +196,7 @@ private: #define CHKPC(cond) \ { \ if ((cond) == nullptr) { \ - MISC_LOGE("CHKPC(%{public}s) is null, skip then continue", #cond); \ + MISC_HILOGE("CHKPC(%{public}s) is null, skip then continue", #cond); \ continue; \ } \ } @@ -204,7 +204,7 @@ private: #define CHKPB(cond) \ { \ if ((cond) == nullptr) { \ - MISC_LOGE("CHKPC(%{public}s) is null, skip then break", #cond); \ + MISC_HILOGE("CHKPC(%{public}s) is null, skip then break", #cond); \ break; \ } \ } @@ -212,7 +212,7 @@ private: #define CHKPR(cond, r) \ do { \ if ((cond) == nullptr) { \ - MISC_LOGE("CHKPR(%{public}s) is null, return value is %{public}d", #cond, r); \ + MISC_HILOGE("CHKPR(%{public}s) is null, return value is %{public}d", #cond, r); \ return r; \ } \ } while (0) @@ -220,7 +220,7 @@ private: #define CHKPP(cond) \ do { \ if ((cond) == nullptr) { \ - MISC_LOGE("CHKPP(%{public}s) is null, return value is null", #cond); \ + MISC_HILOGE("CHKPP(%{public}s) is null, return value is null", #cond); \ return nullptr; \ } \ } while (0) @@ -228,7 +228,7 @@ private: #define CK(cond, ec) \ do { \ if (!(cond)) { \ - MISC_LOGE("CK(%{public}s), errCode:%{public}d", #cond, ec); \ + MISC_HILOGE("CK(%{public}s), errCode:%{public}d", #cond, ec); \ } \ } while (0) -- Gitee