From cedc1ddced6d784bd436f293c33b72afe27ce4a2 Mon Sep 17 00:00:00 2001 From: huyx Date: Thu, 18 Apr 2024 11:38:42 +0800 Subject: [PATCH] =?UTF-8?q?clock=E5=91=8A=E8=AD=A6=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: huyx --- framework/support/platform/src/clock/clock_if.c | 2 -- framework/support/platform/src/clock/clock_if_u.c | 3 --- framework/tools/hdi-gen/util/string_builder.cpp | 2 +- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/framework/support/platform/src/clock/clock_if.c b/framework/support/platform/src/clock/clock_if.c index 080e8d3cf..910014209 100644 --- a/framework/support/platform/src/clock/clock_if.c +++ b/framework/support/platform/src/clock/clock_if.c @@ -90,7 +90,6 @@ int32_t ClockDisable(DevHandle handle) int32_t ClockSetRate(DevHandle handle, uint32_t rate) { - int32_t ret; uint32_t number = 0; struct ClockDevice *device = NULL; @@ -133,7 +132,6 @@ int32_t ClockGetRate(DevHandle handle, uint32_t *rate) DevHandle ClockGetParent(DevHandle handle) { - int32_t ret; uint32_t number = 0; struct ClockDevice *device = NULL; struct ClockDevice *parent = NULL; diff --git a/framework/support/platform/src/clock/clock_if_u.c b/framework/support/platform/src/clock/clock_if_u.c index 7c63c792b..1888469d6 100644 --- a/framework/support/platform/src/clock/clock_if_u.c +++ b/framework/support/platform/src/clock/clock_if_u.c @@ -72,7 +72,6 @@ DevHandle ClockOpen(uint32_t number) if (!HdfSbufReadUint32(reply, &handle)) { HDF_LOGE("ClockOpen: read handle fail!"); - ret = HDF_ERR_IO; } HdfSbufRecycle(data); @@ -325,7 +324,6 @@ DevHandle ClockGetParent(DevHandle handle) if (!HdfSbufWriteUint32(data, (uint32_t)(uintptr_t)handle)) { HDF_LOGE("ClockGetParent: write handle fail!"); - ret = HDF_ERR_IO; HdfSbufRecycle(data); HdfSbufRecycle(reply); return NULL; @@ -341,7 +339,6 @@ DevHandle ClockGetParent(DevHandle handle) if (!HdfSbufReadUint32(reply, &parent)) { HDF_LOGE("ClockGetParent: read val fail!"); - ret = HDF_ERR_IO; } HdfSbufRecycle(data); diff --git a/framework/tools/hdi-gen/util/string_builder.cpp b/framework/tools/hdi-gen/util/string_builder.cpp index 858a55c94..12ea27d54 100644 --- a/framework/tools/hdi-gen/util/string_builder.cpp +++ b/framework/tools/hdi-gen/util/string_builder.cpp @@ -146,11 +146,11 @@ bool StringBuilder::Grow(size_t size) if (buffer_ != nullptr) { int ret = memcpy_s(newBuffer, newSize, buffer_, capacity_); + free(buffer_); if (ret != 0) { Logger::E(TAG, "memcpy_s error ret = %d!", ret); return false; } - free(buffer_); } buffer_ = newBuffer; capacity_ = newSize; -- Gitee