From e079a641aa2032f72de091a0ceef0f55474b2a7f Mon Sep 17 00:00:00 2001 From: Jaeyun Date: Tue, 1 Nov 2022 11:28:53 +0900 Subject: [PATCH] [Data] wrapper function to release data handle Code clean, add wrapper function to release edge-data handle. Signed-off-by: Jaeyun --- src/libnnstreamer-edge/nnstreamer-edge-data.c | 14 ++++++++++++++ src/libnnstreamer-edge/nnstreamer-edge-data.h | 5 +++++ src/libnnstreamer-edge/nnstreamer-edge-internal.c | 15 ++------------- 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/src/libnnstreamer-edge/nnstreamer-edge-data.c b/src/libnnstreamer-edge/nnstreamer-edge-data.c index dee77ea..6c35264 100644 --- a/src/libnnstreamer-edge/nnstreamer-edge-data.c +++ b/src/libnnstreamer-edge/nnstreamer-edge-data.c @@ -79,6 +79,20 @@ nns_edge_data_destroy (nns_edge_data_h data_h) return NNS_EDGE_ERROR_NONE; } +/** + * @brief Internal wrapper function of the nns_edge_data_destory() to avoid build warning of the incompatibe type casting. (See nns_edge_data_destroy_cb()) + */ +void +nns_edge_data_release_handle (void *data) +{ + nns_edge_data_h data_h = (nns_edge_data_h) data; + + if (data_h) { + if (NNS_EDGE_ERROR_NONE != nns_edge_data_destroy (data_h)) + nns_edge_logw ("Failed to destory the nns-edge data handle."); + } +} + /** * @brief Validate edge data handle. */ diff --git a/src/libnnstreamer-edge/nnstreamer-edge-data.h b/src/libnnstreamer-edge/nnstreamer-edge-data.h index 8250da9..f6452e3 100644 --- a/src/libnnstreamer-edge/nnstreamer-edge-data.h +++ b/src/libnnstreamer-edge/nnstreamer-edge-data.h @@ -42,6 +42,11 @@ typedef struct { nns_size_t meta_len; } nns_edge_data_header_s; +/** + * @brief Internal wrapper function of the nns_edge_data_destory() to avoid build warning of the incompatibe type casting. (See nns_edge_data_destroy_cb()) + */ +void nns_edge_data_release_handle (void *data); + /** * @brief Validate edge data handle. * @note This is internal function, DO NOT export this. diff --git a/src/libnnstreamer-edge/nnstreamer-edge-internal.c b/src/libnnstreamer-edge/nnstreamer-edge-internal.c index fb6ec0d..b8657f9 100644 --- a/src/libnnstreamer-edge/nnstreamer-edge-internal.c +++ b/src/libnnstreamer-edge/nnstreamer-edge-internal.c @@ -1635,18 +1635,6 @@ _nns_edge_is_connected (nns_edge_h edge_h) return false; } -/** - * @brief internal wrapper function of the nns_edge_data_destory () to avoid build warning of the incompatibe type casting. - */ -void -_nns_edge_data_destroy (nns_edge_data_h data_h) -{ - if (data_h) { - if (NNS_EDGE_ERROR_NONE != nns_edge_data_destroy (data_h)) - nns_edge_logw ("Failed to destory the nns-edge data handle."); - } -} - /** * @brief Send data to desination (broker or connected node), asynchronously. */ @@ -1690,7 +1678,8 @@ nns_edge_send (nns_edge_h edge_h, nns_edge_data_h data_h) /* Create new data handle and push it into send-queue. */ nns_edge_data_copy (data_h, &new_data_h); - if (!nns_edge_queue_push (eh->send_queue, new_data_h, _nns_edge_data_destroy)) { + if (!nns_edge_queue_push (eh->send_queue, new_data_h, + nns_edge_data_release_handle)) { nns_edge_loge ("Failed to send data, cannot push data into queue."); nns_edge_unlock (eh); return NNS_EDGE_ERROR_IO; -- 2.34.1