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

@ -11,10 +11,9 @@ OpenAPI_sm_policy_data_t *OpenAPI_sm_policy_data_create(
char *supp_feat
)
{
OpenAPI_sm_policy_data_t *sm_policy_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_sm_policy_data_t));
if (!sm_policy_data_local_var) {
return NULL;
}
OpenAPI_sm_policy_data_t *sm_policy_data_local_var = ogs_malloc(sizeof(OpenAPI_sm_policy_data_t));
ogs_assert(sm_policy_data_local_var);
sm_policy_data_local_var->sm_policy_snssai_data = sm_policy_snssai_data;
sm_policy_data_local_var->um_data_limits = um_data_limits;
sm_policy_data_local_var->um_data = um_data;
@ -31,18 +30,21 @@ void OpenAPI_sm_policy_data_free(OpenAPI_sm_policy_data_t *sm_policy_data)
OpenAPI_lnode_t *node;
OpenAPI_list_for_each(sm_policy_data->sm_policy_snssai_data, node) {
OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
ogs_free(localKeyValue->key);
OpenAPI_sm_policy_snssai_data_free(localKeyValue->value);
ogs_free(localKeyValue);
}
OpenAPI_list_free(sm_policy_data->sm_policy_snssai_data);
OpenAPI_list_for_each(sm_policy_data->um_data_limits, node) {
OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
ogs_free(localKeyValue->key);
OpenAPI_usage_mon_data_limit_free(localKeyValue->value);
ogs_free(localKeyValue);
}
OpenAPI_list_free(sm_policy_data->um_data_limits);
OpenAPI_list_for_each(sm_policy_data->um_data, node) {
OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
ogs_free(localKeyValue->key);
OpenAPI_usage_mon_data_free(localKeyValue->value);
ogs_free(localKeyValue);
}
@ -160,9 +162,9 @@ OpenAPI_sm_policy_data_t *OpenAPI_sm_policy_data_parseFromJSON(cJSON *sm_policy_
cJSON *localMapObject = sm_policy_snssai_data_local_map;
if (cJSON_IsObject(sm_policy_snssai_data_local_map)) {
localMapKeyPair = OpenAPI_map_create(
localMapObject->string, OpenAPI_sm_policy_snssai_data_parseFromJSON(localMapObject));
ogs_strdup(localMapObject->string), OpenAPI_sm_policy_snssai_data_parseFromJSON(localMapObject));
} else if (cJSON_IsNull(sm_policy_snssai_data_local_map)) {
localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL);
localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL);
} else {
ogs_error("OpenAPI_sm_policy_data_parseFromJSON() failed [sm_policy_snssai_data]");
goto end;
@ -185,9 +187,9 @@ OpenAPI_sm_policy_data_t *OpenAPI_sm_policy_data_parseFromJSON(cJSON *sm_policy_
cJSON *localMapObject = um_data_limits_local_map;
if (cJSON_IsObject(um_data_limits_local_map)) {
localMapKeyPair = OpenAPI_map_create(
localMapObject->string, OpenAPI_usage_mon_data_limit_parseFromJSON(localMapObject));
ogs_strdup(localMapObject->string), OpenAPI_usage_mon_data_limit_parseFromJSON(localMapObject));
} else if (cJSON_IsNull(um_data_limits_local_map)) {
localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL);
localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL);
} else {
ogs_error("OpenAPI_sm_policy_data_parseFromJSON() failed [um_data_limits]");
goto end;
@ -211,9 +213,9 @@ OpenAPI_sm_policy_data_t *OpenAPI_sm_policy_data_parseFromJSON(cJSON *sm_policy_
cJSON *localMapObject = um_data_local_map;
if (cJSON_IsObject(um_data_local_map)) {
localMapKeyPair = OpenAPI_map_create(
localMapObject->string, OpenAPI_usage_mon_data_parseFromJSON(localMapObject));
ogs_strdup(localMapObject->string), OpenAPI_usage_mon_data_parseFromJSON(localMapObject));
} else if (cJSON_IsNull(um_data_local_map)) {
localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL);
localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL);
} else {
ogs_error("OpenAPI_sm_policy_data_parseFromJSON() failed [um_data]");
goto end;
@ -235,7 +237,7 @@ OpenAPI_sm_policy_data_t *OpenAPI_sm_policy_data_parseFromJSON(cJSON *sm_policy_
sm_policy_snssai_dataList,
um_data_limits ? um_data_limitsList : NULL,
um_data ? um_dataList : NULL,
supp_feat ? ogs_strdup_or_assert(supp_feat->valuestring) : NULL
supp_feat ? ogs_strdup(supp_feat->valuestring) : NULL
);
return sm_policy_data_local_var;