mirror of
https://github.com/open5gs/open5gs.git
synced 2026-05-05 07:08:11 +00:00
Use talloc for all memory pool (#1263)
This commit is contained in:
parent
49d9ed03c7
commit
b988e7edce
768 changed files with 4632 additions and 4901 deletions
|
|
@ -15,10 +15,9 @@ OpenAPI_iptv_config_data_t *OpenAPI_iptv_config_data_create(
|
|||
char *res_uri
|
||||
)
|
||||
{
|
||||
OpenAPI_iptv_config_data_t *iptv_config_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_iptv_config_data_t));
|
||||
if (!iptv_config_data_local_var) {
|
||||
return NULL;
|
||||
}
|
||||
OpenAPI_iptv_config_data_t *iptv_config_data_local_var = ogs_malloc(sizeof(OpenAPI_iptv_config_data_t));
|
||||
ogs_assert(iptv_config_data_local_var);
|
||||
|
||||
iptv_config_data_local_var->supi = supi;
|
||||
iptv_config_data_local_var->inter_group_id = inter_group_id;
|
||||
iptv_config_data_local_var->dnn = dnn;
|
||||
|
|
@ -44,6 +43,7 @@ void OpenAPI_iptv_config_data_free(OpenAPI_iptv_config_data_t *iptv_config_data)
|
|||
ogs_free(iptv_config_data->af_app_id);
|
||||
OpenAPI_list_for_each(iptv_config_data->multi_acc_ctrls, node) {
|
||||
OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
|
||||
ogs_free(localKeyValue->key);
|
||||
OpenAPI_multicast_access_control_free(localKeyValue->value);
|
||||
ogs_free(localKeyValue);
|
||||
}
|
||||
|
|
@ -207,9 +207,9 @@ OpenAPI_iptv_config_data_t *OpenAPI_iptv_config_data_parseFromJSON(cJSON *iptv_c
|
|||
cJSON *localMapObject = multi_acc_ctrls_local_map;
|
||||
if (cJSON_IsObject(multi_acc_ctrls_local_map)) {
|
||||
localMapKeyPair = OpenAPI_map_create(
|
||||
localMapObject->string, OpenAPI_multicast_access_control_parseFromJSON(localMapObject));
|
||||
ogs_strdup(localMapObject->string), OpenAPI_multicast_access_control_parseFromJSON(localMapObject));
|
||||
} else if (cJSON_IsNull(multi_acc_ctrls_local_map)) {
|
||||
localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL);
|
||||
localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL);
|
||||
} else {
|
||||
ogs_error("OpenAPI_iptv_config_data_parseFromJSON() failed [multi_acc_ctrls]");
|
||||
goto end;
|
||||
|
|
@ -236,14 +236,14 @@ OpenAPI_iptv_config_data_t *OpenAPI_iptv_config_data_parseFromJSON(cJSON *iptv_c
|
|||
}
|
||||
|
||||
iptv_config_data_local_var = OpenAPI_iptv_config_data_create (
|
||||
supi ? ogs_strdup_or_assert(supi->valuestring) : NULL,
|
||||
inter_group_id ? ogs_strdup_or_assert(inter_group_id->valuestring) : NULL,
|
||||
dnn ? ogs_strdup_or_assert(dnn->valuestring) : NULL,
|
||||
supi ? ogs_strdup(supi->valuestring) : NULL,
|
||||
inter_group_id ? ogs_strdup(inter_group_id->valuestring) : NULL,
|
||||
dnn ? ogs_strdup(dnn->valuestring) : NULL,
|
||||
snssai ? snssai_local_nonprim : NULL,
|
||||
ogs_strdup_or_assert(af_app_id->valuestring),
|
||||
ogs_strdup(af_app_id->valuestring),
|
||||
multi_acc_ctrlsList,
|
||||
supp_feat ? ogs_strdup_or_assert(supp_feat->valuestring) : NULL,
|
||||
res_uri ? ogs_strdup_or_assert(res_uri->valuestring) : NULL
|
||||
supp_feat ? ogs_strdup(supp_feat->valuestring) : NULL,
|
||||
res_uri ? ogs_strdup(res_uri->valuestring) : NULL
|
||||
);
|
||||
|
||||
return iptv_config_data_local_var;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue