Use talloc for all memory pool (#1263)

This commit is contained in:
Sukchan Lee 2022-01-04 08:29:18 +09:00
parent 49d9ed03c7
commit b988e7edce
768 changed files with 4632 additions and 4901 deletions

View file

@ -15,10 +15,9 @@ OpenAPI_shared_data_t *OpenAPI_shared_data_create(
OpenAPI_list_t* shared_vn_group_datas
)
{
OpenAPI_shared_data_t *shared_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_shared_data_t));
if (!shared_data_local_var) {
return NULL;
}
OpenAPI_shared_data_t *shared_data_local_var = ogs_malloc(sizeof(OpenAPI_shared_data_t));
ogs_assert(shared_data_local_var);
shared_data_local_var->shared_data_id = shared_data_id;
shared_data_local_var->shared_am_data = shared_am_data;
shared_data_local_var->shared_sms_subs_data = shared_sms_subs_data;
@ -43,6 +42,7 @@ void OpenAPI_shared_data_free(OpenAPI_shared_data_t *shared_data)
OpenAPI_sms_management_subscription_data_1_free(shared_data->shared_sms_mng_subs_data);
OpenAPI_list_for_each(shared_data->shared_dnn_configurations, node) {
OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
ogs_free(localKeyValue->key);
OpenAPI_dnn_configuration_1_free(localKeyValue->value);
ogs_free(localKeyValue);
}
@ -50,12 +50,14 @@ void OpenAPI_shared_data_free(OpenAPI_shared_data_t *shared_data)
OpenAPI_trace_data_free(shared_data->shared_trace_data);
OpenAPI_list_for_each(shared_data->shared_snssai_infos, node) {
OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
ogs_free(localKeyValue->key);
OpenAPI_snssai_info_free(localKeyValue->value);
ogs_free(localKeyValue);
}
OpenAPI_list_free(shared_data->shared_snssai_infos);
OpenAPI_list_for_each(shared_data->shared_vn_group_datas, node) {
OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
ogs_free(localKeyValue->key);
OpenAPI_vn_group_data_free(localKeyValue->value);
ogs_free(localKeyValue);
}
@ -253,9 +255,9 @@ OpenAPI_shared_data_t *OpenAPI_shared_data_parseFromJSON(cJSON *shared_dataJSON)
cJSON *localMapObject = shared_dnn_configurations_local_map;
if (cJSON_IsObject(shared_dnn_configurations_local_map)) {
localMapKeyPair = OpenAPI_map_create(
localMapObject->string, OpenAPI_dnn_configuration_1_parseFromJSON(localMapObject));
ogs_strdup(localMapObject->string), OpenAPI_dnn_configuration_1_parseFromJSON(localMapObject));
} else if (cJSON_IsNull(shared_dnn_configurations_local_map)) {
localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL);
localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL);
} else {
ogs_error("OpenAPI_shared_data_parseFromJSON() failed [shared_dnn_configurations]");
goto end;
@ -286,9 +288,9 @@ OpenAPI_shared_data_t *OpenAPI_shared_data_parseFromJSON(cJSON *shared_dataJSON)
cJSON *localMapObject = shared_snssai_infos_local_map;
if (cJSON_IsObject(shared_snssai_infos_local_map)) {
localMapKeyPair = OpenAPI_map_create(
localMapObject->string, OpenAPI_snssai_info_parseFromJSON(localMapObject));
ogs_strdup(localMapObject->string), OpenAPI_snssai_info_parseFromJSON(localMapObject));
} else if (cJSON_IsNull(shared_snssai_infos_local_map)) {
localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL);
localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL);
} else {
ogs_error("OpenAPI_shared_data_parseFromJSON() failed [shared_snssai_infos]");
goto end;
@ -312,9 +314,9 @@ OpenAPI_shared_data_t *OpenAPI_shared_data_parseFromJSON(cJSON *shared_dataJSON)
cJSON *localMapObject = shared_vn_group_datas_local_map;
if (cJSON_IsObject(shared_vn_group_datas_local_map)) {
localMapKeyPair = OpenAPI_map_create(
localMapObject->string, OpenAPI_vn_group_data_parseFromJSON(localMapObject));
ogs_strdup(localMapObject->string), OpenAPI_vn_group_data_parseFromJSON(localMapObject));
} else if (cJSON_IsNull(shared_vn_group_datas_local_map)) {
localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL);
localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL);
} else {
ogs_error("OpenAPI_shared_data_parseFromJSON() failed [shared_vn_group_datas]");
goto end;
@ -324,7 +326,7 @@ OpenAPI_shared_data_t *OpenAPI_shared_data_parseFromJSON(cJSON *shared_dataJSON)
}
shared_data_local_var = OpenAPI_shared_data_create (
ogs_strdup_or_assert(shared_data_id->valuestring),
ogs_strdup(shared_data_id->valuestring),
shared_am_data ? shared_am_data_local_nonprim : NULL,
shared_sms_subs_data ? shared_sms_subs_data_local_nonprim : NULL,
shared_sms_mng_subs_data ? shared_sms_mng_subs_data_local_nonprim : NULL,