diff --git a/frameworks/include/hilog_wrapper.h b/frameworks/include/hilog_wrapper.h
index b36c3a2d6099e7d0bc342c617e5c1a6094c1624b..ca2c6a0a99a40f18090c1910c207a04290dc8f8c 100644
--- a/frameworks/include/hilog_wrapper.h
+++ b/frameworks/include/hilog_wrapper.h
@@ -28,8 +28,8 @@
 extern "C" {
 #endif // __cplusplus
 
-#define __FILENAME__            (__builtin_strrchr(__FILE__, '/') ? __builtin_strrchr(__FILE__, '/') + 1 : __FILE__)
-#define __FORMATED__(fmt, ...)  "[%s] %s# " fmt, __FILENAME__, __FUNCTION__, ##__VA_ARGS__
+#define FILE_NAME            (__builtin_strrchr(__FILE__, '/') ? __builtin_strrchr(__FILE__, '/') + 1 : __FILE__)
+#define FILE_FORMATED(fmt, ...)  "[%s] %s# " fmt, FILE_NAME, __FUNCTION__, ##__VA_ARGS__
 
 #ifdef POWER_HILOGD
 #undef POWER_HILOGD
@@ -58,11 +58,11 @@ extern "C" {
 #define POWER_HILOGE(...)   HILOG_ERROR(HILOG_MODULE_POWERMGR, __VA_ARGS__)
 #define POWER_HILOGF(...)   HILOG_FATAL(HILOG_MODULE_POWERMGR, __VA_ARGS__)
 #else // !__LITEOS_M__
-#define POWER_HILOGD(...)   HILOG_DEBUG(LOG_CORE, __FORMATED__(__VA_ARGS__))
-#define POWER_HILOGI(...)   HILOG_INFO(LOG_CORE, __FORMATED__(__VA_ARGS__))
-#define POWER_HILOGW(...)   HILOG_WARN(LOG_CORE, __FORMATED__(__VA_ARGS__))
-#define POWER_HILOGE(...)   HILOG_ERROR(LOG_CORE, __FORMATED__(__VA_ARGS__))
-#define POWER_HILOGF(...)   HILOG_FATAL(LOG_CORE, __FORMATED__(__VA_ARGS__))
+#define POWER_HILOGD(...)   HILOG_DEBUG(LOG_CORE, FILE_FORMATED(__VA_ARGS__))
+#define POWER_HILOGI(...)   HILOG_INFO(LOG_CORE, FILE_FORMATED(__VA_ARGS__))
+#define POWER_HILOGW(...)   HILOG_WARN(LOG_CORE, FILE_FORMATED(__VA_ARGS__))
+#define POWER_HILOGE(...)   HILOG_ERROR(LOG_CORE, FILE_FORMATED(__VA_ARGS__))
+#define POWER_HILOGF(...)   HILOG_FATAL(LOG_CORE, FILE_FORMATED(__VA_ARGS__))
 #endif // __LITEOS_M__
 
 #ifdef __cplusplus
diff --git a/frameworks/src/running_lock.c b/frameworks/src/running_lock.c
index 02207173ec3bb5ff1ba392ef8eda921a4f50a738..67030f91f5627ffa712904123173754ab082ec9c 100644
--- a/frameworks/src/running_lock.c
+++ b/frameworks/src/running_lock.c
@@ -87,7 +87,7 @@ static RunningLockEntry *CreateRunningLockEntry(const char *name, RunningLockTyp
     InitIdentity(entry);
     entry->lock.type = type;
     entry->lock.flag = flag;
-    if(strcpy_s(entry->lock.name, sizeof(entry->lock.name), name) != EOK) {
+    if (strcpy_s(entry->lock.name, sizeof(entry->lock.name), name) != EOK) {
         free(entry);
         return NULL;
     }
diff --git a/services/src/power/small/auto_suspend_loop.c b/services/src/power/small/auto_suspend_loop.c
index 78edc85719682b0be4ed2589393929da121a1f11..741a73c9141b139d87f83a136471757dce640e99 100644
--- a/services/src/power/small/auto_suspend_loop.c
+++ b/services/src/power/small/auto_suspend_loop.c
@@ -16,6 +16,8 @@
 #include "hilog_wrapper.h"
 #include "power/suspend_ops.h"
 
+static const int32_t SUSPEND_TIME = 10;
+
 static BOOL AutoSuspendLoopFunc(AutoSuspendWait waitFunc)
 {
     POWER_HILOGD("Prepare suspend"); // here to prepare to enter suspend
@@ -24,7 +26,7 @@ static BOOL AutoSuspendLoopFunc(AutoSuspendWait waitFunc)
     waitFunc();
 
     POWER_HILOGD("Enter suspend");
-    sleep(10); // using sleep to simulate suspend
+    sleep(SUSPEND_TIME); // using sleep to simulate suspend
 
     POWER_HILOGD("Exit suspend");
     return TRUE;
diff --git a/services/src/screensaver/small/screen_saver_handler.cpp b/services/src/screensaver/small/screen_saver_handler.cpp
index f5ae09d2b88bccee391316873bfa7086438e6dfd..ad3f4fccc92b6414c83734dc4bb32d08874374be 100644
--- a/services/src/screensaver/small/screen_saver_handler.cpp
+++ b/services/src/screensaver/small/screen_saver_handler.cpp
@@ -25,6 +25,8 @@
 #include "hilog_wrapper.h"
 #include "running_lock_mgr.h"
 
+static const int32_t DELAY_TIME = 20;
+
 namespace OHOS {
 ScreenSaverHandler::~ScreenSaverHandler()
 {
@@ -103,7 +105,7 @@ void ScreenSaverHandler::Init()
         timer_ = PowerMgrCreateTimer(intervalMsec_, intervalMsec_, PowerTimerCallback);
     }
     std::thread lateInit([this] {
-        sleep(20); // set delay to avoid registing input evnet listener failure
+        sleep(DELAY_TIME); // set delay to avoid registing input evnet listener failure
         SetState(true);
     });
     lateInit.detach();