diff --git a/devicemanager.gni b/devicemanager.gni index 5b37dbc852e7081d880036baa2e1389103f4e974..fee9560c8149ab41407bb655dddd55a3e4cbe786 100644 --- a/devicemanager.gni +++ b/devicemanager.gni @@ -21,7 +21,4 @@ services_path = "${devicemanager_path}/services" innerkits_path = "${devicemanager_path}/interfaces/inner_kits" -build_flags = [ - "-Werror", - "-Wall", -] +build_flags = [ "-Werror" ] diff --git a/interfaces/inner_kits/native_cpp/BUILD.gn b/interfaces/inner_kits/native_cpp/BUILD.gn index 275b19bc61615f78413fa8e6d53329f0f4650dab..0c67c13c6baf0c64e495a12ea0a60ae08dd17d7e 100644 --- a/interfaces/inner_kits/native_cpp/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/BUILD.gn @@ -97,8 +97,6 @@ if (defined(ohos_lite)) { "src/notify/device_manager_notify.cpp", ] - cflags_cc = build_flags - deps = [ "${utils_path}:devicemanagerutils", "//utils/native/base:utils", diff --git a/interfaces/kits/js/BUILD.gn b/interfaces/kits/js/BUILD.gn index 5c67772074611715ef11ffe03784a1318d1b537c..d52ac126ed52f68622cd1f3e15eb0de442d61a5d 100644 --- a/interfaces/kits/js/BUILD.gn +++ b/interfaces/kits/js/BUILD.gn @@ -41,8 +41,6 @@ ohos_shared_library("devicemanager") { "//utils/native/base:utils", ] - cflags_cc = build_flags - defines = [ "HI_LOG_ENABLE", "DH_LOG_TAG=\"devicemanagerkit_js\"", diff --git a/services/devicemanagerservice/BUILD.gn b/services/devicemanagerservice/BUILD.gn index cdc51d98361228a4080979c3fa9898fc973eae53..aa7dc489ff6e42a34d19b1d49283d42a6ebab2e6 100644 --- a/services/devicemanagerservice/BUILD.gn +++ b/services/devicemanagerservice/BUILD.gn @@ -171,8 +171,6 @@ if (defined(ohos_lite)) { "LOG_DOMAIN=0xD004100", ] - cflags_cc = build_flags - external_deps = [ "appexecfwk_standard:appexecfwk_base", "appexecfwk_standard:appexecfwk_core", diff --git a/services/devicemanagerservice/include/requestauth/request_session.h b/services/devicemanagerservice/include/requestauth/request_session.h index 22bbbf4515cba44382d958efc850499f53f18b47..aa805d9f95560e79f57247c83ddd9c14c962663b 100644 --- a/services/devicemanagerservice/include/requestauth/request_session.h +++ b/services/devicemanagerservice/include/requestauth/request_session.h @@ -57,21 +57,28 @@ private: void SyncDmPrivateGroup(std::vector &remoteGroupList); private: - int32_t mSessionType_; - int32_t mStatus_; + enum StatusType : int32_t { + STATUS_INIT = 0, + STATUS_WAITING_REPLY = 2, + STATUS_WATING_SCAN_OR_INPUT = 3, + STATUS_WAITING_ADD_GROUP = 4, + STATUS_FINISH = 6, + }; + int32_t mSessionType_ {SESSION_TYPE_IS_APP_AUTH}; + int32_t mStatus_ {StatusType::STATUS_INIT}; std::string mHostPkgName_; std::string mTargetPkgName; std::string mToken_; - int32_t mPinToken_; + int32_t mPinToken_ {MIN_PIN_TOKEN}; DmDeviceInfo mDevInfo_; DmAppImageInfo mImageInfo_; - long long mChannelId_; + long long mChannelId_ {-1}; bool mIsChannelOpened_ {false}; std::string mRemoteDeviceId_; std::string mRemoteNetId_; std::string mRemoteGroupId_; std::string mRemoteGroupName_; - int64_t mRequestId_; + int64_t mRequestId_ {-1}; std::shared_ptr responseMsgPtr_; }; } diff --git a/services/devicemanagerservice/src/requestauth/request_session.cpp b/services/devicemanagerservice/src/requestauth/request_session.cpp index 143b5cb1b12919072c24bc88bd054e0ffd2c0770..5514cce0ca117d0e95c3febcbeaa7cb8f7f3efdf 100644 --- a/services/devicemanagerservice/src/requestauth/request_session.cpp +++ b/services/devicemanagerservice/src/requestauth/request_session.cpp @@ -31,14 +31,6 @@ namespace OHOS { namespace DistributedHardware { -enum StatusType : int32_t { - STATUS_INIT = 0, - STATUS_WAITING_REPLY = 2, - STATUS_WATING_SCAN_OR_INPUT = 3, - STATUS_WAITING_ADD_GROUP = 4, - STATUS_FINISH = 6, -}; - RequestSession::RequestSession(std::string &hostPkgName, const DmDeviceInfo &devReqInfo, const DmAppImageInfo &imageInfo, std::string &extrasJson) { @@ -53,16 +45,12 @@ RequestSession::RequestSession(std::string &hostPkgName, const DmDeviceInfo &dev return; } std::string targetPkgName = jsonObject[TARGET_PKG_NAME_KEY]; - mSessionType_ = SESSION_TYPE_IS_APP_AUTH; mDevInfo_ = devReqInfo; mImageInfo_ = imageInfo; DMLOG(DM_LOG_ERROR, "imageinfo appIcon:%p:%p", mImageInfo_.GetAppIcon(), imageInfo.GetAppIcon()); mHostPkgName_ = hostPkgName; mTargetPkgName = targetPkgName; - mStatus_ = StatusType::STATUS_INIT; mPinToken_ = IpcServerAdapter::GenRandInt(MIN_PIN_TOKEN, MAX_PIN_TOKEN); - mChannelId_ = -1; - mRequestId_ = -1; char randStr[TOKEN_LEN] = {0}; bool res = EncryptUtils::MbedtlsGenRandomStr(randStr, sizeof(randStr), false); if (res == false) { diff --git a/services/devicemanagerservice/src/timer/dm_timer.cpp b/services/devicemanagerservice/src/timer/dm_timer.cpp index 09c7cfecd16d40d41149b5a4e65494eae8a22ce4..8e736945a88d92ece0f0111ed72dd1f6ffe7b5ad 100644 --- a/services/devicemanagerservice/src/timer/dm_timer.cpp +++ b/services/devicemanagerservice/src/timer/dm_timer.cpp @@ -17,6 +17,8 @@ #include +#include "securec.h" + namespace OHOS { namespace DistributedHardware { namespace { @@ -25,8 +27,14 @@ const int32_t MILL_SECONDS_PER_SECOND = 1000; DmTimer::DmTimer(std::string &name) { mStatus_ = DmTimerStatus::DM_STATUS_INIT; - mTimerName_ = name; + mTimeOutSec_ = 0; + mHandle_ = nullptr; + mHandleData_ = nullptr; + (void)memset_s(mTimeFd_, sizeof(mTimeFd_), 0, sizeof(mTimeFd_)); + (void)memset_s(&mEv_, sizeof(mEv_), 0, sizeof(mEv_)); + (void)memset_s(mEvents_, sizeof(mEvents_), 0, sizeof(mEvents_)); mEpFd_ = 0; + mTimerName_ = name; } DmTimer::~DmTimer() diff --git a/utils/BUILD.gn b/utils/BUILD.gn index 97be1fa253a9718ef655717198c7eb68250eb4c8..368b7775b41f973dc1a4d4eb786832b146c96467 100644 --- a/utils/BUILD.gn +++ b/utils/BUILD.gn @@ -106,8 +106,6 @@ if (defined(ohos_lite)) { "LOG_DOMAIN=0xD004100", ] - cflags_cc = build_flags - external_deps = [ "appexecfwk_standard:appexecfwk_base", "appexecfwk_standard:appexecfwk_core",