From e3f7bc8cfc375d9d5c1fe98de5b1e9ac13ecf23e 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: Fri, 15 Oct 2021 14:19:46 +0800 Subject: [PATCH] fix gcc compile error MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 想不出别名 --- interfaces/inner_kits/native_cpp/include/device_manager.h | 1 + .../inner_kits/native_cpp/include/dm_subscribe_info.h | 2 -- .../native_cpp/include/notify/device_manager_notify.h | 1 + interfaces/kits/js/src/native_devicemanager_js.cpp | 2 +- .../devicemanagerservice/include/auth/hichain_connector.h | 8 +------- .../include/softbus/softbus_adapter.h | 1 + .../devicemanagerservice/src/auth/hichain_connector.cpp | 6 ++++++ .../devicemanagerservice/src/message/msg_request_auth.cpp | 2 +- .../devicemanagerservice/src/softbus/softbus_adapter.cpp | 4 +--- utils/include/ipc/lite/ipc_cmd_register.h | 1 + utils/include/ipc/standard/ipc_cmd_register.h | 1 + 11 files changed, 15 insertions(+), 14 deletions(-) diff --git a/interfaces/inner_kits/native_cpp/include/device_manager.h b/interfaces/inner_kits/native_cpp/include/device_manager.h index 96f507d81..060fe2df8 100644 --- a/interfaces/inner_kits/native_cpp/include/device_manager.h +++ b/interfaces/inner_kits/native_cpp/include/device_manager.h @@ -18,6 +18,7 @@ #include #include +#include #include "device_manager_callback.h" #include "dm_subscribe_info.h" diff --git a/interfaces/inner_kits/native_cpp/include/dm_subscribe_info.h b/interfaces/inner_kits/native_cpp/include/dm_subscribe_info.h index 9e4b24499..2101c59e5 100644 --- a/interfaces/inner_kits/native_cpp/include/dm_subscribe_info.h +++ b/interfaces/inner_kits/native_cpp/include/dm_subscribe_info.h @@ -58,8 +58,6 @@ typedef enum DmExchangeFreq { DM_FREQ_BUTT } DmExchangeFreq; -const static char *DM_CAPABILITY_OSD = "osdCapability"; - typedef struct DmSubscribeInfo { /** Service ID */ uint16_t subscribeId; diff --git a/interfaces/inner_kits/native_cpp/include/notify/device_manager_notify.h b/interfaces/inner_kits/native_cpp/include/notify/device_manager_notify.h index a22cae427..a654b5536 100644 --- a/interfaces/inner_kits/native_cpp/include/notify/device_manager_notify.h +++ b/interfaces/inner_kits/native_cpp/include/notify/device_manager_notify.h @@ -20,6 +20,7 @@ #include #include #include +#include #include "dm_device_info.h" #include "dm_subscribe_info.h" diff --git a/interfaces/kits/js/src/native_devicemanager_js.cpp b/interfaces/kits/js/src/native_devicemanager_js.cpp index 3629332c0..bb38a37fd 100644 --- a/interfaces/kits/js/src/native_devicemanager_js.cpp +++ b/interfaces/kits/js/src/native_devicemanager_js.cpp @@ -37,7 +37,7 @@ const std::string DM_NAPI_EVENT_DEVICE_FOUND = "deviceFound"; const std::string DM_NAPI_EVENT_DEVICE_DISCOVER_FAIL = "discoverFail"; const std::string DM_NAPI_EVENT_DMFA_CALLBACK = "dmFaCallback"; const std::string DM_NAPI_EVENT_DEVICE_SERVICE_DIE = "serviceDie"; - +const char *DM_CAPABILITY_OSD = "osdCapability"; const std::string DEVICE_MANAGER_NAPI_CLASS_NAME = "DeviceManager"; const int32_t DM_NAPI_ARGS_ONE = 1; diff --git a/services/devicemanagerservice/include/auth/hichain_connector.h b/services/devicemanagerservice/include/auth/hichain_connector.h index 0bb50c2d3..e49700c97 100644 --- a/services/devicemanagerservice/include/auth/hichain_connector.h +++ b/services/devicemanagerservice/include/auth/hichain_connector.h @@ -87,15 +87,9 @@ private: bool IsGroupInfoInvalid(GroupInfo &group); private: - std::atomic requestIdIndex_ {0}; std::shared_ptr hichainConnectorCallback_ = nullptr; const DeviceGroupManager *deviceGroupManager_ = nullptr; - DeviceAuthCallback deviceAuthCallback_ = { - .onTransmit = nullptr, - .onFinish = HichainAuthenCallBack::onFinish, - .onError = HichainAuthenCallBack::onError, - .onRequest = HichainAuthenCallBack::onRequest, - }; + DeviceAuthCallback deviceAuthCallback_ ; }; } // namespace DistributedHardware } // namespace OHOS diff --git a/services/devicemanagerservice/include/softbus/softbus_adapter.h b/services/devicemanagerservice/include/softbus/softbus_adapter.h index 63fc95b3d..25f472ff3 100644 --- a/services/devicemanagerservice/include/softbus/softbus_adapter.h +++ b/services/devicemanagerservice/include/softbus/softbus_adapter.h @@ -20,6 +20,7 @@ #include #include #include +#include #include "softbus_bus_center.h" #include "discovery_service.h" #include "dm_device_info.h" diff --git a/services/devicemanagerservice/src/auth/hichain_connector.cpp b/services/devicemanagerservice/src/auth/hichain_connector.cpp index ca36a5db8..fdc68e179 100644 --- a/services/devicemanagerservice/src/auth/hichain_connector.cpp +++ b/services/devicemanagerservice/src/auth/hichain_connector.cpp @@ -89,6 +89,12 @@ int HichainConnector::Init() DMLOG(DM_LOG_INFO, "HichainConnector::init, failed to init group manager!"); return -1; } + + deviceAuthCallback_.onTransmit = nullptr; + deviceAuthCallback_.onFinish = HichainAuthenCallBack::onFinish; + deviceAuthCallback_.onError = HichainAuthenCallBack::onError; + deviceAuthCallback_.onRequest = HichainAuthenCallBack::onRequest; + deviceGroupManager_->regCallback(DEVICE_MANAGER_APP.c_str(), &deviceAuthCallback_); DMLOG(DM_LOG_INFO, "HichainConnector::init, init hichain adapter success."); return 0; diff --git a/services/devicemanagerservice/src/message/msg_request_auth.cpp b/services/devicemanagerservice/src/message/msg_request_auth.cpp index 88ed64aab..f58a361fc 100644 --- a/services/devicemanagerservice/src/message/msg_request_auth.cpp +++ b/services/devicemanagerservice/src/message/msg_request_auth.cpp @@ -106,7 +106,7 @@ void MsgRequestAuth::GetDecodeAppInfo(const std::string appString, uint8_t **out size_t outLen = 0; int32_t ret = EncryptUtils::MbedtlsBase64Decode(buffer, tempBufLen, &outLen, (const uint8_t*)appString.c_str(), appString.length()); - if (ret != 0 || outLen > tempBufLen) { + if (ret != 0 || static_cast(outLen) > tempBufLen) { DMLOG(DM_LOG_ERROR, "MbedtlsBase64Decode failed, ret %d, outLen %d, tempBufLen %d", ret, outLen, tempBufLen); outBufferLen = 0; diff --git a/services/devicemanagerservice/src/softbus/softbus_adapter.cpp b/services/devicemanagerservice/src/softbus/softbus_adapter.cpp index dd3959eac..4db2ad209 100644 --- a/services/devicemanagerservice/src/softbus/softbus_adapter.cpp +++ b/services/devicemanagerservice/src/softbus/softbus_adapter.cpp @@ -18,9 +18,6 @@ #include #include #include -#include -#include -#include #include @@ -41,6 +38,7 @@ namespace OHOS { namespace DistributedHardware { namespace { const std::string DEVICE_MANAGER_PACKAGE_NAME = "com.huawei.devicemanager"; +const char *DM_CAPABILITY_OSD = "osdCapability"; const int32_t CHECK_INTERVAL = 100000; // 100ms const uint32_t SUBSCRIBE_ID_PREFIX_LEN = 16; const int32_t SUBSCRIBE_ID_MASK = 0x0000FFFF; diff --git a/utils/include/ipc/lite/ipc_cmd_register.h b/utils/include/ipc/lite/ipc_cmd_register.h index 36c20961f..0144df0d6 100644 --- a/utils/include/ipc/lite/ipc_cmd_register.h +++ b/utils/include/ipc/lite/ipc_cmd_register.h @@ -18,6 +18,7 @@ #include #include +#include #include "liteipc_adapter.h" #include "single_instance.h" diff --git a/utils/include/ipc/standard/ipc_cmd_register.h b/utils/include/ipc/standard/ipc_cmd_register.h index dc852f57e..c2c5d585d 100644 --- a/utils/include/ipc/standard/ipc_cmd_register.h +++ b/utils/include/ipc/standard/ipc_cmd_register.h @@ -18,6 +18,7 @@ #include #include +#include #include "iremote_broker.h" #include "single_instance.h" -- Gitee