From 6579bdeffd9fe7d496495c1cc8e203cbde5e58e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=83=B3=E4=B8=8D=E5=87=BA=E5=88=AB=E5=90=8D?= Date: Thu, 23 Sep 2021 20:12:08 +0800 Subject: [PATCH 1/2] Codex&BuildParam MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 想不出别名 --- devicemanager.gni | 1 - interfaces/inner_kits/native_cpp/BUILD.gn | 2 -- interfaces/kits/js/BUILD.gn | 2 -- services/devicemanagerservice/BUILD.gn | 2 -- .../include/requestauth/request_session.h | 17 ++++++++++++----- .../src/requestauth/request_session.cpp | 12 ------------ .../devicemanagerservice/src/timer/dm_timer.cpp | 10 +++++++++- utils/BUILD.gn | 2 -- 8 files changed, 21 insertions(+), 27 deletions(-) diff --git a/devicemanager.gni b/devicemanager.gni index 5b37dbc85..f407b537c 100644 --- a/devicemanager.gni +++ b/devicemanager.gni @@ -23,5 +23,4 @@ innerkits_path = "${devicemanager_path}/interfaces/inner_kits" build_flags = [ "-Werror", - "-Wall", ] diff --git a/interfaces/inner_kits/native_cpp/BUILD.gn b/interfaces/inner_kits/native_cpp/BUILD.gn index 275b19bc6..0c67c13c6 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 5c6777207..d52ac126e 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 cdc51d983..aa7dc489f 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 22bbbf451..aa805d9f9 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 143b5cb1b..5514cce0c 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 09c7cfecd..8e736945a 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 97be1fa25..368b7775b 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", -- Gitee From 30f4eab3a624b8bbf33cbae3d0b95745d640ceca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=83=B3=E4=B8=8D=E5=87=BA=E5=88=AB=E5=90=8D?= Date: Thu, 23 Sep 2021 20:49:20 +0800 Subject: [PATCH 2/2] Codex&BuildParam MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 想不出别名 --- devicemanager.gni | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/devicemanager.gni b/devicemanager.gni index f407b537c..fee9560c8 100644 --- a/devicemanager.gni +++ b/devicemanager.gni @@ -21,6 +21,4 @@ services_path = "${devicemanager_path}/services" innerkits_path = "${devicemanager_path}/interfaces/inner_kits" -build_flags = [ - "-Werror", -] +build_flags = [ "-Werror" ] -- Gitee