diff --git a/utils/common/include/app_thread_info.h b/utils/common/include/app_thread_info.h index 0a765d135214d1c2c8aa7570230703615e07c22d..08db0f7d0471ae7ddbec3322ce885ab6677f2a62 100755 --- a/utils/common/include/app_thread_info.h +++ b/utils/common/include/app_thread_info.h @@ -23,6 +23,6 @@ struct AppThreadInfo { int32_t uid; AppThreadInfo() : pid(0), uid(0) {}; }; -} // namespace Sensors -} // namespace OHOS -#endif // APP_THREAD_INFO_H +} // namespace Sensors +} // namespace OHOS +#endif // APP_THREAD_INFO_H diff --git a/utils/common/include/death_recipient_template.h b/utils/common/include/death_recipient_template.h index 7e5ad58ad66e23b5b3b8496d522f410f08cc1180..4ce667a87682c1144945a82696e21693db81169d 100755 --- a/utils/common/include/death_recipient_template.h +++ b/utils/common/include/death_recipient_template.h @@ -33,6 +33,6 @@ public: private: T &privateData_; }; -} // namespace Sensors -} // namespace OHOS -#endif // DEATH_RECIPIENT_TEMPLATE_H +} // namespace Sensors +} // namespace OHOS +#endif // DEATH_RECIPIENT_TEMPLATE_H diff --git a/utils/common/include/file_utils.h b/utils/common/include/file_utils.h index 6b5f5b9a1f9c67afdf2f9e88303294d2ba7f8611..274a34bc6d97425271e5abc7605a6f7c04bbd277 100755 --- a/utils/common/include/file_utils.h +++ b/utils/common/include/file_utils.h @@ -38,6 +38,6 @@ std::string ReadFd(const RawFileDescriptor &rawFd); std::string GetFileSuffix(int32_t fd); int32_t GetFileName(const int32_t &fd, std::string &fileName); int32_t GetFileExtName(const int32_t &fd, std::string &extName); -} // namespace Sensors -} // namespace OHOS -#endif // MISCDEVICE_FILE_UTILS_H +} // namespace Sensors +} // namespace OHOS +#endif // MISCDEVICE_FILE_UTILS_H diff --git a/utils/common/include/json_parser.h b/utils/common/include/json_parser.h index 10d9a3430080f708ff4e1185c3f5eaae9bc31c60..093e559ee6c1f126504f5afb6a02c27f041785bc 100755 --- a/utils/common/include/json_parser.h +++ b/utils/common/include/json_parser.h @@ -47,6 +47,6 @@ public: private: cJSON *cJson_ = nullptr; }; -} // namespace Sensors -} // namespace OHOS -#endif // MISCDEVICE_JSON_PARSER_H \ No newline at end of file +} // namespace Sensors +} // namespace OHOS +#endif // MISCDEVICE_JSON_PARSER_H \ No newline at end of file diff --git a/utils/common/include/light_animation_ipc.h b/utils/common/include/light_animation_ipc.h index e81a85bd5514e523dce1244baf2c0da2f920f2e5..47f853527a99b2145261b4cb0db1b1c8f84071e9 100644 --- a/utils/common/include/light_animation_ipc.h +++ b/utils/common/include/light_animation_ipc.h @@ -39,6 +39,6 @@ private: int32_t onTime_ = 0; int32_t offTime_ = 0; }; -} // namespace Sensors -} // namespace OHOS -#endif // LIGHT_ANIMATION_IPC_H +} // namespace Sensors +} // namespace OHOS +#endif // LIGHT_ANIMATION_IPC_H diff --git a/utils/common/include/light_info_ipc.h b/utils/common/include/light_info_ipc.h index 5ec409306ec0d59e9212ec31616f26297b8473b7..5f81d027a4ee6a7918aba563b0cb61f36447a2f1 100644 --- a/utils/common/include/light_info_ipc.h +++ b/utils/common/include/light_info_ipc.h @@ -44,6 +44,6 @@ private: int32_t lightNumber_ = 0; int32_t lightType_ = 0; }; -} // namespace Sensors -} // namespace OHOS -#endif // LIGHT_INFO_IPC_H +} // namespace Sensors +} // namespace OHOS +#endif // LIGHT_INFO_IPC_H diff --git a/utils/common/include/miscdevice_common.h b/utils/common/include/miscdevice_common.h index f04b6c668d2ef8d1b91888bc262b2df4e3249973..4a71ec5d6448416aae944de5340769feffdb3b17 100755 --- a/utils/common/include/miscdevice_common.h +++ b/utils/common/include/miscdevice_common.h @@ -39,6 +39,6 @@ public: MiscdeviceCommon() = default; ~MiscdeviceCommon() = default; }; -} // namespace Sensors -} // namespace OHOS -#endif // MISCDEVICE_COMMON_H +} // namespace Sensors +} // namespace OHOS +#endif // MISCDEVICE_COMMON_H diff --git a/utils/common/include/miscdevice_delayed_sp_singleton.h b/utils/common/include/miscdevice_delayed_sp_singleton.h index 5be3b80dbe8ab98284545d1fd3ecbf45e3ec2596..49fa02cfac866fe618311a8a772c3c5414d958f7 100644 --- a/utils/common/include/miscdevice_delayed_sp_singleton.h +++ b/utils/common/include/miscdevice_delayed_sp_singleton.h @@ -68,6 +68,6 @@ void MiscdeviceDelayedSpSingleton::DestroyInstance() instance_ = nullptr; } } -} // namespace Sensors -} // namespace OHOS -#endif // MISCDEVICE_DELAYED_SP_SINGLETON_H \ No newline at end of file +} // namespace Sensors +} // namespace OHOS +#endif // MISCDEVICE_DELAYED_SP_SINGLETON_H \ No newline at end of file diff --git a/utils/common/include/permission_util.h b/utils/common/include/permission_util.h index fd6adf17ea23dce8a7ef0ef1a08b543749230386..74668287efdbc1ce5ce27dcc426e4b25e6cf59d2 100644 --- a/utils/common/include/permission_util.h +++ b/utils/common/include/permission_util.h @@ -32,6 +32,6 @@ public: virtual ~PermissionUtil() {}; int32_t CheckVibratePermission(AccessTokenID callerToken, const std::string &permissionName); }; -} // namespace Sensors -} // namespace OHOS -#endif // PERMISSION_UTIL_H +} // namespace Sensors +} // namespace OHOS +#endif // PERMISSION_UTIL_H diff --git a/utils/common/include/raw_file_descriptor.h b/utils/common/include/raw_file_descriptor.h index 04c04450609778a5afb802f1359d4276a192eab7..54a84bd38fd7ff38bd8d11e5335813c25e881cb6 100644 --- a/utils/common/include/raw_file_descriptor.h +++ b/utils/common/include/raw_file_descriptor.h @@ -25,6 +25,6 @@ struct RawFileDescriptor { int64_t offset = 0; int64_t length = -1; }; -} // namespace Sensors -} // namespace OHOS -#endif // RAW_FILE_DESCRIPTOR +} // namespace Sensors +} // namespace OHOS +#endif // RAW_FILE_DESCRIPTOR diff --git a/utils/common/include/sensors_errors.h b/utils/common/include/sensors_errors.h index 2aca15ac26f1af070c1a95e9187ecb341ad5513a..5214aa5c0ffab13d01cf72443262c060e267a936 100644 --- a/utils/common/include/sensors_errors.h +++ b/utils/common/include/sensors_errors.h @@ -294,6 +294,6 @@ private: } \ } while (0) #endif -} // namespace Sensors -} // namespace OHOS -#endif // SENSORS_ERRORS_H +} // namespace Sensors +} // namespace OHOS +#endif // SENSORS_ERRORS_H diff --git a/utils/common/include/vibrator_infos.h b/utils/common/include/vibrator_infos.h index 47f820f9265049d99aa8f3a3593b74171d2c47d4..04887f489312439d31fcca6aab3f0c769e8022c4 100644 --- a/utils/common/include/vibrator_infos.h +++ b/utils/common/include/vibrator_infos.h @@ -140,6 +140,6 @@ struct VibrateParameter { bool Marshalling(Parcel &parcel) const; std::optional Unmarshalling(Parcel &data); }; -} // namespace Sensors -} // namespace OHOS -#endif // VIBRATOR_INFOS_H +} // namespace Sensors +} // namespace OHOS +#endif // VIBRATOR_INFOS_H diff --git a/utils/common/src/file_utils.cpp b/utils/common/src/file_utils.cpp index cc2b195b78c6d9ed71d66f48f909d5f89b5229bc..c580128013f12c6b2e8729047ca2934683944deb 100755 --- a/utils/common/src/file_utils.cpp +++ b/utils/common/src/file_utils.cpp @@ -33,7 +33,7 @@ constexpr int32_t FILE_SIZE_MAX = 0x5000; constexpr int64_t READ_DATA_BUFF_SIZE = 256; constexpr int32_t INVALID_FILE_SIZE = -1; constexpr int32_t FILE_PATH_MAX = 1024; -} // namespace +} // namespace std::string ReadJsonFile(const std::string &filePath) { @@ -235,5 +235,5 @@ std::string GetFileSuffix(int32_t fd) } return fileAbsolutePath.substr(pos + 1); } -} // namespace Sensors -} // namespace OHOS +} // namespace Sensors +} // namespace OHOS diff --git a/utils/common/src/json_parser.cpp b/utils/common/src/json_parser.cpp index 061a7d9352c382e7ec967d56f828f01a52124b14..c6acb2fa3c65b3b5cd98605dc24227ad55cc5cec 100755 --- a/utils/common/src/json_parser.cpp +++ b/utils/common/src/json_parser.cpp @@ -145,5 +145,5 @@ std::string JsonParser::GetStringValue(cJSON *json) const } return json->valuestring; } -} // namespace Sensors -} // namespace OHOS \ No newline at end of file +} // namespace Sensors +} // namespace OHOS \ No newline at end of file diff --git a/utils/common/src/light_animation_ipc.cpp b/utils/common/src/light_animation_ipc.cpp index 4ffb49b0c5f577d684f6c0139b182e4f5aa1ecb5..6cbc04c4682699640d4e37039cfad1b42feec672 100644 --- a/utils/common/src/light_animation_ipc.cpp +++ b/utils/common/src/light_animation_ipc.cpp @@ -83,5 +83,5 @@ bool LightAnimationIPC::ReadFromParcel(Parcel &parcel) { return (parcel.ReadInt32(mode_)) && (parcel.ReadInt32(onTime_)) && (parcel.ReadInt32(offTime_)); } -} // namespace Sensors -} // namespace OHOS \ No newline at end of file +} // namespace Sensors +} // namespace OHOS \ No newline at end of file diff --git a/utils/common/src/light_info_ipc.cpp b/utils/common/src/light_info_ipc.cpp index a7ccaeae538f463f4a5f622637cd6740cd3f1667..ca6519e351dbca530e2aeb9586148701917e0d4d 100644 --- a/utils/common/src/light_info_ipc.cpp +++ b/utils/common/src/light_info_ipc.cpp @@ -98,5 +98,5 @@ bool LightInfoIPC::ReadFromParcel(Parcel &parcel) return (parcel.ReadString(lightName_)) && (parcel.ReadInt32(lightId_)) && (parcel.ReadInt32(lightNumber_)) && (parcel.ReadInt32(lightType_)); } -} // namespace Sensors -} // namespace OHOS \ No newline at end of file +} // namespace Sensors +} // namespace OHOS \ No newline at end of file diff --git a/utils/common/src/permission_util.cpp b/utils/common/src/permission_util.cpp index 2ca66c126f8aac67f805b7c8114ccaed7fdca9bc..2fdbd52697c763dd958fab507fbb739be954479f 100644 --- a/utils/common/src/permission_util.cpp +++ b/utils/common/src/permission_util.cpp @@ -24,5 +24,5 @@ int32_t PermissionUtil::CheckVibratePermission(AccessTokenID callerToken, const { return AccessTokenKit::VerifyAccessToken(callerToken, permissionName); } -} // namespace Sensors -} // namespace OHOS \ No newline at end of file +} // namespace Sensors +} // namespace OHOS \ No newline at end of file diff --git a/utils/common/src/vibrator_infos.cpp b/utils/common/src/vibrator_infos.cpp index bced1eecc1fb2c8b6cf3ce7af262e63a63c79aa2..8ac1e4751c643e37341a75ad73a600c5a7def595 100644 --- a/utils/common/src/vibrator_infos.cpp +++ b/utils/common/src/vibrator_infos.cpp @@ -283,5 +283,5 @@ std::optional VibrateParameter::Unmarshalling(Parcel &data) } return parameter; } -} // namespace Sensors -} // namespace OHOS +} // namespace Sensors +} // namespace OHOS