diff --git a/c/src/ml-api-common.c b/c/src/ml-api-common.c index 13b4fc7e..347fe7ef 100644 --- a/c/src/ml-api-common.c +++ b/c/src/ml-api-common.c @@ -365,7 +365,7 @@ ml_tensors_info_set_tensor_name (ml_tensors_info_h info, return ML_ERROR_INVALID_PARAMETER; } - g_free (_info->name); + g_clear_pointer (&_info->name, g_free); _info->name = g_strdup (name); G_UNLOCK_UNLESS_NOLOCK (*tensors_info); @@ -713,10 +713,7 @@ _ml_tensors_data_destroy_internal (ml_tensors_data_h data, gboolean free_data) } } else { for (i = 0; i < ML_TENSOR_SIZE_LIMIT; i++) { - if (_data->tensors[i].data) { - g_free (_data->tensors[i].data); - _data->tensors[i].data = NULL; - } + g_clear_pointer (&_data->tensors[i].data, g_free); } } } @@ -1101,7 +1098,7 @@ ml_tensors_data_set_tensor_data (ml_tensors_data_h data, unsigned int index, _ml_logw ("Memory allocation was not performed in ml_tensor_data_create() when tensor format is flexible."); - g_free (_data->tensors[index].data); + g_clear_pointer (&_data->tensors[index].data, g_free); status = _ml_tensor_data_alloc (_data, index, data_size); if (status != ML_ERROR_NONE) { diff --git a/c/src/ml-api-inference-pipeline.c b/c/src/ml-api-inference-pipeline.c index 45b2c70b..32d7748d 100644 --- a/c/src/ml-api-inference-pipeline.c +++ b/c/src/ml-api-inference-pipeline.c @@ -185,7 +185,7 @@ pipe_custom_remove_data (const pipe_custom_type_e type, const gchar * name) g_ml_custom_data = g_list_delete_link (g_ml_custom_data, link); - g_free (data->name); + g_clear_pointer (&data->name, g_free); g_free (data); } @@ -516,8 +516,7 @@ free_element_handle (gpointer data) NULL, NULL); } - g_free (item->callback_info); - item->callback_info = NULL; + g_clear_pointer (&item->callback_info, g_free); g_free (item); } @@ -576,13 +575,10 @@ cleanup_node (gpointer data) e->custom_destroy (e->custom_data, e); } - g_free (e->name); - if (e->src) - gst_object_unref (e->src); - if (e->sink) - gst_object_unref (e->sink); - - gst_object_unref (e->element); + g_clear_pointer (&e->name, g_free); + g_clear_pointer (&e->src, gst_object_unref); + g_clear_pointer (&e->sink, gst_object_unref); + g_clear_pointer (&e->element, gst_object_unref); gst_tensors_info_free (&e->tensors_info); @@ -605,7 +601,7 @@ cleanup_resource (gpointer data) release_tizen_resource (res->handle, res->type); } - g_free (res->type); + g_clear_pointer (&res->type, g_free); g_free (res); } @@ -2137,8 +2133,7 @@ ml_pipeline_switch_get_pad_list (ml_pipeline_switch_h h, char ***list) if (i > counter) { g_list_free_full (dllist, g_free); /* This frees all strings as well */ - g_free (*list); - *list = NULL; + g_clear_pointer (list, g_free); _ml_error_report ("Internal data inconsistency. This could be a bug in nnstreamer. Switch [%s].", @@ -2746,7 +2741,7 @@ ml_pipeline_custom_free_handle (ml_custom_filter_s * custom) if (custom) { g_mutex_lock (&custom->lock); - g_free (custom->name); + g_clear_pointer (&custom->name, g_free); ml_tensors_info_destroy (custom->in_info); ml_tensors_info_destroy (custom->out_info); @@ -3056,7 +3051,7 @@ ml_pipeline_if_custom_free (ml_if_custom_s * custom) if (custom) { g_mutex_lock (&custom->lock); - g_free (custom->name); + g_clear_pointer (&custom->name, g_free); g_mutex_unlock (&custom->lock); g_mutex_clear (&custom->lock); diff --git a/c/src/ml-api-inference-tizen-privilege-check.c b/c/src/ml-api-inference-tizen-privilege-check.c index 54e868a0..c702c7c1 100644 --- a/c/src/ml-api-inference-tizen-privilege-check.c +++ b/c/src/ml-api-inference-tizen-privilege-check.c @@ -378,8 +378,8 @@ ml_tizen_mm_res_release_rm (tizen_mm_handle_s * mm_handle) } for (i = 0; i < device->allocated_num; i++) { - g_free (device->device_node[i]); - g_free (device->omx_comp_name[i]); + g_clear_pointer (&device->device_node[i], g_free); + g_clear_pointer (&device->omx_comp_name[i], g_free); } } @@ -393,11 +393,9 @@ ml_tizen_mm_res_release_rm (tizen_mm_handle_s * mm_handle) _ml_loge ("Failed to unregister resource manager (%d).", ret); } - g_free (mm_handle->priv); - + g_clear_pointer (&mm_handle->priv, g_free); mm_handle->rm_h = NULL; mm_handle->invalid = FALSE; - mm_handle->priv = NULL; } /** diff --git a/c/src/ml-api-service-agent-client.c b/c/src/ml-api-service-agent-client.c index f40c499c..d6935373 100644 --- a/c/src/ml-api-service-agent-client.c +++ b/c/src/ml-api-service-agent-client.c @@ -413,9 +413,8 @@ _ml_service_pipeline_release_internal (ml_service_s * mls) } } - g_free (server->service_name); - g_free (server); - mls->priv = NULL; + g_clear_pointer (&server->service_name, g_free); + g_clear_pointer (&mls->priv, g_free); return ML_ERROR_NONE; } diff --git a/c/src/ml-api-service-extension.c b/c/src/ml-api-service-extension.c index a7cc55e7..77f582cc 100644 --- a/c/src/ml-api-service-extension.c +++ b/c/src/ml-api-service-extension.c @@ -127,7 +127,7 @@ _ml_extension_node_info_free (gpointer data) if (node_info->info) ml_tensors_info_destroy (node_info->info); - g_free (node_info->name); + g_clear_pointer (&node_info->name, g_free); g_free (node_info); } @@ -158,8 +158,8 @@ _ml_extension_msg_free (gpointer data) ml_tensors_data_destroy (msg->input); if (msg->output) ml_tensors_data_destroy (msg->output); + g_clear_pointer (&msg->name, g_free); - g_free (msg->name); g_free (msg); } diff --git a/c/src/ml-api-service-offloading.c b/c/src/ml-api-service-offloading.c index 1360b79b..dd17978e 100644 --- a/c/src/ml-api-service-offloading.c +++ b/c/src/ml-api-service-offloading.c @@ -166,10 +166,10 @@ _mlrs_set_edge_info (edge_info_s * edge_info, nns_edge_h edge_h) static void _mlrs_release_edge_info (edge_info_s * edge_info) { - g_free (edge_info->dest_host); - g_free (edge_info->host); - g_free (edge_info->topic); - g_free (edge_info->id); + g_clear_pointer (&edge_info->dest_host, g_free); + g_clear_pointer (&edge_info->host, g_free); + g_clear_pointer (&edge_info->topic, g_free); + g_clear_pointer (&edge_info->id, g_free); g_free (edge_info); } @@ -727,9 +727,8 @@ _ml_service_offloading_release_internal (ml_service_s * mls) offloading_s->service_table = NULL; } - g_free (offloading_s->path); - g_free (offloading_s); - mls->priv = NULL; + g_clear_pointer (&offloading_s->path, g_free); + g_clear_pointer (&mls->priv, g_free); return ML_ERROR_NONE; } @@ -764,7 +763,7 @@ _ml_service_offloading_set_information (ml_service_h handle, const gchar * name, "Write permission to dir '%s' is denied.", value); } - g_free (offloading_s->path); + g_clear_pointer (&offloading_s->path, g_free); offloading_s->path = g_strdup (value); if (offloading_s->offloading_mode == ML_SERVICE_OFFLOADING_MODE_TRAINING) { diff --git a/c/src/ml-api-service-training-offloading.c b/c/src/ml-api-service-training-offloading.c index 8a2ef519..13722432 100644 --- a/c/src/ml-api-service-training-offloading.c +++ b/c/src/ml-api-service-training-offloading.c @@ -98,7 +98,7 @@ _training_offloading_node_info_free (gpointer data) if (!node_info) return; - g_free (node_info->name); + g_clear_pointer (&node_info->name, g_free); g_free (node_info); } @@ -641,7 +641,7 @@ _ml_service_training_offloading_set_path (ml_service_s * mls, ret = _training_offloading_get_priv (mls, &training_s); g_return_val_if_fail (ret == ML_ERROR_NONE, ret); - g_free (training_s->path); + g_clear_pointer (&training_s->path, g_free); training_s->path = g_strdup (path); return ret; @@ -916,20 +916,11 @@ _ml_service_training_offloading_destroy (ml_service_s * mls) training_s->pipeline_h = NULL; } - g_free (training_s->path); - training_s->path = NULL; - - g_free (training_s->trained_model_path); - training_s->trained_model_path = NULL; - - g_free (training_s->receiver_pipe_json_str); - training_s->receiver_pipe_json_str = NULL; - - g_free (training_s->receiver_pipe); - training_s->receiver_pipe = NULL; - - g_free (training_s->sender_pipe); - training_s->sender_pipe = NULL; + g_clear_pointer (&training_s->path, g_free); + g_clear_pointer (&training_s->trained_model_path, g_free); + g_clear_pointer (&training_s->receiver_pipe_json_str, g_free); + g_clear_pointer (&training_s->receiver_pipe, g_free); + g_clear_pointer (&training_s->sender_pipe, g_free); g_free (training_s);