From 1add9919df6ef19b208645f9aeeba4924e3dbc5f Mon Sep 17 00:00:00 2001 From: wangchaole Date: Tue, 15 Mar 2022 21:37:39 +0800 Subject: [PATCH] warning clean Signed-off-by: wangchaole --- camera_hdf/interfaces/hdi_ipc/server/host/dcamera_host_stub.h | 2 +- .../interfaces/hdi_ipc/server/provider/dcamera_provider_stub.h | 2 +- .../distributedcameramgr/interface/icamera_sink_output.h | 2 +- .../include/distributedcameramgr/dcamera_source_dev.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/camera_hdf/interfaces/hdi_ipc/server/host/dcamera_host_stub.h b/camera_hdf/interfaces/hdi_ipc/server/host/dcamera_host_stub.h index 4939a8c3..bae5d68b 100644 --- a/camera_hdf/interfaces/hdi_ipc/server/host/dcamera_host_stub.h +++ b/camera_hdf/interfaces/hdi_ipc/server/host/dcamera_host_stub.h @@ -62,7 +62,7 @@ private: void* DCameraHostStubInstance(); -void DestroyDCameraHostStub(void* obj); +void DestroyDCameraHostStub(void* stubObj); int32_t DCHostServiceOnRemoteRequest(void* stub, int cmdId, struct HdfSBuf* data, struct HdfSBuf* reply); diff --git a/camera_hdf/interfaces/hdi_ipc/server/provider/dcamera_provider_stub.h b/camera_hdf/interfaces/hdi_ipc/server/provider/dcamera_provider_stub.h index e5170a16..33330adb 100644 --- a/camera_hdf/interfaces/hdi_ipc/server/provider/dcamera_provider_stub.h +++ b/camera_hdf/interfaces/hdi_ipc/server/provider/dcamera_provider_stub.h @@ -53,7 +53,7 @@ private: void* DCameraProviderStubInstance(); -void DestroyDCameraProviderStub(void* obj); +void DestroyDCameraProviderStub(void* stubObj); int32_t DCProviderServiceOnRemoteRequest(void* stub, int cmdId, struct HdfSBuf* data, struct HdfSBuf* reply); diff --git a/services/cameraservice/sinkservice/include/distributedcameramgr/interface/icamera_sink_output.h b/services/cameraservice/sinkservice/include/distributedcameramgr/interface/icamera_sink_output.h index 2355b70b..fe118349 100644 --- a/services/cameraservice/sinkservice/include/distributedcameramgr/interface/icamera_sink_output.h +++ b/services/cameraservice/sinkservice/include/distributedcameramgr/interface/icamera_sink_output.h @@ -18,7 +18,7 @@ #include #include -#include +#include #include "dcamera_capture_info_cmd.h" #include "dcamera_channel_info_cmd.h" diff --git a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamera_source_dev.h b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamera_source_dev.h index 9e864ac1..dbb203ee 100644 --- a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamera_source_dev.h +++ b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamera_source_dev.h @@ -36,7 +36,7 @@ public: virtual ~DCameraSourceDev(); int32_t InitDCameraSourceDev(); - int32_t RegisterDistributedHardware(const std::string& devId, const std::string& dhId, const std::string& reqId, + int32_t RegisterDistributedHardware(const std::string& devId, const std::string& dhId, const std::string& reqId, const std::string& ver, const std::string attrs); int32_t UnRegisterDistributedHardware(const std::string devId, const std::string dhId, const std::string reqId); int32_t DCameraNotify(std::string& eventStr); -- Gitee