From 8a5ebaed8075c377ebafc7685850290f8c47d062 Mon Sep 17 00:00:00 2001 From: guduhanyan Date: Mon, 27 Sep 2021 17:24:43 +0800 Subject: [PATCH] 20210927LTS02 Signed-off-by: guduhanyan --- .../kits/js/napi/system_time/include/js_systemtime.h | 6 ++---- interfaces/kits/js/napi/system_time/src/js_systemtime.cpp | 7 +++---- services/time_manager/src/time_zone_info.cpp | 2 +- utils/native/include/time_file_utils.h | 5 ++--- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/interfaces/kits/js/napi/system_time/include/js_systemtime.h b/interfaces/kits/js/napi/system_time/include/js_systemtime.h index 3a50406..8c2be9d 100644 --- a/interfaces/kits/js/napi/system_time/include/js_systemtime.h +++ b/interfaces/kits/js/napi/system_time/include/js_systemtime.h @@ -12,7 +12,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - #ifndef N_JS_SYSTEMTIME_H #define N_JS_SYSTEMTIME_H @@ -61,7 +60,6 @@ struct TimeCallbackPromiseInfo { bool isCallback = false; int errorCode = NO_ERROR; }; - -} // MiscServicesNapi -} // OHOS +}//MiscServicesNapi +}//OHOS #endif \ No newline at end of file diff --git a/interfaces/kits/js/napi/system_time/src/js_systemtime.cpp b/interfaces/kits/js/napi/system_time/src/js_systemtime.cpp index 9711795..8b2415a 100644 --- a/interfaces/kits/js/napi/system_time/src/js_systemtime.cpp +++ b/interfaces/kits/js/napi/system_time/src/js_systemtime.cpp @@ -141,7 +141,7 @@ napi_value JSSystemTimeSetTime(napi_env env, napi_callback_info info) return result; } -napi_value JSSystemTimeSetTimeZone(napi_env env, napi_callback_info info) +napi_value JSSystemTimeSetTimeZone(napi_env env, napi_callback_info info) { TIME_HILOGI(TIME_MODULE_JS_NAPI, "JSSystemTimeSetTimeZone start"); GET_PARAMS(env, info, TWO_PARAMETERS); @@ -244,6 +244,5 @@ extern "C" __attribute__((constructor)) void SystemTimeRegister() { napi_module_register(&system_time_module); } - -} // MiscServicesNapi -} // OHOS \ No newline at end of file +}//MiscServicesNapi +}//OHOS \ No newline at end of file diff --git a/services/time_manager/src/time_zone_info.cpp b/services/time_manager/src/time_zone_info.cpp index 10a3ff8..b213852 100644 --- a/services/time_manager/src/time_zone_info.cpp +++ b/services/time_manager/src/time_zone_info.cpp @@ -113,7 +113,7 @@ bool TimeZoneInfo::InitStorage() } } return true; -} +} bool TimeZoneInfo::SetTimezone(std::string timezoneId) { diff --git a/utils/native/include/time_file_utils.h b/utils/native/include/time_file_utils.h index d3f019b..6509d03 100644 --- a/utils/native/include/time_file_utils.h +++ b/utils/native/include/time_file_utils.h @@ -38,7 +38,6 @@ public: static bool IsValidPath(const std::string &rootDir, const std::string &path); static std::string GetPathDir(const std::string &path); }; - -} // MiscServices -} // OHOS +}//MiscServices +}//OHOS #endif // TIME_FILE_UTILS_H