diff --git a/framework/support/platform/src/clock/clock_if.c b/framework/support/platform/src/clock/clock_if.c index 080e8d3cfe9ac60ccc48c84197789000c797a593..9100142095f0c847a4d965ce0081daf52dbf3a90 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 7c63c792b185f5a673e5bebeaf6cd8a6c225c430..1888469d6a6a290dd800a87381bf2b3520f3d951 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 858a55c941b4c89e99e68fefc1f8962445ab6d0c..12ea27d54ae6a73d5692246c19af0382067790d8 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;