From e890535d590e03d2530f88f7b11b10d00f546dc2 Mon Sep 17 00:00:00 2001 From: wangchaole Date: Tue, 20 Sep 2022 15:26:57 +0800 Subject: [PATCH] fix: remove unused function Signed-off-by: wangchaole --- .../include/utils/anonymous_string.h | 1 - .../hdi_service/include/utils/dcamera.h | 2 -- .../src/dcamera_device/dcamera_device.cpp | 2 +- .../src/dcamera_host/dcamera_host.cpp | 2 +- .../src/dstream_operator/dcamera_stream.cpp | 2 +- .../src/dstream_operator/dstream_operator.cpp | 4 +--- .../src/utils/anonymous_string.cpp | 21 ----------------- .../hdi_service/src/utils/dcamera.cpp | 23 ------------------- 8 files changed, 4 insertions(+), 53 deletions(-) diff --git a/distributed_camera/hdi_service/include/utils/anonymous_string.h b/distributed_camera/hdi_service/include/utils/anonymous_string.h index 8cbfaaaa59..655df293df 100644 --- a/distributed_camera/hdi_service/include/utils/anonymous_string.h +++ b/distributed_camera/hdi_service/include/utils/anonymous_string.h @@ -21,7 +21,6 @@ namespace OHOS { namespace DistributedHardware { std::string GetAnonyString(const std::string &value); -std::string GetAnonyInt32(const int32_t value); } // namespace DistributedHardware } // namespace OHOS #endif // OHOS_DISTRIBUTED_CAMERA_ANONYMOUS_STRING_H diff --git a/distributed_camera/hdi_service/include/utils/dcamera.h b/distributed_camera/hdi_service/include/utils/dcamera.h index 9798789c22..3d78b62b92 100644 --- a/distributed_camera/hdi_service/include/utils/dcamera.h +++ b/distributed_camera/hdi_service/include/utils/dcamera.h @@ -33,8 +33,6 @@ const std::string BASE_64_CHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrs CamRetCode MapToExternalRetCode(DCamRetCode retCode); -DCamRetCode MapToInternalRetCode(CamRetCode retCode); - uint64_t GetCurrentLocalTimeStamp(); void SplitString(const std::string &str, std::vector &tokens, const std::string &delimiters); diff --git a/distributed_camera/hdi_service/src/dcamera_device/dcamera_device.cpp b/distributed_camera/hdi_service/src/dcamera_device/dcamera_device.cpp index f727496e27..fc036e6847 100644 --- a/distributed_camera/hdi_service/src/dcamera_device/dcamera_device.cpp +++ b/distributed_camera/hdi_service/src/dcamera_device/dcamera_device.cpp @@ -282,7 +282,7 @@ CamRetCode DCameraDevice::OpenDCamera(const OHOS::sptr &c return CamRetCode::DEVICE_ERROR; } { - unique_lock lock(isOpenSessFailedlock_); + unique_lock openStateLock(isOpenSessFailedlock_); if (isOpenSessFailed_) { DHLOGE("Open distributed camera session failed."); return CamRetCode::DEVICE_ERROR; diff --git a/distributed_camera/hdi_service/src/dcamera_host/dcamera_host.cpp b/distributed_camera/hdi_service/src/dcamera_host/dcamera_host.cpp index f0552f2322..e20695fddd 100644 --- a/distributed_camera/hdi_service/src/dcamera_host/dcamera_host.cpp +++ b/distributed_camera/hdi_service/src/dcamera_host/dcamera_host.cpp @@ -90,7 +90,7 @@ int32_t DCameraHost::GetCameraAbility(const std::string &cameraId, std::vectorget(), + ret = OHOS::Camera::FindCameraMetadataItem(ability->get(), OHOS_ABILITY_STREAM_AVAILABLE_BASIC_CONFIGURATIONS, &item); DHLOGI("FindCameraMetadataItem item=%u, count=%u, dataType=%u", item.item, item.count, item.data_type); if (ret != CAM_META_SUCCESS) { diff --git a/distributed_camera/hdi_service/src/dstream_operator/dcamera_stream.cpp b/distributed_camera/hdi_service/src/dstream_operator/dcamera_stream.cpp index 11f8fe13e7..555429d92a 100644 --- a/distributed_camera/hdi_service/src/dstream_operator/dcamera_stream.cpp +++ b/distributed_camera/hdi_service/src/dstream_operator/dcamera_stream.cpp @@ -54,7 +54,7 @@ DCamRetCode DCameraStream::InitDCameraStream(const StreamInfo &info) DCamRetCode ret = DCamRetCode::SUCCESS; if (dcStreamInfo_->bufferQueue_ != nullptr) { - DCamRetCode ret = InitDCameraBufferManager(); + ret = InitDCameraBufferManager(); if (ret != DCamRetCode::SUCCESS) { DHLOGE("Cannot init buffer manager."); } diff --git a/distributed_camera/hdi_service/src/dstream_operator/dstream_operator.cpp b/distributed_camera/hdi_service/src/dstream_operator/dstream_operator.cpp index 68dd15cf48..d4a24baf49 100644 --- a/distributed_camera/hdi_service/src/dstream_operator/dstream_operator.cpp +++ b/distributed_camera/hdi_service/src/dstream_operator/dstream_operator.cpp @@ -155,9 +155,7 @@ int32_t DStreamOperator::CommitStreams(OperationMode mode, const std::vector setting = nullptr; OHOS::Camera::MetadataUtils::ConvertVecToMetadata(modeSetting, setting); diff --git a/distributed_camera/hdi_service/src/utils/anonymous_string.cpp b/distributed_camera/hdi_service/src/utils/anonymous_string.cpp index b6cfa82d2b..e8e989d9c8 100644 --- a/distributed_camera/hdi_service/src/utils/anonymous_string.cpp +++ b/distributed_camera/hdi_service/src/utils/anonymous_string.cpp @@ -43,26 +43,5 @@ std::string GetAnonyString(const std::string &value) return res; } - -std::string GetAnonyInt32(const int32_t value) -{ - constexpr int32_t INT32_STRING_LENGTH = 40; - char tempBuffer[INT32_STRING_LENGTH] = ""; - int32_t secRet = sprintf_s(tempBuffer, INT32_STRING_LENGTH, "%d", value); - if (secRet <= 0) { - std::string nullString(""); - return nullString; - } - size_t length = strlen(tempBuffer); - for (size_t i = 1; i <= length - 1; i++) { - tempBuffer[i] = '*'; - } - if (length == 0x01) { - tempBuffer[0] = '*'; - } - - std::string tempString(tempBuffer); - return tempString; -} } // namespace DistributedHardware } // namespace OHOS diff --git a/distributed_camera/hdi_service/src/utils/dcamera.cpp b/distributed_camera/hdi_service/src/utils/dcamera.cpp index b8e31f6dee..7694dcd6bb 100644 --- a/distributed_camera/hdi_service/src/utils/dcamera.cpp +++ b/distributed_camera/hdi_service/src/utils/dcamera.cpp @@ -54,29 +54,6 @@ CamRetCode MapToExternalRetCode(DCamRetCode retCode) return CamRetCode::DEVICE_ERROR; } -DCamRetCode MapToInternalRetCode(CamRetCode retCode) -{ - switch (retCode) { - case CamRetCode::NO_ERROR: - return DCamRetCode::SUCCESS; - case CamRetCode::CAMERA_BUSY: - return DCamRetCode::CAMERA_BUSY; - case CamRetCode::INSUFFICIENT_RESOURCES: - return DCamRetCode::EXCEED_MAX_NUMBER; - case CamRetCode::INVALID_ARGUMENT: - return DCamRetCode::INVALID_ARGUMENT; - case CamRetCode::METHOD_NOT_SUPPORTED: - return DCamRetCode::METHOD_NOT_SUPPORTED; - case CamRetCode::CAMERA_CLOSED: - return DCamRetCode::CAMERA_OFFLINE; - case CamRetCode::DEVICE_ERROR: - return DCamRetCode::FAILED; - default: - break; - } - return DCamRetCode::FAILED; -} - uint64_t GetCurrentLocalTimeStamp() { std::chrono::time_point tp = -- Gitee