From fb089ef6bc23d410d3956fd677703e00e540dd2c Mon Sep 17 00:00:00 2001 From: "manu.tiwari" Date: Thu, 29 Apr 2021 17:18:12 +0530 Subject: [PATCH] [ITC][url-download][Non-ACR][Usage of CHECK_HANDLE_CLEANUP macro for better readability] Change-Id: I1502178bf13933a49423c3fe8a7cb58481d1482d Signed-off-by: manu.tiwari --- src/itc/url-download/ITs-url-download-common.h | 8 ++++++++ src/itc/url-download/ITs-url-download-set-get.c | 7 +------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/itc/url-download/ITs-url-download-common.h b/src/itc/url-download/ITs-url-download-common.h index 536faf8d5..cfa4c0064 100755 --- a/src/itc/url-download/ITs-url-download-common.h +++ b/src/itc/url-download/ITs-url-download-common.h @@ -67,6 +67,14 @@ void DownloadStateCallback(int download_id, download_state_e state, void *user_d return 1;\ }\ } +#define CHECK_HANDLE_CLEANUP(Handle, API, FreeResource) {\ + if ( Handle == NULL )\ + {\ + FPRINTF("[Line : %d][%s] %s failed, error returned = Handle returned is NULL\\n", __LINE__, API_NAMESPACE, API);\ + FreeResource;\ + return 1;\ + }\ +} #define RUN_POLLING_LOOP {\ g_pMainLoop = g_main_loop_new(NULL, false);\ diff --git a/src/itc/url-download/ITs-url-download-set-get.c b/src/itc/url-download/ITs-url-download-set-get.c index af0ac582d..e7d3b4489 100755 --- a/src/itc/url-download/ITs-url-download-set-get.c +++ b/src/itc/url-download/ITs-url-download-set-get.c @@ -149,12 +149,7 @@ int ITc_download_set_get_notification_app_control_p(void) // Target API nRet = download_get_notification_app_control(g_nDownloadRequestID, DOWNLOAD_NOTIFICATION_APP_CONTROL_TYPE_ONGOING, &pstGetAppControlHandle); PRINT_RESULT_CLEANUP(DOWNLOAD_ERROR_NONE, nRet, "download_get_notification_app_control", UrlDownloadGetError(nRet), app_control_destroy(pstAppControlHandle)); - if(pstGetAppControlHandle == NULL) - { - FPRINTF("[Line : %d][%s] download_get_notification_app_control, handle returned = NULL\\n", __LINE__, API_NAMESPACE); - app_control_destroy(pstAppControlHandle); - return 1; - } + CHECK_HANDLE_CLEANUP(pstGetAppControlHandle,"download_get_notification_app_control",app_control_destroy(pstAppControlHandle)); FREE_MEMORY(pstGetAppControlHandle); nRet = app_control_destroy(pstAppControlHandle); -- 2.34.1