From b988e7edce50e47916024933a2fbb4692012b7fe Mon Sep 17 00:00:00 2001 From: Sukchan Lee Date: Tue, 4 Jan 2022 08:29:18 +0900 Subject: [PATCH] Use talloc for all memory pool (#1263) --- docker/debian/latest/base/Dockerfile | 2 +- lib/asn1c/common/asn_internal.h | 53 +++-- lib/core/ogs-conv.c | 6 +- lib/core/ogs-core.h | 2 + lib/core/ogs-epoll.c | 66 +++--- lib/core/ogs-hash.c | 11 +- lib/core/ogs-memory.c | 55 ++--- lib/core/ogs-memory.h | 28 +-- lib/core/ogs-strings.c | 210 ++++++++++++------ lib/core/ogs-strings.h | 74 +++--- lib/crypt/snow-3g.c | 3 +- lib/crypt/zuc.c | 6 +- lib/gtp/context.c | 3 - lib/pfcp/context.c | 3 - lib/sbi/client.c | 13 +- lib/sbi/conv.c | 3 +- lib/sbi/custom/patch_item.c | 11 +- lib/sbi/custom/ue_authentication_ctx.c | 14 +- lib/sbi/message.c | 2 + lib/sbi/openapi/external/cJSON.c | 8 +- lib/sbi/openapi/include/list.h | 2 - lib/sbi/openapi/model/acc_net_ch_id.c | 9 +- .../openapi/model/acc_net_charging_address.c | 11 +- .../openapi/model/acceptable_service_info.c | 16 +- .../openapi/model/access_and_mobility_data.c | 29 ++- .../access_and_mobility_subscription_data.c | 24 +- .../access_and_mobility_subscription_data_1.c | 24 +- .../model/access_net_charging_identifier.c | 7 +- lib/sbi/openapi/model/access_right_status.c | 7 +- lib/sbi/openapi/model/access_tech.c | 7 +- lib/sbi/openapi/model/access_token_err.c | 11 +- lib/sbi/openapi/model/access_token_req.c | 21 +- lib/sbi/openapi/model/access_type_rm.c | 7 +- lib/sbi/openapi/model/accu_usage_report.c | 9 +- lib/sbi/openapi/model/accumulated_usage.c | 7 +- lib/sbi/openapi/model/acknowledge_info.c | 15 +- lib/sbi/openapi/model/acs_info.c | 13 +- lib/sbi/openapi/model/acs_info_1.c | 13 +- lib/sbi/openapi/model/acs_info_rm.c | 13 +- .../openapi/model/additional_access_info.c | 7 +- .../openapi/model/additional_snssai_data.c | 7 +- .../openapi/model/af_event_exposure_data.c | 11 +- lib/sbi/openapi/model/af_event_notification.c | 7 +- lib/sbi/openapi/model/af_event_subscription.c | 7 +- lib/sbi/openapi/model/af_external.c | 9 +- .../openapi/model/af_routing_requirement.c | 7 +- .../openapi/model/af_routing_requirement_rm.c | 7 +- .../openapi/model/allowed_mtc_provider_info.c | 11 +- lib/sbi/openapi/model/allowed_nssai.c | 7 +- lib/sbi/openapi/model/allowed_snssai.c | 7 +- .../openapi/model/alternative_qos_profile.c | 13 +- lib/sbi/openapi/model/am_policy_data.c | 14 +- lib/sbi/openapi/model/ambr.c | 11 +- lib/sbi/openapi/model/ambr_1.c | 11 +- lib/sbi/openapi/model/ambr_rm.c | 11 +- .../model/amf3_gpp_access_registration.c | 27 ++- ...mf3_gpp_access_registration_modification.c | 9 +- lib/sbi/openapi/model/amf_cond.c | 11 +- lib/sbi/openapi/model/amf_dereg_info.c | 7 +- lib/sbi/openapi/model/amf_event.c | 7 +- lib/sbi/openapi/model/amf_event_area.c | 9 +- lib/sbi/openapi/model/amf_event_mode.c | 9 +- .../openapi/model/amf_event_subscription.c | 25 +-- .../model/amf_event_subscription_add_info.c | 9 +- lib/sbi/openapi/model/amf_event_trigger.c | 7 +- lib/sbi/openapi/model/amf_event_type.c | 7 +- lib/sbi/openapi/model/amf_info.c | 11 +- .../model/amf_non3_gpp_access_registration.c | 27 ++- ...on3_gpp_access_registration_modification.c | 9 +- .../model/amf_status_change_notification.c | 7 +- .../amf_status_change_subscription_data.c | 9 +- lib/sbi/openapi/model/amf_status_info.c | 11 +- lib/sbi/openapi/model/amf_subscription_info.c | 13 +- lib/sbi/openapi/model/an_gw_address.c | 11 +- lib/sbi/openapi/model/apn_rate_status.c | 9 +- lib/sbi/openapi/model/app_descriptor.c | 11 +- lib/sbi/openapi/model/app_detection_info.c | 11 +- lib/sbi/openapi/model/app_port_id.c | 7 +- lib/sbi/openapi/model/app_session_context.c | 7 +- .../model/app_session_context_req_data.c | 50 ++--- .../model/app_session_context_resp_data.c | 9 +- .../model/app_session_context_update_data.c | 28 +-- .../app_session_context_update_data_patch.c | 7 +- .../model/application_data_change_notif.c | 9 +- lib/sbi/openapi/model/application_data_subs.c | 13 +- lib/sbi/openapi/model/area.c | 11 +- lib/sbi/openapi/model/area_1.c | 11 +- lib/sbi/openapi/model/area_of_validity.c | 7 +- lib/sbi/openapi/model/area_scope.c | 18 +- lib/sbi/openapi/model/arp.c | 7 +- lib/sbi/openapi/model/arp_1.c | 7 +- lib/sbi/openapi/model/assign_ebi_data.c | 7 +- lib/sbi/openapi/model/assign_ebi_error.c | 7 +- lib/sbi/openapi/model/assign_ebi_failed.c | 7 +- lib/sbi/openapi/model/assigned_ebi_data.c | 7 +- lib/sbi/openapi/model/association_type.c | 7 +- lib/sbi/openapi/model/atom.c | 11 +- lib/sbi/openapi/model/atsss_capability.c | 7 +- lib/sbi/openapi/model/ausf_info.c | 11 +- lib/sbi/openapi/model/auth_event.c | 13 +- lib/sbi/openapi/model/authentication_info.c | 21 +- .../model/authentication_info_request.c | 15 +- .../model/authentication_info_result.c | 11 +- .../model/authentication_subscription.c | 21 +- lib/sbi/openapi/model/authentication_vector.c | 21 +- lib/sbi/openapi/model/authorization_data.c | 9 +- .../openapi/model/authorized_default_qos.c | 15 +- .../model/authorized_network_slice_info.c | 21 +- lib/sbi/openapi/model/av5_ghe_aka.c | 15 +- lib/sbi/openapi/model/av5g_aka.c | 13 +- lib/sbi/openapi/model/av_eap_aka_prime.c | 17 +- lib/sbi/openapi/model/av_eps_aka.c | 15 +- lib/sbi/openapi/model/av_ims_gba_eap_aka.c | 17 +- lib/sbi/openapi/model/backup_amf_info.c | 9 +- lib/sbi/openapi/model/battery_indication.c | 7 +- lib/sbi/openapi/model/battery_indication_rm.c | 7 +- lib/sbi/openapi/model/bdt_data.c | 17 +- lib/sbi/openapi/model/bdt_data_patch.c | 7 +- lib/sbi/openapi/model/bdt_policy_data.c | 17 +- lib/sbi/openapi/model/bdt_policy_data_patch.c | 9 +- lib/sbi/openapi/model/bdt_policy_status.c | 7 +- lib/sbi/openapi/model/binding_resp.c | 9 +- .../model/bridge_management_container.c | 7 +- lib/sbi/openapi/model/bsf_info.c | 11 +- lib/sbi/openapi/model/cag_ack_data.c | 9 +- lib/sbi/openapi/model/cag_data.c | 14 +- lib/sbi/openapi/model/cag_data_1.c | 14 +- lib/sbi/openapi/model/cag_info.c | 9 +- lib/sbi/openapi/model/cag_info_1.c | 9 +- .../openapi/model/candidate_for_replacement.c | 9 +- lib/sbi/openapi/model/ce_mode_b_ind.c | 7 +- lib/sbi/openapi/model/change_item.c | 15 +- lib/sbi/openapi/model/charging_data.c | 15 +- lib/sbi/openapi/model/charging_information.c | 19 +- lib/sbi/openapi/model/chf_info.c | 13 +- lib/sbi/openapi/model/civic_address.c | 75 +++---- lib/sbi/openapi/model/cm_info.c | 7 +- lib/sbi/openapi/model/cm_state.c | 7 +- lib/sbi/openapi/model/cn_assisted_ran_para.c | 7 +- lib/sbi/openapi/model/cnf.c | 7 +- lib/sbi/openapi/model/cnf_unit.c | 7 +- .../model/communication_characteristics.c | 7 +- lib/sbi/openapi/model/complex_query.c | 7 +- lib/sbi/openapi/model/condition_data.c | 13 +- lib/sbi/openapi/model/configured_snssai.c | 7 +- lib/sbi/openapi/model/confirmation_data.c | 11 +- .../model/confirmation_data_response.c | 11 +- lib/sbi/openapi/model/context_data_sets.c | 7 +- lib/sbi/openapi/model/context_info.c | 9 +- lib/sbi/openapi/model/data_change_notify.c | 11 +- lib/sbi/openapi/model/data_filter.c | 21 +- lib/sbi/openapi/model/data_ind.c | 7 +- .../model/datalink_reporting_configuration.c | 9 +- .../openapi/model/ddd_traffic_descriptor.c | 13 +- lib/sbi/openapi/model/ddn_failure_sub_info.c | 9 +- lib/sbi/openapi/model/ddn_failure_subs.c | 7 +- .../model/default_notification_subscription.c | 13 +- .../openapi/model/default_unrelated_class.c | 9 +- .../openapi/model/default_unrelated_class_1.c | 9 +- lib/sbi/openapi/model/deregistration_data.c | 9 +- lib/sbi/openapi/model/deregistration_info.c | 11 +- lib/sbi/openapi/model/dnai_information.c | 9 +- lib/sbi/openapi/model/dnf.c | 7 +- lib/sbi/openapi/model/dnf_unit.c | 7 +- lib/sbi/openapi/model/dnn_configuration.c | 13 +- lib/sbi/openapi/model/dnn_configuration_1.c | 13 +- lib/sbi/openapi/model/dnn_info.c | 11 +- .../model/dnn_route_selection_descriptor.c | 9 +- lib/sbi/openapi/model/dnn_smf_info_item.c | 9 +- lib/sbi/openapi/model/dnn_upf_info_item.c | 12 +- lib/sbi/openapi/model/domain_name_protocol.c | 7 +- .../downlink_data_notification_control.c | 7 +- .../downlink_data_notification_control_rm.c | 7 +- lib/sbi/openapi/model/dynamic5_qi.c | 9 +- lib/sbi/openapi/model/eap_session.c | 20 +- lib/sbi/openapi/model/ebi_arp_mapping.c | 7 +- lib/sbi/openapi/model/ec_restriction.c | 11 +- .../openapi/model/ec_restriction_data_wb.c | 7 +- lib/sbi/openapi/model/ecgi.c | 11 +- lib/sbi/openapi/model/ecgi_1.c | 11 +- lib/sbi/openapi/model/edrx_parameters.c | 9 +- lib/sbi/openapi/model/edrx_parameters_1.c | 9 +- lib/sbi/openapi/model/ee_group_profile_data.c | 10 +- lib/sbi/openapi/model/ee_profile_data.c | 10 +- lib/sbi/openapi/model/ee_subscription.c | 24 +- lib/sbi/openapi/model/ellipsoid_arc.c | 7 +- lib/sbi/openapi/model/ellipsoid_arc_all_of.c | 7 +- lib/sbi/openapi/model/emergency_info.c | 11 +- lib/sbi/openapi/model/emergency_info_1.c | 11 +- .../enhanced_coverage_restriction_data.c | 7 +- lib/sbi/openapi/model/eps_bearer_info.c | 7 +- lib/sbi/openapi/model/eps_interworking_info.c | 12 +- lib/sbi/openapi/model/eps_iwk_pgw.c | 11 +- lib/sbi/openapi/model/eps_nas_security_mode.c | 7 +- lib/sbi/openapi/model/eps_pdn_cnx_info.c | 7 +- lib/sbi/openapi/model/error_report.c | 9 +- lib/sbi/openapi/model/eth_flow_description.c | 21 +- lib/sbi/openapi/model/eutra_location.c | 13 +- lib/sbi/openapi/model/event_id.c | 7 +- lib/sbi/openapi/model/event_report_mode.c | 7 +- lib/sbi/openapi/model/event_type.c | 7 +- lib/sbi/openapi/model/events_notification.c | 11 +- lib/sbi/openapi/model/events_subsc_put_data.c | 15 +- lib/sbi/openapi/model/events_subsc_req_data.c | 11 +- .../openapi/model/events_subsc_req_data_rm.c | 11 +- lib/sbi/openapi/model/exemption_ind.c | 7 +- lib/sbi/openapi/model/expected_ue_behavior.c | 9 +- lib/sbi/openapi/model/expected_ue_behaviour.c | 13 +- .../model/expected_ue_behaviour_data.c | 9 +- .../model/expected_ue_behaviour_data_1.c | 9 +- .../model/exposure_data_change_notification.c | 11 +- .../model/exposure_data_subscription.c | 15 +- .../model/ext_amf_event_subscription.c | 27 ++- lib/sbi/openapi/model/ext_problem_details.c | 21 +- lib/sbi/openapi/model/ext_snssai.c | 9 +- .../openapi/model/extended_problem_details.c | 21 +- .../model/extended_problem_details_all_of.c | 7 +- lib/sbi/openapi/model/external_client_type.c | 7 +- .../openapi/model/external_unrelated_class.c | 7 +- lib/sbi/openapi/model/final_unit_action.c | 7 +- lib/sbi/openapi/model/flow_info.c | 9 +- lib/sbi/openapi/model/flow_information.c | 17 +- lib/sbi/openapi/model/flows.c | 7 +- lib/sbi/openapi/model/frame_route_info.c | 11 +- lib/sbi/openapi/model/frame_route_info_1.c | 11 +- lib/sbi/openapi/model/gad_shape.c | 7 +- .../openapi/model/gbr_qos_flow_information.c | 15 +- lib/sbi/openapi/model/geographic_area.c | 7 +- .../openapi/model/geographical_coordinates.c | 7 +- lib/sbi/openapi/model/global_ran_node_id.c | 19 +- lib/sbi/openapi/model/global_ran_node_id_1.c | 19 +- lib/sbi/openapi/model/gmlc_info.c | 7 +- lib/sbi/openapi/model/gnb_id.c | 9 +- lib/sbi/openapi/model/group_identifiers.c | 11 +- lib/sbi/openapi/model/guami.c | 9 +- lib/sbi/openapi/model/guami_list_cond.c | 7 +- lib/sbi/openapi/model/hfc_node_id.c | 9 +- lib/sbi/openapi/model/hsmf_update_data.c | 29 ++- lib/sbi/openapi/model/hsmf_update_error.c | 11 +- lib/sbi/openapi/model/hsmf_updated_data.c | 11 +- .../model/hss_authentication_info_request.c | 9 +- .../model/hss_authentication_info_result.c | 9 +- .../model/hss_authentication_vectors.c | 7 +- lib/sbi/openapi/model/hss_info.c | 9 +- lib/sbi/openapi/model/id_translation_result.c | 13 +- lib/sbi/openapi/model/identity_data.c | 11 +- lib/sbi/openapi/model/identity_range.c | 13 +- lib/sbi/openapi/model/immediate_mdt_conf.c | 7 +- lib/sbi/openapi/model/imsi_range.c | 13 +- .../indirect_data_forwarding_tunnel_info.c | 13 +- lib/sbi/openapi/model/inline_object.c | 58 +++-- lib/sbi/openapi/model/inline_object_1.c | 61 +++-- lib/sbi/openapi/model/inline_object_2.c | 10 +- lib/sbi/openapi/model/inline_object_3.c | 10 +- lib/sbi/openapi/model/inline_object_4.c | 13 +- lib/sbi/openapi/model/inline_response_200.c | 12 +- .../openapi/model/inter_freq_target_info.c | 7 +- .../openapi/model/inter_freq_target_info_1.c | 7 +- .../openapi/model/interface_upf_info_item.c | 15 +- .../openapi/model/internal_group_id_range.c | 13 +- lib/sbi/openapi/model/invalid_param.c | 11 +- lib/sbi/openapi/model/invalid_param_1.c | 11 +- lib/sbi/openapi/model/ip_address.c | 13 +- lib/sbi/openapi/model/ip_address_1.c | 13 +- lib/sbi/openapi/model/ip_end_point.c | 11 +- .../openapi/model/ip_multicast_address_info.c | 15 +- lib/sbi/openapi/model/ip_sm_gw_registration.c | 9 +- lib/sbi/openapi/model/iptv_config_data.c | 24 +- .../openapi/model/iptv_config_data_patch.c | 12 +- lib/sbi/openapi/model/ipv4_address_range.c | 11 +- lib/sbi/openapi/model/ipv6_prefix_range.c | 11 +- lib/sbi/openapi/model/key_amf.c | 9 +- lib/sbi/openapi/model/ladn_info.c | 9 +- .../lcs_broadcast_assistance_types_data.c | 7 +- .../lcs_broadcast_assistance_types_data_1.c | 7 +- lib/sbi/openapi/model/lcs_client_external.c | 7 +- .../openapi/model/lcs_client_group_external.c | 9 +- lib/sbi/openapi/model/lcs_mo_data.c | 7 +- lib/sbi/openapi/model/lcs_privacy.c | 11 +- lib/sbi/openapi/model/lcs_privacy_data.c | 7 +- lib/sbi/openapi/model/lcs_privacy_data_1.c | 7 +- .../model/limit_id_to_monitoring_key.c | 11 +- lib/sbi/openapi/model/link.c | 9 +- lib/sbi/openapi/model/links_value_schema.c | 9 +- lib/sbi/openapi/model/lmf_info.c | 9 +- lib/sbi/openapi/model/location_accuracy.c | 7 +- lib/sbi/openapi/model/location_area.c | 7 +- lib/sbi/openapi/model/location_area_1.c | 7 +- lib/sbi/openapi/model/location_filter.c | 7 +- lib/sbi/openapi/model/location_info.c | 13 +- .../model/location_reporting_configuration.c | 7 +- lib/sbi/openapi/model/loss_connectivity_cfg.c | 7 +- lib/sbi/openapi/model/lpi.c | 7 +- lib/sbi/openapi/model/lpi_1.c | 7 +- lib/sbi/openapi/model/lte_m_ind.c | 7 +- lib/sbi/openapi/model/lte_v2x_auth.c | 7 +- lib/sbi/openapi/model/lte_v2x_auth_1.c | 7 +- lib/sbi/openapi/model/mapping_of_snssai.c | 7 +- lib/sbi/openapi/model/mbsfn_area.c | 7 +- lib/sbi/openapi/model/mdt_configuration.c | 7 +- lib/sbi/openapi/model/mdt_configuration_1.c | 7 +- lib/sbi/openapi/model/media_component.c | 42 ++-- lib/sbi/openapi/model/media_component_rm.c | 42 ++-- lib/sbi/openapi/model/media_sub_component.c | 15 +- .../openapi/model/media_sub_component_rm.c | 15 +- lib/sbi/openapi/model/message_waiting_data.c | 7 +- lib/sbi/openapi/model/mm_context.c | 11 +- lib/sbi/openapi/model/mme_capabilities.c | 7 +- lib/sbi/openapi/model/mo_exp_data_counter.c | 9 +- .../model/model_5_gvn_group_configuration.c | 15 +- .../openapi/model/model_5_gvn_group_data.c | 9 +- .../openapi/model/modification_notification.c | 7 +- .../openapi/model/monitoring_configuration.c | 11 +- lib/sbi/openapi/model/mtc_provider.c | 11 +- .../openapi/model/multicast_access_control.c | 15 +- lib/sbi/openapi/model/n1_message_container.c | 11 +- .../openapi/model/n1_message_notification.c | 13 +- .../model/n1_n2_message_transfer_error.c | 7 +- .../model/n1_n2_message_transfer_req_data.c | 13 +- .../model/n1_n2_message_transfer_rsp_data.c | 9 +- .../openapi/model/n1_n2_msg_txfr_err_detail.c | 7 +- .../n1_n2_msg_txfr_failure_notification.c | 9 +- lib/sbi/openapi/model/n2_info_container.c | 7 +- lib/sbi/openapi/model/n2_info_content.c | 7 +- .../model/n2_info_notification_rsp_data.c | 7 +- .../model/n2_information_notification.c | 17 +- .../model/n2_information_transfer_error.c | 7 +- .../model/n2_information_transfer_req_data.c | 9 +- .../model/n2_information_transfer_rsp_data.c | 9 +- lib/sbi/openapi/model/n2_interface_amf_info.c | 13 +- lib/sbi/openapi/model/n2_ran_information.c | 7 +- lib/sbi/openapi/model/n2_sm_information.c | 7 +- lib/sbi/openapi/model/n3ga_location.c | 17 +- lib/sbi/openapi/model/n4_information.c | 7 +- lib/sbi/openapi/model/nas_security_mode.c | 7 +- lib/sbi/openapi/model/ncgi.c | 11 +- lib/sbi/openapi/model/ncgi_1.c | 11 +- lib/sbi/openapi/model/nef_cond.c | 9 +- lib/sbi/openapi/model/nef_info.c | 11 +- lib/sbi/openapi/model/network_area_info.c | 7 +- lib/sbi/openapi/model/network_area_info_1.c | 7 +- .../model/network_node_diameter_address.c | 11 +- .../model/network_node_diameter_address_1.c | 11 +- lib/sbi/openapi/model/network_slice_cond.c | 9 +- lib/sbi/openapi/model/nf_group_cond.c | 9 +- lib/sbi/openapi/model/nf_info.c | 7 +- lib/sbi/openapi/model/nf_instance_id_cond.c | 9 +- .../openapi/model/nf_instance_id_list_cond.c | 9 +- lib/sbi/openapi/model/nf_profile.c | 102 +++++---- lib/sbi/openapi/model/nf_service.c | 32 +-- lib/sbi/openapi/model/nf_service_set_cond.c | 9 +- lib/sbi/openapi/model/nf_service_version.c | 13 +- lib/sbi/openapi/model/nf_set_cond.c | 9 +- lib/sbi/openapi/model/nf_type_cond.c | 7 +- lib/sbi/openapi/model/ng_ap_cause.c | 7 +- lib/sbi/openapi/model/ng_ksi.c | 7 +- lib/sbi/openapi/model/ng_ran_target_id.c | 7 +- lib/sbi/openapi/model/nidd_information.c | 13 +- lib/sbi/openapi/model/nidd_information_1.c | 13 +- lib/sbi/openapi/model/non_dynamic5_qi.c | 7 +- .../non_ue_n2_info_subscription_create_data.c | 13 +- ...non_ue_n2_info_subscription_created_data.c | 11 +- lib/sbi/openapi/model/notif_condition.c | 11 +- lib/sbi/openapi/model/notification_data.c | 9 +- lib/sbi/openapi/model/notification_item.c | 9 +- lib/sbi/openapi/model/notify_item.c | 9 +- lib/sbi/openapi/model/npn_access_info.c | 9 +- lib/sbi/openapi/model/nr_location.c | 13 +- lib/sbi/openapi/model/nr_v2x_auth.c | 7 +- lib/sbi/openapi/model/nr_v2x_auth_1.c | 7 +- lib/sbi/openapi/model/nrf_info.c | 99 ++++++--- lib/sbi/openapi/model/nrppa_information.c | 11 +- lib/sbi/openapi/model/nsi_information.c | 15 +- lib/sbi/openapi/model/nssaa_status.c | 7 +- lib/sbi/openapi/model/nssai.c | 16 +- lib/sbi/openapi/model/nssai_1.c | 16 +- lib/sbi/openapi/model/nssai_ack_data.c | 9 +- lib/sbi/openapi/model/nssai_mapping.c | 7 +- lib/sbi/openapi/model/nwdaf_cond.c | 9 +- lib/sbi/openapi/model/nwdaf_event.c | 7 +- lib/sbi/openapi/model/nwdaf_info.c | 7 +- lib/sbi/openapi/model/odb_data.c | 7 +- .../model/operator_specific_data_container.c | 15 +- lib/sbi/openapi/model/options_response.c | 9 +- .../openapi/model/out_of_credit_information.c | 7 +- lib/sbi/openapi/model/packet_filter_info.c | 17 +- lib/sbi/openapi/model/parameter_combination.c | 11 +- lib/sbi/openapi/model/partial_record_method.c | 7 +- .../openapi/model/partial_success_report.c | 7 +- lib/sbi/openapi/model/patch_result.c | 7 +- lib/sbi/openapi/model/pc5_flow_bit_rates.c | 11 +- lib/sbi/openapi/model/pc5_qo_s_para.c | 9 +- lib/sbi/openapi/model/pc5_qos_flow_item.c | 7 +- lib/sbi/openapi/model/pcc_rule.c | 29 ++- lib/sbi/openapi/model/pcf_binding.c | 45 ++-- lib/sbi/openapi/model/pcf_binding_patch.c | 27 ++- lib/sbi/openapi/model/pcf_info.c | 15 +- lib/sbi/openapi/model/pcscf_info.c | 15 +- .../model/pcscf_restoration_notification.c | 9 +- .../model/pcscf_restoration_request_data.c | 17 +- lib/sbi/openapi/model/pdu_session.c | 11 +- lib/sbi/openapi/model/pdu_session_1.c | 11 +- lib/sbi/openapi/model/pdu_session_context.c | 35 ++- .../openapi/model/pdu_session_create_data.c | 55 +++-- .../openapi/model/pdu_session_create_error.c | 11 +- .../openapi/model/pdu_session_created_data.c | 33 ++- .../model/pdu_session_management_data.c | 27 ++- .../openapi/model/pdu_session_notify_item.c | 7 +- lib/sbi/openapi/model/pdu_session_status.c | 7 +- .../openapi/model/pdu_session_status_cfg.c | 9 +- .../openapi/model/pdu_session_tsn_bridge.c | 7 +- lib/sbi/openapi/model/pdu_session_types.c | 7 +- lib/sbi/openapi/model/pdu_session_types_1.c | 7 +- lib/sbi/openapi/model/pei_update_info.c | 9 +- lib/sbi/openapi/model/periodicity.c | 7 +- .../openapi/model/pfd_change_notification.c | 9 +- lib/sbi/openapi/model/pfd_content.c | 15 +- lib/sbi/openapi/model/pfd_data.c | 11 +- lib/sbi/openapi/model/pfd_data_for_app.c | 11 +- lib/sbi/openapi/model/pfd_data_for_app_ext.c | 13 +- .../model/pfd_data_for_app_ext_all_of.c | 9 +- lib/sbi/openapi/model/pgw_info.c | 11 +- lib/sbi/openapi/model/pgw_info_1.c | 11 +- lib/sbi/openapi/model/plmn_ec_info.c | 7 +- lib/sbi/openapi/model/plmn_id.c | 11 +- lib/sbi/openapi/model/plmn_id_1.c | 11 +- lib/sbi/openapi/model/plmn_id_nid.c | 13 +- lib/sbi/openapi/model/plmn_id_nid_1.c | 13 +- lib/sbi/openapi/model/plmn_operator_class.c | 9 +- lib/sbi/openapi/model/plmn_operator_class_1.c | 9 +- lib/sbi/openapi/model/plmn_range.c | 13 +- .../model/plmn_route_selection_descriptor.c | 7 +- lib/sbi/openapi/model/plmn_snssai.c | 9 +- lib/sbi/openapi/model/point.c | 7 +- lib/sbi/openapi/model/point_all_of.c | 7 +- lib/sbi/openapi/model/point_altitude.c | 7 +- lib/sbi/openapi/model/point_altitude_all_of.c | 7 +- .../model/point_altitude_uncertainty.c | 7 +- .../model/point_altitude_uncertainty_all_of.c | 7 +- .../openapi/model/point_uncertainty_circle.c | 7 +- .../model/point_uncertainty_circle_all_of.c | 7 +- .../openapi/model/point_uncertainty_ellipse.c | 7 +- .../model/point_uncertainty_ellipse_all_of.c | 7 +- lib/sbi/openapi/model/policy_association.c | 14 +- .../model/policy_association_request.c | 29 ++- .../model/policy_association_update_request.c | 20 +- .../model/policy_data_change_notification.c | 24 +- .../openapi/model/policy_data_subscription.c | 17 +- lib/sbi/openapi/model/policy_update.c | 14 +- lib/sbi/openapi/model/polygon.c | 7 +- lib/sbi/openapi/model/polygon_all_of.c | 7 +- .../openapi/model/port_management_container.c | 7 +- .../model/pp5g_vn_group_profile_data.c | 10 +- lib/sbi/openapi/model/pp_active_time.c | 13 +- lib/sbi/openapi/model/pp_data.c | 11 +- .../openapi/model/pp_dl_packet_count_ext.c | 13 +- lib/sbi/openapi/model/pp_maximum_latency.c | 13 +- .../openapi/model/pp_maximum_response_time.c | 13 +- lib/sbi/openapi/model/pp_profile_data.c | 10 +- lib/sbi/openapi/model/pp_subs_reg_timer.c | 13 +- .../openapi/model/preemption_capability_rm.c | 7 +- .../model/preemption_control_information_rm.c | 7 +- .../model/preemption_vulnerability_rm.c | 7 +- lib/sbi/openapi/model/preferred_search.c | 7 +- lib/sbi/openapi/model/presence_info.c | 11 +- lib/sbi/openapi/model/presence_info_rm.c | 11 +- lib/sbi/openapi/model/problem_details.c | 21 +- lib/sbi/openapi/model/problem_details_1.c | 17 +- .../openapi/model/problem_details_add_info.c | 7 +- lib/sbi/openapi/model/provisioned_data_sets.c | 7 +- lib/sbi/openapi/model/psa_information.c | 13 +- lib/sbi/openapi/model/ptw_parameters.c | 9 +- lib/sbi/openapi/model/ptw_parameters_1.c | 9 +- lib/sbi/openapi/model/pws_error_data.c | 7 +- lib/sbi/openapi/model/pws_information.c | 9 +- lib/sbi/openapi/model/pws_response_data.c | 7 +- lib/sbi/openapi/model/qos_characteristics.c | 9 +- lib/sbi/openapi/model/qos_data.c | 23 +- .../model/qos_flow_add_modify_request_item.c | 7 +- lib/sbi/openapi/model/qos_flow_item.c | 7 +- lib/sbi/openapi/model/qos_flow_notify_item.c | 7 +- lib/sbi/openapi/model/qos_flow_profile.c | 7 +- .../model/qos_flow_release_request_item.c | 7 +- lib/sbi/openapi/model/qos_flow_setup_item.c | 7 +- lib/sbi/openapi/model/qos_flow_tunnel.c | 7 +- lib/sbi/openapi/model/qos_flow_usage_report.c | 11 +- lib/sbi/openapi/model/qos_monitoring_data.c | 13 +- lib/sbi/openapi/model/qos_monitoring_info.c | 7 +- .../model/qos_monitoring_information.c | 7 +- .../model/qos_monitoring_information_rm.c | 7 +- lib/sbi/openapi/model/qos_monitoring_report.c | 7 +- .../model/qos_notification_control_info.c | 9 +- lib/sbi/openapi/model/ran_nas_rel_cause.c | 9 +- lib/sbi/openapi/model/reachability_filter.c | 7 +- .../reachability_for_sms_configuration.c | 7 +- lib/sbi/openapi/model/redirect_information.c | 9 +- lib/sbi/openapi/model/redirect_response.c | 11 +- .../model/redundant_pdu_session_information.c | 7 +- lib/sbi/openapi/model/ref_to_binary_data.c | 9 +- .../model/registration_context_container.c | 17 +- .../openapi/model/registration_data_sets.c | 7 +- .../model/registration_location_info.c | 9 +- lib/sbi/openapi/model/release_data.c | 9 +- lib/sbi/openapi/model/released_data.c | 7 +- lib/sbi/openapi/model/report_item.c | 9 +- lib/sbi/openapi/model/reporting_options.c | 9 +- lib/sbi/openapi/model/requested_qos.c | 11 +- lib/sbi/openapi/model/requested_rule_data.c | 9 +- lib/sbi/openapi/model/requested_usage_data.c | 9 +- lib/sbi/openapi/model/resource_item.c | 11 +- .../openapi/model/resources_allocation_info.c | 9 +- .../openapi/model/resynchronization_info.c | 11 +- lib/sbi/openapi/model/retrieve_data.c | 7 +- lib/sbi/openapi/model/retrieved_data.c | 7 +- lib/sbi/openapi/model/rg_auth_ctx.c | 9 +- .../openapi/model/rg_authentication_info.c | 11 +- lib/sbi/openapi/model/rm_info.c | 7 +- lib/sbi/openapi/model/rm_state.c | 7 +- .../openapi/model/roaming_charging_profile.c | 7 +- lib/sbi/openapi/model/route_information.c | 11 +- lib/sbi/openapi/model/route_to_location.c | 11 +- lib/sbi/openapi/model/rule_report.c | 9 +- .../model/scheduled_communication_time.c | 11 +- .../model/scheduled_communication_time_1.c | 11 +- .../model/scheduled_communication_time_rm.c | 11 +- .../model/scheduled_communication_type_rm.c | 7 +- lib/sbi/openapi/model/scp_domain_cond.c | 9 +- lib/sbi/openapi/model/scp_domain_info.c | 12 +- lib/sbi/openapi/model/scp_info.c | 19 +- lib/sbi/openapi/model/sd_range.c | 11 +- lib/sbi/openapi/model/sdm_subs_modification.c | 11 +- lib/sbi/openapi/model/sdm_subscription.c | 23 +- lib/sbi/openapi/model/sdm_subscription_1.c | 23 +- lib/sbi/openapi/model/seaf_data.c | 9 +- lib/sbi/openapi/model/search_result.c | 11 +- .../openapi/model/secondary_rat_usage_info.c | 7 +- .../model/secondary_rat_usage_report.c | 7 +- lib/sbi/openapi/model/security_result.c | 7 +- lib/sbi/openapi/model/send_mo_data_req_data.c | 7 +- lib/sbi/openapi/model/sequence_number.c | 10 +- .../openapi/model/service_area_restriction.c | 7 +- .../model/service_area_restriction_1.c | 7 +- lib/sbi/openapi/model/service_name_cond.c | 9 +- .../openapi/model/service_parameter_data.c | 29 ++- .../model/service_parameter_data_patch.c | 11 +- .../model/service_type_unrelated_class.c | 9 +- .../model/service_type_unrelated_class_1.c | 9 +- lib/sbi/openapi/model/serving_nf_identity.c | 9 +- .../session_management_subscription_data.c | 31 +-- .../session_management_subscription_data_1.c | 31 +-- lib/sbi/openapi/model/session_rule.c | 15 +- lib/sbi/openapi/model/session_rule_report.c | 9 +- lib/sbi/openapi/model/shared_data.c | 24 +- .../model/slice_info_for_pdu_session.c | 7 +- .../model/slice_info_for_registration.c | 7 +- .../slice_info_for_ue_configuration_update.c | 7 +- lib/sbi/openapi/model/sm_context.c | 49 ++-- .../openapi/model/sm_context_create_data.c | 71 +++--- .../openapi/model/sm_context_create_error.c | 9 +- .../openapi/model/sm_context_created_data.c | 23 +- .../openapi/model/sm_context_release_data.c | 9 +- .../openapi/model/sm_context_released_data.c | 7 +- .../openapi/model/sm_context_retrieve_data.c | 7 +- .../openapi/model/sm_context_retrieved_data.c | 9 +- .../model/sm_context_status_notification.c | 21 +- .../openapi/model/sm_context_update_data.c | 23 +- .../openapi/model/sm_context_update_error.c | 9 +- .../openapi/model/sm_context_updated_data.c | 17 +- .../openapi/model/sm_policy_context_data.c | 41 ++-- lib/sbi/openapi/model/sm_policy_control.c | 7 +- lib/sbi/openapi/model/sm_policy_data.c | 24 +- lib/sbi/openapi/model/sm_policy_data_patch.c | 17 +- lib/sbi/openapi/model/sm_policy_decision.c | 61 ++--- lib/sbi/openapi/model/sm_policy_delete_data.c | 11 +- lib/sbi/openapi/model/sm_policy_dnn_data.c | 28 +-- .../openapi/model/sm_policy_dnn_data_patch.c | 10 +- .../openapi/model/sm_policy_notification.c | 9 +- lib/sbi/openapi/model/sm_policy_snssai_data.c | 12 +- .../model/sm_policy_snssai_data_patch.c | 12 +- .../model/sm_policy_update_context_data.c | 40 ++-- .../openapi/model/small_data_rate_status.c | 9 +- .../model/small_data_rate_status_info.c | 9 +- lib/sbi/openapi/model/smf_change_info.c | 7 +- lib/sbi/openapi/model/smf_info.c | 9 +- lib/sbi/openapi/model/smf_registration.c | 23 +- lib/sbi/openapi/model/smf_registration_info.c | 7 +- lib/sbi/openapi/model/smf_selection_data.c | 14 +- .../model/smf_selection_subscription_data.c | 16 +- .../model/smf_selection_subscription_data_1.c | 16 +- lib/sbi/openapi/model/smf_subscription_info.c | 7 +- lib/sbi/openapi/model/smf_subscription_item.c | 11 +- .../model/sms_management_subscription_data.c | 11 +- .../sms_management_subscription_data_1.c | 11 +- lib/sbi/openapi/model/sms_subscription_data.c | 9 +- .../openapi/model/sms_subscription_data_1.c | 9 +- lib/sbi/openapi/model/smsc_data.c | 9 +- lib/sbi/openapi/model/smsf_info.c | 9 +- lib/sbi/openapi/model/smsf_info_1.c | 9 +- lib/sbi/openapi/model/smsf_registration.c | 17 +- lib/sbi/openapi/model/snssai.c | 9 +- lib/sbi/openapi/model/snssai_extension.c | 7 +- lib/sbi/openapi/model/snssai_info.c | 7 +- .../model/snssai_route_selection_descriptor.c | 7 +- lib/sbi/openapi/model/snssai_smf_info_item.c | 7 +- lib/sbi/openapi/model/snssai_upf_info_item.c | 7 +- lib/sbi/openapi/model/sor_data.c | 13 +- lib/sbi/openapi/model/sor_info.c | 13 +- lib/sbi/openapi/model/sor_info_1.c | 13 +- lib/sbi/openapi/model/sor_update_info.c | 7 +- lib/sbi/openapi/model/spatial_validity.c | 12 +- lib/sbi/openapi/model/spatial_validity_rm.c | 12 +- .../openapi/model/sponsor_connectivity_data.c | 9 +- lib/sbi/openapi/model/ssc_modes.c | 7 +- lib/sbi/openapi/model/ssc_modes_1.c | 7 +- .../openapi/model/stationary_indication_rm.c | 7 +- lib/sbi/openapi/model/status_info.c | 7 +- lib/sbi/openapi/model/status_notification.c | 7 +- lib/sbi/openapi/model/steering_container.c | 7 +- lib/sbi/openapi/model/steering_info.c | 7 +- lib/sbi/openapi/model/steering_mode.c | 7 +- lib/sbi/openapi/model/stored_search_result.c | 7 +- .../openapi/model/subscribed_default_qos.c | 7 +- .../openapi/model/subscribed_default_qos_1.c | 7 +- lib/sbi/openapi/model/subscribed_event.c | 7 +- lib/sbi/openapi/model/subscribed_snssai.c | 7 +- lib/sbi/openapi/model/subscription_data.c | 21 +- .../openapi/model/subscription_data_sets.c | 7 +- .../openapi/model/subscription_data_sets_1.c | 7 +- .../model/subscription_data_subscr_cond.c | 25 +-- .../model/subscription_data_subscriptions.c | 21 +- .../openapi/model/suggested_packet_num_dl.c | 9 +- .../openapi/model/suggested_packet_num_dl_1.c | 9 +- lib/sbi/openapi/model/supi_range.c | 13 +- lib/sbi/openapi/model/supported_gad_shapes.c | 7 +- lib/sbi/openapi/model/tac_info.c | 9 +- lib/sbi/openapi/model/tac_range.c | 13 +- lib/sbi/openapi/model/tai.c | 11 +- lib/sbi/openapi/model/tai_1.c | 11 +- lib/sbi/openapi/model/tai_range.c | 9 +- lib/sbi/openapi/model/temporal_validity.c | 11 +- lib/sbi/openapi/model/termination_info.c | 9 +- .../openapi/model/termination_notification.c | 9 +- lib/sbi/openapi/model/time_period.c | 7 +- lib/sbi/openapi/model/time_window.c | 11 +- lib/sbi/openapi/model/tnap_id.c | 11 +- lib/sbi/openapi/model/tngf_info.c | 13 +- lib/sbi/openapi/model/trace_data.c | 19 +- lib/sbi/openapi/model/trace_data_1.c | 19 +- lib/sbi/openapi/model/trace_data_response.c | 9 +- lib/sbi/openapi/model/traffic_control_data.c | 13 +- lib/sbi/openapi/model/traffic_descriptor.c | 9 +- lib/sbi/openapi/model/traffic_influ_data.c | 29 ++- .../openapi/model/traffic_influ_data_notif.c | 9 +- .../openapi/model/traffic_influ_data_patch.c | 23 +- lib/sbi/openapi/model/traffic_influ_sub.c | 19 +- lib/sbi/openapi/model/traffic_profile_rm.c | 7 +- .../openapi/model/transfer_mo_data_req_data.c | 7 +- .../openapi/model/transfer_mt_data_add_info.c | 7 +- .../openapi/model/transfer_mt_data_error.c | 21 +- .../openapi/model/transfer_mt_data_req_data.c | 7 +- lib/sbi/openapi/model/transfer_policy.c | 11 +- lib/sbi/openapi/model/trigger.c | 9 +- lib/sbi/openapi/model/trigger_category.c | 7 +- lib/sbi/openapi/model/trigger_request.c | 9 +- lib/sbi/openapi/model/trigger_type.c | 7 +- lib/sbi/openapi/model/tscai_input_container.c | 9 +- lib/sbi/openapi/model/tsn_bridge_info.c | 9 +- lib/sbi/openapi/model/tsn_qos_container.c | 7 +- lib/sbi/openapi/model/tsn_qos_container_rm.c | 7 +- lib/sbi/openapi/model/tunnel_info.c | 13 +- lib/sbi/openapi/model/twap_id.c | 11 +- lib/sbi/openapi/model/twif_info.c | 13 +- lib/sbi/openapi/model/udm_info.c | 11 +- lib/sbi/openapi/model/udr_info.c | 9 +- lib/sbi/openapi/model/udsf_info.c | 10 +- lib/sbi/openapi/model/ue_camping_rep.c | 9 +- lib/sbi/openapi/model/ue_context.c | 47 ++-- .../model/ue_context_cancel_relocate_data.c | 9 +- .../openapi/model/ue_context_create_data.c | 11 +- .../openapi/model/ue_context_create_error.c | 7 +- .../openapi/model/ue_context_created_data.c | 9 +- .../openapi/model/ue_context_in_amf_data.c | 7 +- .../openapi/model/ue_context_in_amf_data_1.c | 7 +- .../openapi/model/ue_context_in_smf_data.c | 12 +- .../openapi/model/ue_context_in_smf_data_1.c | 12 +- .../openapi/model/ue_context_in_smsf_data.c | 7 +- .../openapi/model/ue_context_in_smsf_data_1.c | 7 +- lib/sbi/openapi/model/ue_context_release.c | 9 +- .../openapi/model/ue_context_relocate_data.c | 9 +- .../openapi/model/ue_context_relocated_data.c | 7 +- .../model/ue_context_transfer_req_data.c | 9 +- .../model/ue_context_transfer_rsp_data.c | 9 +- .../openapi/model/ue_differentiation_info.c | 9 +- lib/sbi/openapi/model/ue_id.c | 11 +- lib/sbi/openapi/model/ue_identity_info.c | 13 +- .../model/ue_initiated_resource_request.c | 9 +- .../ue_n1_n2_info_subscription_create_data.c | 15 +- .../ue_n1_n2_info_subscription_created_data.c | 11 +- lib/sbi/openapi/model/ue_policy_section.c | 9 +- lib/sbi/openapi/model/ue_policy_set.c | 32 +-- lib/sbi/openapi/model/ue_policy_set_patch.c | 18 +- lib/sbi/openapi/model/ue_reachability.c | 7 +- .../model/ue_reg_status_update_req_data.c | 7 +- .../model/ue_reg_status_update_rsp_data.c | 7 +- lib/sbi/openapi/model/ulcl_bp_information.c | 9 +- lib/sbi/openapi/model/uncertainty_ellipse.c | 7 +- lib/sbi/openapi/model/unrelated_class.c | 7 +- lib/sbi/openapi/model/unrelated_class_1.c | 7 +- lib/sbi/openapi/model/up_path_chg_event.c | 11 +- lib/sbi/openapi/model/up_security.c | 7 +- lib/sbi/openapi/model/up_security_1.c | 7 +- lib/sbi/openapi/model/up_security_info.c | 7 +- lib/sbi/openapi/model/updated_item.c | 11 +- lib/sbi/openapi/model/upf_cond.c | 9 +- lib/sbi/openapi/model/upf_info.c | 9 +- lib/sbi/openapi/model/upu_data.c | 13 +- lib/sbi/openapi/model/upu_data_1.c | 11 +- lib/sbi/openapi/model/upu_data_2.c | 11 +- lib/sbi/openapi/model/upu_info.c | 13 +- lib/sbi/openapi/model/upu_info_1.c | 13 +- lib/sbi/openapi/model/usage_mon_data.c | 16 +- lib/sbi/openapi/model/usage_mon_data_limit.c | 20 +- lib/sbi/openapi/model/usage_mon_data_scope.c | 9 +- lib/sbi/openapi/model/usage_mon_level.c | 7 +- lib/sbi/openapi/model/usage_monitoring_data.c | 13 +- lib/sbi/openapi/model/usage_threshold.c | 7 +- lib/sbi/openapi/model/usage_threshold_rm.c | 7 +- lib/sbi/openapi/model/user_identifier.c | 13 +- lib/sbi/openapi/model/user_location.c | 7 +- lib/sbi/openapi/model/v2x_context.c | 11 +- lib/sbi/openapi/model/v2x_information.c | 7 +- lib/sbi/openapi/model/v2x_subscription_data.c | 11 +- .../openapi/model/v2x_subscription_data_1.c | 11 +- lib/sbi/openapi/model/valid_time_period.c | 11 +- lib/sbi/openapi/model/valid_time_period_1.c | 11 +- .../openapi/model/vendor_specific_feature.c | 11 +- lib/sbi/openapi/model/vgmlc_address.c | 13 +- lib/sbi/openapi/model/vn_group_data.c | 9 +- lib/sbi/openapi/model/volume_timed_report.c | 11 +- lib/sbi/openapi/model/vplmn_qos.c | 15 +- lib/sbi/openapi/model/vsmf_update_data.c | 15 +- lib/sbi/openapi/model/vsmf_update_error.c | 11 +- lib/sbi/openapi/model/vsmf_updated_data.c | 9 +- lib/sbi/openapi/model/w_agf_info.c | 13 +- lib/sbi/openapi/model/wireline_area.c | 15 +- lib/sbi/openapi/model/wireline_area_1.c | 15 +- .../model/wireline_service_area_restriction.c | 7 +- .../wireline_service_area_restriction_1.c | 7 +- lib/sbi/openapi/src/apiKey.c | 7 +- lib/sbi/openapi/src/list.c | 12 +- .../templates/apiKey.c.mustache | 7 +- .../templates/cJSON.c.mustache | 8 +- .../templates/list.c.mustache | 12 +- .../templates/list.h.mustache | 2 - .../templates/model-body.mustache | 34 +-- src/amf/amf-sm.c | 30 ++- src/amf/nnssf-handler.c | 7 - src/amf/nsmf-handler.c | 29 +-- src/main.c | 4 + src/pcf/naf-build.c | 4 +- src/pcf/npcf-handler.c | 8 +- src/pcf/nsmf-build.c | 8 +- src/udm/nudr-build.c | 12 +- tests/core/memory-test.c | 4 + tests/handover/epc-x2-test.c | 2 + tests/unit/abts-main.c | 7 + tests/unit/sbi-message-test.c | 126 ++++++++++- tests/vonr/af-test.c | 18 ++ 768 files changed, 4632 insertions(+), 4901 deletions(-) diff --git a/docker/debian/latest/base/Dockerfile b/docker/debian/latest/base/Dockerfile index 55dbdecf8..c7de86eb2 100644 --- a/docker/debian/latest/base/Dockerfile +++ b/docker/debian/latest/base/Dockerfile @@ -29,7 +29,7 @@ RUN apt-get update && \ libcurl4-gnutls-dev \ libnghttp2-dev \ libtins-dev \ - libtalloc-devel \ + libtalloc-dev \ iproute2 \ ca-certificates \ netbase \ diff --git a/lib/asn1c/common/asn_internal.h b/lib/asn1c/common/asn_internal.h index 3a23e8d0a..7e04f1669 100644 --- a/lib/asn1c/common/asn_internal.h +++ b/lib/asn1c/common/asn_internal.h @@ -41,20 +41,45 @@ int get_asn1c_environment_version(void); /* Run-time version */ #define FREEMEM(ptr) free(ptr) #else #include "ogs-core.h" -#if 1 -#define CALLOC(nmemb, size) \ - ogs_talloc_zero_size(__ogs_talloc_asn1c, (nmemb) * (size), __location__) -#define MALLOC(size) \ - ogs_talloc_size(__ogs_talloc_asn1c, size, __location__) -#define REALLOC(oldptr, size) \ - ogs_talloc_realloc_size(__ogs_talloc_asn1c, oldptr, size, __location__) -#define FREEMEM(ptr) ogs_talloc_free(ptr, __location__) -#else -#define CALLOC(nmemb, size) ogs_calloc_or_assert(nmemb, size) -#define MALLOC(size) ogs_malloc_or_assert(size) -#define REALLOC(oldptr, size) ogs_realloc_or_assert(oldptr, size) -#define FREEMEM(ptr) ogs_free_debug(ptr) -#endif + +static ogs_inline void *ogs_asn_malloc(size_t size, const char *file_line) +{ + void *ptr = ogs_malloc(size); + if (!ptr) { + ogs_fatal("asn_malloc() failed in `%s`", file_line); + ogs_assert_if_reached(); + } + + return ptr; +} +static ogs_inline void *ogs_asn_calloc( + size_t nmemb, size_t size, const char *file_line) +{ + void *ptr = ogs_calloc(nmemb, size); + if (!ptr) { + ogs_fatal("asn_calloc() failed in `%s`", file_line); + ogs_assert_if_reached(); + } + + return ptr; +} +static ogs_inline void *ogs_asn_realloc( + void *oldptr, size_t size, const char *file_line) +{ + void *ptr = ogs_realloc(oldptr, size); + if (!ptr) { + ogs_fatal("asn_realloc() failed in `%s`", file_line); + ogs_assert_if_reached(); + } + + return ptr; +} + +#define CALLOC(nmemb, size) ogs_asn_calloc(nmemb, size, OGS_FILE_LINE) +#define MALLOC(size) ogs_asn_malloc(size, OGS_FILE_LINE) +#define REALLOC(oldptr, size) ogs_asn_realloc(oldptr, size, OGS_FILE_LINE) +#define FREEMEM(ptr) ogs_free(ptr) + #endif #define asn_debug_indent 0 diff --git a/lib/core/ogs-conv.c b/lib/core/ogs-conv.c index d0e2a7aeb..5d1f99a8c 100644 --- a/lib/core/ogs-conv.c +++ b/lib/core/ogs-conv.c @@ -187,7 +187,7 @@ char *ogs_uint64_to_0string(uint64_t x) char *ogs_uint64_to_string(uint64_t x) { - char *str, *p; + char *str, *p, *dup; str = ogs_uint64_to_0string(x); ogs_expect_or_return_val(str, NULL); @@ -195,8 +195,10 @@ char *ogs_uint64_to_string(uint64_t x) p = ogs_left_trimcharacter(str, '0'); ogs_expect_or_return_val(p, NULL); + dup = ogs_strdup(p); ogs_free(str); - return ogs_strdup(p); + + return dup; } ogs_uint24_t ogs_uint24_from_string(char *str) diff --git a/lib/core/ogs-core.h b/lib/core/ogs-core.h index b04c6cdfb..f4e1dbb51 100644 --- a/lib/core/ogs-core.h +++ b/lib/core/ogs-core.h @@ -24,6 +24,8 @@ #define OGS_CORE_INSIDE +#define OGS_USE_TALLOC 1 + #include "core/ogs-compat.h" #include "core/ogs-macros.h" #include "core/ogs-list.h" diff --git a/lib/core/ogs-epoll.c b/lib/core/ogs-epoll.c index 44774a2fb..ae315a1c6 100644 --- a/lib/core/ogs-epoll.c +++ b/lib/core/ogs-epoll.c @@ -54,7 +54,7 @@ struct epoll_context_s { int epfd; ogs_hash_t *map_hash; - struct epoll_event *event_list; + struct epoll_event *event_list; }; static void epoll_init(ogs_pollset_t *pollset) @@ -66,9 +66,9 @@ static void epoll_init(ogs_pollset_t *pollset) ogs_assert(context); pollset->context = context; - context->event_list = ogs_calloc( + context->event_list = ogs_calloc( pollset->capacity, sizeof(struct epoll_event)); - ogs_assert(context->event_list); + ogs_assert(context->event_list); context->map_hash = ogs_hash_make(); ogs_assert(context->map_hash); @@ -89,7 +89,7 @@ static void epoll_cleanup(ogs_pollset_t *pollset) ogs_notify_final(pollset); close(context->epfd); - ogs_free(context->event_list); + ogs_free(context->event_list); ogs_hash_destroy(context->map_hash); ogs_free(context); @@ -130,13 +130,13 @@ static int epoll_add(ogs_poll_t *poll) ee.events |= (EPOLLIN|EPOLLRDHUP); if (map->write) ee.events |= EPOLLOUT; - ee.data.ptr = map; + ee.data.fd = poll->fd; rv = epoll_ctl(context->epfd, op, poll->fd, &ee); if (rv < 0) { - ogs_log_message(OGS_LOG_ERROR, ogs_socket_errno, + ogs_log_message(OGS_LOG_ERROR, ogs_socket_errno, "epoll_ctl[%d] failed", op); - return OGS_ERROR; + return OGS_ERROR; } return OGS_OK; @@ -172,18 +172,18 @@ static int epoll_remove(ogs_poll_t *poll) if (map->read || map->write) { op = EPOLL_CTL_MOD; - ee.data.ptr = map; + ee.data.fd = poll->fd; } else { op = EPOLL_CTL_DEL; - ee.data.ptr = NULL; + ee.data.fd = INVALID_SOCKET; - ogs_free(map); ogs_hash_set(context->map_hash, &poll->fd, sizeof(poll->fd), NULL); + ogs_free(map); } rv = epoll_ctl(context->epfd, op, poll->fd, &ee); if (rv < 0) { - ogs_log_message(OGS_LOG_ERROR, ogs_socket_errno, + ogs_log_message(OGS_LOG_ERROR, ogs_socket_errno, "epoll_remove[%d] failed", op); return OGS_ERROR; } @@ -194,14 +194,14 @@ static int epoll_remove(ogs_poll_t *poll) static int epoll_process(ogs_pollset_t *pollset, ogs_time_t timeout) { struct epoll_context_s *context = NULL; - int num_of_poll; - int i; + int num_of_poll; + int i; ogs_assert(pollset); context = pollset->context; ogs_assert(context); - num_of_poll = epoll_wait(context->epfd, context->event_list, + num_of_poll = epoll_wait(context->epfd, context->event_list, pollset->capacity, timeout == OGS_INFINITE_TIME ? OGS_INFINITE_TIME : ogs_time_to_msec(timeout)); @@ -212,36 +212,52 @@ static int epoll_process(ogs_pollset_t *pollset, ogs_time_t timeout) return OGS_TIMEUP; } - for (i = 0; i < num_of_poll; i++) { + for (i = 0; i < num_of_poll; i++) { struct epoll_map_s *map = NULL; - uint32_t received; + uint32_t received; short when = 0; + ogs_socket_t fd; - received = context->event_list[i].events; - if (received & (EPOLLERR|EPOLLHUP)) { + received = context->event_list[i].events; + if (received & EPOLLERR) { when = OGS_POLLIN|OGS_POLLOUT; - } else { - if (received & (EPOLLIN|EPOLLRDHUP)) { + } else if ((received & EPOLLHUP) && !(received & EPOLLRDHUP)) { + when = OGS_POLLIN|OGS_POLLOUT; + } else { + if (received & EPOLLIN) { when |= OGS_POLLIN; } if (received & EPOLLOUT) { when |= OGS_POLLOUT; - } + } + if (received & EPOLLRDHUP) { + when |= OGS_POLLIN; + } } if (!when) continue; - map = context->event_list[i].data.ptr; + fd = context->event_list[i].data.fd; + ogs_assert(fd != INVALID_SOCKET); + map = ogs_hash_get(context->map_hash, &fd, sizeof(fd)); ogs_assert(map); if (map->read && map->write && map->read == map->write) { map->read->handler(when, map->read->fd, map->read->data); } else { - if (map->read && (when & OGS_POLLIN)) + if ((when & OGS_POLLIN) && map->read) map->read->handler(when, map->read->fd, map->read->data); - if (map->write && (when & OGS_POLLOUT)) - map->write->handler(when, map->write->fd, map->write->data); + + /* + * map->read->handler() can call ogs_remove_epoll() + * So, we need to check map instance + */ + map = ogs_hash_get(context->map_hash, &fd, sizeof(fd)); + if (map) { + if ((when & OGS_POLLOUT) && map->write) + map->write->handler(when, map->write->fd, map->write->data); + } } } diff --git a/lib/core/ogs-hash.c b/lib/core/ogs-hash.c index 79d8e151e..438bd5fcb 100644 --- a/lib/core/ogs-hash.c +++ b/lib/core/ogs-hash.c @@ -61,7 +61,9 @@ struct ogs_hash_t { static ogs_hash_entry_t **alloc_array(ogs_hash_t *ht, unsigned int max) { - return ogs_calloc_or_assert(1, sizeof(*ht->array) * (max + 1)); + ogs_hash_entry_t **ptr = ogs_calloc(1, sizeof(*ht->array) * (max + 1)); + ogs_assert(ptr); + return ptr; } ogs_hash_t *ogs_hash_make() @@ -285,13 +287,8 @@ static ogs_hash_entry_t **find_entry(ogs_hash_t *ht, if ((he = ht->free) != NULL) ht->free = he->next; else { -#if OGS_USE_TALLOC - he = ogs_talloc_size(__ogs_talloc_core, - sizeof(*he), file_line); + he = ogs_malloc(sizeof(*he)); ogs_assert(he); -#else - he = ogs_malloc_debug(sizeof(*he), file_line, true); -#endif } he->next = NULL; he->hash = hash; diff --git a/lib/core/ogs-memory.c b/lib/core/ogs-memory.c index 944ac8cc9..3e206b258 100644 --- a/lib/core/ogs-memory.c +++ b/lib/core/ogs-memory.c @@ -26,7 +26,6 @@ * Memory Pool - Use talloc library *****************************************/ -void *__ogs_talloc_asn1c; void *__ogs_talloc_core; static ogs_thread_mutex_t mutex; @@ -35,24 +34,27 @@ void ogs_mem_init(void) { ogs_thread_mutex_init(&mutex); + talloc_enable_null_tracking(); + #define TALLOC_MEMSIZE 1 __ogs_talloc_core = talloc_named_const(NULL, TALLOC_MEMSIZE, "core"); - __ogs_talloc_asn1c = talloc_named_const(NULL, TALLOC_MEMSIZE, "asn1c"); } void ogs_mem_final(void) { - if (talloc_total_size(__ogs_talloc_asn1c) != TALLOC_MEMSIZE) - talloc_report_full(__ogs_talloc_asn1c, stderr); if (talloc_total_size(__ogs_talloc_core) != TALLOC_MEMSIZE) talloc_report_full(__ogs_talloc_core, stderr); - talloc_free(__ogs_talloc_asn1c); talloc_free(__ogs_talloc_core); ogs_thread_mutex_destroy(&mutex); } +void *ogs_mem_get_mutex(void) +{ + return &mutex; +} + void *ogs_talloc_size(const void *ctx, size_t size, const char *name) { void *ptr = NULL; @@ -109,7 +111,11 @@ int ogs_talloc_free(void *ptr, const char *location) return ret; } -void *ogs_malloc_debug(size_t size, const char *file_line, bool abort) +/***************************************** + * Memory Pool - Use pkbuf library + *****************************************/ + +void *ogs_malloc_debug(size_t size, const char *file_line) { size_t headroom = 0; ogs_pkbuf_t *pkbuf = NULL; @@ -118,11 +124,7 @@ void *ogs_malloc_debug(size_t size, const char *file_line, bool abort) headroom = sizeof(ogs_pkbuf_t *); pkbuf = ogs_pkbuf_alloc_debug(NULL, headroom + size, file_line); - - if (abort == true) - ogs_assert(pkbuf); - else - ogs_expect_or_return_val(pkbuf, NULL); + ogs_expect_or_return_val(pkbuf, NULL); ogs_pkbuf_reserve(pkbuf, headroom); memcpy(pkbuf->head, &pkbuf, headroom); @@ -148,23 +150,18 @@ int ogs_free_debug(void *ptr) return OGS_OK; } -void *ogs_calloc_debug( - size_t nmemb, size_t size, const char *file_line, bool abort) +void *ogs_calloc_debug(size_t nmemb, size_t size, const char *file_line) { void *ptr = NULL; - ptr = ogs_malloc_debug(nmemb * size, file_line, abort); - if (abort == true) - ogs_assert(ptr); - else - ogs_expect_or_return_val(ptr, NULL); + ptr = ogs_malloc_debug(nmemb * size, file_line); + ogs_expect_or_return_val(ptr, NULL); memset(ptr, 0, nmemb * size); return ptr; } -void *ogs_realloc_debug( - void *ptr, size_t size, const char *file_line, bool abort) +void *ogs_realloc_debug(void *ptr, size_t size, const char *file_line) { size_t headroom = 0; ogs_pkbuf_t *pkbuf = NULL; @@ -177,16 +174,10 @@ void *ogs_realloc_debug( memcpy(&pkbuf, (unsigned char*)ptr - headroom, headroom); - if (abort == true) - ogs_assert(pkbuf); - else - ogs_expect_or_return_val(pkbuf, NULL); + ogs_expect_or_return_val(pkbuf, NULL); cluster = pkbuf->cluster; - if (abort == true) - ogs_assert(cluster); - else - ogs_expect_or_return_val(cluster, NULL); + ogs_expect_or_return_val(cluster, NULL); if (!size) { ogs_pkbuf_free(pkbuf); @@ -196,12 +187,8 @@ void *ogs_realloc_debug( if (size > (cluster->size - headroom)) { void *new = NULL; - new = ogs_malloc_debug(size, file_line, abort); - - if (abort == true) - ogs_assert(new); - else - ogs_expect_or_return_val(new, NULL); + new = ogs_malloc_debug(size, file_line); + ogs_expect_or_return_val(new, NULL); memcpy(new, ptr, pkbuf->len); diff --git a/lib/core/ogs-memory.h b/lib/core/ogs-memory.h index bc2e91b62..0dc909d0b 100644 --- a/lib/core/ogs-memory.h +++ b/lib/core/ogs-memory.h @@ -28,11 +28,11 @@ extern "C" { #endif -#define OGS_USE_TALLOC 0 - void ogs_mem_init(void); void ogs_mem_final(void); +void *ogs_mem_get_mutex(void); + #define OGS_MEM_CLEAR(__dATA) \ do { \ if ((__dATA)) { \ @@ -43,7 +43,6 @@ void ogs_mem_final(void); #include -extern void *__ogs_talloc_asn1c; extern void *__ogs_talloc_core; void *ogs_talloc_size(const void *ctx, size_t size, const char *name); @@ -52,11 +51,11 @@ void *ogs_talloc_realloc_size( const void *context, void *oldptr, size_t size, const char *name); int ogs_talloc_free(void *ptr, const char *location); -void *ogs_malloc_debug(size_t size, const char *file_line, bool abort); +void *ogs_malloc_debug(size_t size, const char *file_line); void *ogs_calloc_debug( - size_t nmemb, size_t size, const char *file_line, bool abort); + size_t nmemb, size_t size, const char *file_line); void *ogs_realloc_debug( - void *ptr, size_t size, const char *file_line, bool abort); + void *ptr, size_t size, const char *file_line); int ogs_free_debug(void *ptr); #if OGS_USE_TALLOC @@ -71,9 +70,6 @@ int ogs_free_debug(void *ptr); ogs_talloc_zero_size(__ogs_talloc_core, (nmemb) * (size), __location__) #define ogs_realloc(oldptr, size) \ ogs_talloc_realloc_size(__ogs_talloc_core, oldptr, size, __location__) -#define ogs_malloc_or_assert(size) ogs_malloc(size) -#define ogs_calloc_or_assert(nmemb, size) ogs_calloc(nmemb, size) -#define ogs_realloc_or_assert(ptr, size) ogs_realloc(ptr, size) #define ogs_free(ptr) ogs_talloc_free(ptr, __location__) #else @@ -82,17 +78,9 @@ int ogs_free_debug(void *ptr); * Memory Pool - Use pkbuf library *****************************************/ -#define ogs_malloc(size) ogs_malloc_debug(size, OGS_FILE_LINE, false) -#define ogs_malloc_or_assert(size) \ - ogs_malloc_debug(size, OGS_FILE_LINE, true) -#define ogs_calloc(nmemb, size) \ - ogs_calloc_debug(nmemb, size, OGS_FILE_LINE, false) -#define ogs_calloc_or_assert(nmemb, size) \ - ogs_calloc_debug(nmemb, size, OGS_FILE_LINE, true) -#define ogs_realloc(ptr, size) \ - ogs_realloc_debug(ptr, size, OGS_FILE_LINE, false) -#define ogs_realloc_or_assert(ptr, size) \ - ogs_realloc_debug(ptr, size, OGS_FILE_LINE, true) +#define ogs_malloc(size) ogs_malloc_debug(size, OGS_FILE_LINE) +#define ogs_calloc(nmemb, size) ogs_calloc_debug(nmemb, size, OGS_FILE_LINE) +#define ogs_realloc(ptr, size) ogs_realloc_debug(ptr, size, OGS_FILE_LINE) #define ogs_free(ptr) ogs_free_debug(ptr) #endif diff --git a/lib/core/ogs-strings.c b/lib/core/ogs-strings.c index 861aa52bc..f22a34b18 100644 --- a/lib/core/ogs-strings.c +++ b/lib/core/ogs-strings.c @@ -120,62 +120,6 @@ char *ogs_slprintf(char *str, char *last, const char *format, ...) return r; } -char *ogs_strdup_debug(const char *s, const char *file_line, bool abort) -{ - char *res; - size_t len; - - if (s == NULL) - return NULL; - - len = strlen(s) + 1; - res = ogs_memdup_debug(s, len, file_line, abort); - if (abort == true) ogs_assert(res); - ogs_expect_or_return_val(res, res); - return res; -} - -char *ogs_strndup_debug( - const char *s, size_t n, const char *file_line, bool abort) -{ - char *res; - const char *end; - - if (s == NULL) - return NULL; - - end = memchr(s, '\0', n); - if (end != NULL) - n = end - s; -#if OGS_USE_TALLOC - res = ogs_talloc_size(__ogs_talloc_core, n + 1, file_line); -#else - res = ogs_malloc_debug(n + 1, file_line, abort); -#endif - ogs_expect_or_return_val(res, res); - memcpy(res, s, n); - res[n] = '\0'; - return res; -} - -void *ogs_memdup_debug( - const void *m, size_t n, const char *file_line, bool abort) -{ - void *res; - - if (m == NULL) - return NULL; - -#if OGS_USE_TALLOC - res = ogs_talloc_size(__ogs_talloc_core, n, file_line); -#else - res = ogs_malloc_debug(n, file_line, abort); -#endif - ogs_expect_or_return_val(res, res); - memcpy(res, m, n); - return res; -} - char *ogs_cpystrn(char *dst, const char *src, size_t dst_size) { char *d = dst, *end; @@ -194,11 +138,142 @@ char *ogs_cpystrn(char *dst, const char *src, size_t dst_size) } } - *d = '\0'; /* always null terminate */ + *d = '\0'; /* always null terminate */ return (d); } +/***************************************** + * Memory Pool - Use talloc library + *****************************************/ + +char *ogs_talloc_strdup(const void *t, const char *p) +{ + char *ptr = NULL; + + ogs_thread_mutex_lock(ogs_mem_get_mutex()); + + ptr = talloc_strdup(t, p); + ogs_expect(ptr); + + ogs_thread_mutex_unlock(ogs_mem_get_mutex()); + + return ptr; +} + +char *ogs_talloc_strndup(const void *t, const char *p, size_t n) +{ + char *ptr = NULL; + + ogs_thread_mutex_lock(ogs_mem_get_mutex()); + + ptr = talloc_strndup(t, p, n); + ogs_expect(ptr); + + ogs_thread_mutex_unlock(ogs_mem_get_mutex()); + + return ptr; +} + +void *ogs_talloc_memdup(const void *t, const void *p, size_t size) +{ + void *ptr = NULL; + + ogs_thread_mutex_lock(ogs_mem_get_mutex()); + + ptr = talloc_memdup(t, p, size); + ogs_expect(ptr); + + ogs_thread_mutex_unlock(ogs_mem_get_mutex()); + + return ptr; +} + +char *ogs_talloc_asprintf(const void *t, const char *fmt, ...) +{ + va_list ap; + char *ret; + + ogs_thread_mutex_lock(ogs_mem_get_mutex()); + + va_start(ap, fmt); + ret = talloc_vasprintf(t, fmt, ap); + ogs_expect(ret); + va_end(ap); + + ogs_thread_mutex_unlock(ogs_mem_get_mutex()); + + return ret; +} + +char *ogs_talloc_asprintf_append(char *s, const char *fmt, ...) +{ + va_list ap; + + ogs_thread_mutex_lock(ogs_mem_get_mutex()); + + va_start(ap, fmt); + s = talloc_vasprintf_append(s, fmt, ap); + ogs_expect(s); + va_end(ap); + + ogs_thread_mutex_unlock(ogs_mem_get_mutex()); + + return s; +} + + +/***************************************** + * Memory Pool - Use pkbuf library + *****************************************/ + +char *ogs_strdup_debug(const char *s, const char *file_line) +{ + char *res; + size_t len; + + if (s == NULL) + return NULL; + + len = strlen(s) + 1; + res = ogs_memdup_debug(s, len, file_line); + ogs_expect_or_return_val(res, res); + return res; +} + +char *ogs_strndup_debug( + const char *s, size_t n, const char *file_line) +{ + char *res; + const char *end; + + if (s == NULL) + return NULL; + + end = memchr(s, '\0', n); + if (end != NULL) + n = end - s; + res = ogs_malloc_debug(n + 1, file_line); + ogs_expect_or_return_val(res, res); + memcpy(res, s, n); + res[n] = '\0'; + return res; +} + +void *ogs_memdup_debug( + const void *m, size_t n, const char *file_line) +{ + void *res; + + if (m == NULL) + return NULL; + + res = ogs_malloc_debug(n, file_line); + ogs_expect_or_return_val(res, res); + memcpy(res, m, n); + return res; +} + /* * char *ogs_msprintf(const char *message, ...) * char *mstrcatf(char *source, const char *message, ...) @@ -210,7 +285,7 @@ char *ogs_cpystrn(char *dst, const char *src, size_t dst_size) * https://github.com/babelouest/orcania.git */ char *ogs_msprintf_debug( - const char *file_line, bool abort, const char *message, ...) + const char *file_line, const char *message, ...) { va_list argp, argp_cpy; size_t out_len = 0; @@ -221,12 +296,7 @@ char *ogs_msprintf_debug( in some architectures, vsnprintf can modify argp */ out_len = vsnprintf(NULL, 0, message, argp); -#if OGS_USE_TALLOC - out = ogs_talloc_size(__ogs_talloc_core, - out_len + sizeof(char), file_line); -#else - out = ogs_malloc_debug(out_len + sizeof(char), file_line, abort); -#endif + out = ogs_malloc_debug(out_len + sizeof(char), file_line); if (out == NULL) { va_end(argp); va_end(argp_cpy); @@ -240,8 +310,7 @@ char *ogs_msprintf_debug( } char *ogs_mstrcatf_debug( - char *source, const char *file_line, bool abort, - const char *message, ...) + char *source, const char *file_line, const char *message, ...) { va_list argp, argp_cpy; char *out = NULL, *message_formatted = NULL; @@ -259,7 +328,7 @@ char *ogs_mstrcatf_debug( vsnprintf(message_formatted, (message_formatted_len+sizeof(char)), message, argp_cpy); out = ogs_msprintf_debug( - file_line, abort, "%s%s", source, message_formatted); + file_line, "%s%s", source, message_formatted); ogs_free(message_formatted); ogs_free(source); } @@ -271,12 +340,7 @@ char *ogs_mstrcatf_debug( in some architectures, vsnprintf can modify argp */ out_len = vsnprintf(NULL, 0, message, argp); -#if OGS_USE_TALLOC - out = ogs_talloc_size(__ogs_talloc_core, - out_len + sizeof(char), file_line); -#else - out = ogs_malloc_debug(out_len+sizeof(char), file_line, abort); -#endif + out = ogs_malloc_debug(out_len+sizeof(char), file_line); if (out != NULL) { vsnprintf(out, (out_len+sizeof(char)), message, argp_cpy); } diff --git a/lib/core/ogs-strings.h b/lib/core/ogs-strings.h index 6f5b85537..3b27544e1 100644 --- a/lib/core/ogs-strings.h +++ b/lib/core/ogs-strings.h @@ -82,20 +82,20 @@ char *ogs_slprintf(char *str, char *last, const char *format, ...) ogs_assert(__dST); \ } while(0) -#define ogs_strdup(s) ogs_strdup_debug(s, OGS_FILE_LINE, false) -#define ogs_strdup_or_assert(s) ogs_strdup_debug(s, OGS_FILE_LINE, true) -char *ogs_strdup_debug(const char *s, const char *file_line, bool abort); -#define ogs_strndup(s, n) ogs_strndup_debug(s, n, OGS_FILE_LINE, false) -#define ogs_strndup_or_assert(s, n) ogs_strndup_debug(s, n, OGS_FILE_LINE, true) -char *ogs_strndup_debug - (const char *s, size_t n, const char *file_line, bool abort); -#define ogs_memdup(m, n) ogs_memdup_debug(m, n, OGS_FILE_LINE, false) -#define ogs_memdup_or_assert(m, n) ogs_memdup_debug(m, n, OGS_FILE_LINE, true) -void *ogs_memdup_debug - (const void *m, size_t n, const char *file_line, bool abort); - char *ogs_cpystrn(char *dst, const char *src, size_t dst_size); +char *ogs_talloc_strdup(const void *t, const char *p); +char *ogs_talloc_strndup(const void *t, const char *p, size_t n); +void *ogs_talloc_memdup(const void *t, const void *p, size_t size); +char *ogs_talloc_asprintf(const void *t, const char *fmt, ...) + OGS_GNUC_PRINTF(2, 3); +char *ogs_talloc_asprintf_append(char *s, const char *fmt, ...) + OGS_GNUC_PRINTF(2, 3); + +char *ogs_strdup_debug(const char *s, const char *file_line); +char *ogs_strndup_debug(const char *s, size_t n, const char *file_line); +void *ogs_memdup_debug(const void *m, size_t n, const char *file_line); + /* * char *ogs_msprintf(const char *message, ...) * char *mstrcatf(char *source, const char *message, ...) @@ -106,20 +106,44 @@ char *ogs_cpystrn(char *dst, const char *src, size_t dst_size); * * https://github.com/babelouest/orcania.git */ -#define ogs_msprintf(...) ogs_msprintf_debug(OGS_FILE_LINE, false, __VA_ARGS__) -#define ogs_msprintf_or_assert(...) \ - ogs_msprintf_debug(OGS_FILE_LINE, true, __VA_ARGS__) -char *ogs_msprintf_debug - (const char *file_line, bool abort, const char *message, ...) - OGS_GNUC_PRINTF(3, 4); -#define ogs_mstrcatf(source, ...) \ - ogs_mstrcatf_debug(source, OGS_FILE_LINE, false, __VA_ARGS__) -#define ogs_mstrcatf_or_assert(source, ...) \ - ogs_mstrcatf_debug(source, OGS_FILE_LINE, true, __VA_ARGS__) +char *ogs_msprintf_debug(const char *file_line, const char *message, ...) + OGS_GNUC_PRINTF(2, 3); char *ogs_mstrcatf_debug( - char *source, const char *file_line, bool abort, - const char *message, ...) - OGS_GNUC_PRINTF(4, 5); + char *source, const char *file_line, const char *message, ...) + OGS_GNUC_PRINTF(3, 4); + +#if OGS_USE_TALLOC + +/***************************************** + * Memory Pool - Use talloc library + *****************************************/ + +#define ogs_strdup(p) \ + ogs_talloc_strdup(__ogs_talloc_core, p) +#define ogs_strndup(p, n) \ + ogs_talloc_strndup(__ogs_talloc_core, p, n) +#define ogs_memdup(p, size) \ + ogs_talloc_memdup(__ogs_talloc_core, p, size) +#define ogs_msprintf(...) \ + ogs_talloc_asprintf(__ogs_talloc_core, __VA_ARGS__) +#define ogs_mstrcatf(s, ...) \ + ogs_talloc_asprintf_append(s, __VA_ARGS__) + +#else + +/***************************************** + * Memory Pool - Use pkbuf library + *****************************************/ + +#define ogs_strdup(s) ogs_strdup_debug(s, OGS_FILE_LINE) +#define ogs_strndup(s, n) ogs_strndup_debug(s, n, OGS_FILE_LINE) +#define ogs_memdup(m, n) ogs_memdup_debug(m, n, OGS_FILE_LINE) +#define ogs_msprintf(...) ogs_msprintf_debug(OGS_FILE_LINE, __VA_ARGS__) +#define ogs_mstrcatf(source, ...) \ + ogs_mstrcatf_debug(source, OGS_FILE_LINE, __VA_ARGS__) + +#endif + char *ogs_trimwhitespace(char *str); diff --git a/lib/crypt/snow-3g.c b/lib/crypt/snow-3g.c index c8a35e8ac..e99d49cb8 100644 --- a/lib/crypt/snow-3g.c +++ b/lib/crypt/snow-3g.c @@ -413,7 +413,8 @@ void snow_3g_f8(u8 *key, u32 count, u32 bearer, u32 dir, u8 *data, u32 length) /* Run SNOW 3G algorithm to generate sequence of key stream bits KS*/ snow_3g_initialize(K,IV); - KS = (u32 *)ogs_malloc_or_assert(4*n); + KS = (u32 *)ogs_malloc(4*n); + ogs_assert(KS); snow_3g_generate_key_stream(n,(u32*)KS); /* Exclusive-OR the input data with keystream to generate the output bit diff --git a/lib/crypt/zuc.c b/lib/crypt/zuc.c index 04756626f..96f72ee17 100644 --- a/lib/crypt/zuc.c +++ b/lib/crypt/zuc.c @@ -296,7 +296,8 @@ void zuc_eea3(u8* CK, u32 COUNT, u32 BEARER, u32 DIRECTION, u32 lastbits = (8-(LENGTH%8))%8; L = (LENGTH+31)/32; - z = (u32 *) ogs_malloc_or_assert(L*sizeof(u32)); + z = (u32 *) ogs_malloc(L*sizeof(u32)); + ogs_assert(z); L8 = (LENGTH+7)/8; @@ -387,7 +388,8 @@ void zuc_eia3(u8* IK, u32 COUNT, u32 BEARER, u32 DIRECTION, N = LENGTH + 64; L = (N + 31) / 32; - z = (u32 *) ogs_malloc_or_assert(L*sizeof(u32)); + z = (u32 *) ogs_malloc(L*sizeof(u32)); + ogs_assert(z); ZUC(IK, IV, z, L); T = 0; diff --git a/lib/gtp/context.c b/lib/gtp/context.c index 4e241b770..2c23aaf3e 100644 --- a/lib/gtp/context.c +++ b/lib/gtp/context.c @@ -517,9 +517,6 @@ void ogs_gtp_node_free(ogs_gtp_node_t *node) { ogs_assert(node); - if (node->sock) - ogs_sock_destroy(node->sock); - ogs_gtp_xact_delete_all(node); ogs_freeaddrinfo(node->sa_list); diff --git a/lib/pfcp/context.c b/lib/pfcp/context.c index 83529afe6..1d0930882 100644 --- a/lib/pfcp/context.c +++ b/lib/pfcp/context.c @@ -662,9 +662,6 @@ void ogs_pfcp_node_free(ogs_pfcp_node_t *node) ogs_gtpu_resource_remove_all(&node->gtpu_resource_list); - if (node->sock) - ogs_sock_destroy(node->sock); - ogs_pfcp_xact_delete_all(node); ogs_freeaddrinfo(node->sa_list); diff --git a/lib/sbi/client.c b/lib/sbi/client.c index 3c6dec8a9..18774fc3a 100644 --- a/lib/sbi/client.c +++ b/lib/sbi/client.c @@ -41,6 +41,8 @@ typedef struct connection_s { char **headers; struct curl_slist *header_list; + char *content; + char *memory; size_t size; @@ -298,8 +300,11 @@ static connection_t *connection_add( curl_easy_setopt(conn->easy, CURLOPT_CUSTOMREQUEST, request->h.method); if (request->http.content) { + conn->content = ogs_memdup( + request->http.content, request->http.content_length); + ogs_assert(conn->content); curl_easy_setopt(conn->easy, - CURLOPT_POSTFIELDS, request->http.content); + CURLOPT_POSTFIELDS, conn->content); curl_easy_setopt(conn->easy, CURLOPT_POSTFIELDSIZE, request->http.content_length); #if 1 /* Disable HTTP/1.1 100 Continue : Use "Expect:" in libcurl */ @@ -365,6 +370,9 @@ static void connection_remove(connection_t *conn) ogs_assert(conn->method); ogs_free(conn->method); + if (conn->content) + ogs_free(conn->content); + if (conn->location) ogs_free(conn->location); @@ -516,9 +524,10 @@ static size_t write_cb(void *contents, size_t size, size_t nmemb, void *data) ogs_assert(conn); realsize = size * nmemb; - ptr = ogs_realloc_or_assert(conn->memory, conn->size + realsize + 1); + ptr = ogs_realloc(conn->memory, conn->size + realsize + 1); if(!ptr) { ogs_fatal("not enough memory (realloc returned NULL)"); + ogs_assert_if_reached(); return 0; } diff --git a/lib/sbi/conv.c b/lib/sbi/conv.c index c034e7655..5c2a91f1b 100644 --- a/lib/sbi/conv.c +++ b/lib/sbi/conv.c @@ -118,8 +118,9 @@ static char *url_decode(const char *str) { if (str != NULL) { char *pstr = (char*)str; - char *buf = ogs_malloc_or_assert(strlen(str) + 1); + char *buf = ogs_malloc(strlen(str) + 1); char *pbuf = buf; + ogs_assert(buf); while (*pstr) { if (*pstr == '%') { if (pstr[1] && pstr[2]) { diff --git a/lib/sbi/custom/patch_item.c b/lib/sbi/custom/patch_item.c index dcdc45793..533b55bf0 100644 --- a/lib/sbi/custom/patch_item.c +++ b/lib/sbi/custom/patch_item.c @@ -11,10 +11,9 @@ OpenAPI_patch_item_t *OpenAPI_patch_item_create( OpenAPI_any_type_t *value ) { - OpenAPI_patch_item_t *patch_item_local_var = OpenAPI_malloc(sizeof(OpenAPI_patch_item_t)); - if (!patch_item_local_var) { - return NULL; - } + OpenAPI_patch_item_t *patch_item_local_var = ogs_malloc(sizeof(OpenAPI_patch_item_t)); + ogs_assert(patch_item_local_var); + patch_item_local_var->op = op; patch_item_local_var->path = path; patch_item_local_var->from = from; @@ -142,8 +141,8 @@ OpenAPI_patch_item_t *OpenAPI_patch_item_parseFromJSON(cJSON *patch_itemJSON) patch_item_local_var = OpenAPI_patch_item_create ( opVariable, - ogs_strdup_or_assert(path->valuestring), - from ? ogs_strdup_or_assert(from->valuestring) : NULL, + ogs_strdup(path->valuestring), + from ? ogs_strdup(from->valuestring) : NULL, any_type_value ); diff --git a/lib/sbi/custom/ue_authentication_ctx.c b/lib/sbi/custom/ue_authentication_ctx.c index 16e51189d..53f196ed8 100644 --- a/lib/sbi/custom/ue_authentication_ctx.c +++ b/lib/sbi/custom/ue_authentication_ctx.c @@ -12,10 +12,9 @@ OpenAPI_ue_authentication_ctx_t *OpenAPI_ue_authentication_ctx_create( char *serving_network_name ) { - OpenAPI_ue_authentication_ctx_t *ue_authentication_ctx_local_var = OpenAPI_malloc(sizeof(OpenAPI_ue_authentication_ctx_t)); - if (!ue_authentication_ctx_local_var) { - return NULL; - } + OpenAPI_ue_authentication_ctx_t *ue_authentication_ctx_local_var = ogs_malloc(sizeof(OpenAPI_ue_authentication_ctx_t)); + ogs_assert(ue_authentication_ctx_local_var); + ue_authentication_ctx_local_var->auth_type = auth_type; ue_authentication_ctx_local_var->_5g_auth_data = _5g_auth_data; ue_authentication_ctx_local_var->eap_payload = eap_payload; @@ -42,6 +41,7 @@ void OpenAPI_ue_authentication_ctx_free(OpenAPI_ue_authentication_ctx_t *ue_auth if (ue_authentication_ctx->_links) { OpenAPI_list_for_each(ue_authentication_ctx->_links, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_links_value_schema_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -174,7 +174,7 @@ OpenAPI_ue_authentication_ctx_t *OpenAPI_ue_authentication_ctx_parseFromJSON(cJS goto end; } localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_links_value_schema_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_links_value_schema_parseFromJSON(localMapObject)); OpenAPI_list_add(_linksList , localMapKeyPair); } @@ -190,9 +190,9 @@ OpenAPI_ue_authentication_ctx_t *OpenAPI_ue_authentication_ctx_parseFromJSON(cJS ue_authentication_ctx_local_var = OpenAPI_ue_authentication_ctx_create ( auth_typeVariable, _5g_auth_data ? _5g_auth_data_local_nonprim : NULL, - eap_payload ? ogs_strdup_or_assert(eap_payload->valuestring) : NULL, + eap_payload ? ogs_strdup(eap_payload->valuestring) : NULL, _linksList, - serving_network_name ? ogs_strdup_or_assert(serving_network_name->valuestring) : NULL + serving_network_name ? ogs_strdup(serving_network_name->valuestring) : NULL ); return ue_authentication_ctx_local_var; diff --git a/lib/sbi/message.c b/lib/sbi/message.c index d5381d887..d32436b80 100644 --- a/lib/sbi/message.c +++ b/lib/sbi/message.c @@ -2113,6 +2113,7 @@ static void http_message_free(ogs_sbi_http_message_t *http) for (hi = ogs_hash_first(http->params); hi; hi = ogs_hash_next(hi)) { char *key = (char *)ogs_hash_this_key(hi); char *val = ogs_hash_this_val(hi); + ogs_hash_set(http->params, key, strlen(key), NULL); ogs_free(key); ogs_free(val); } @@ -2124,6 +2125,7 @@ static void http_message_free(ogs_sbi_http_message_t *http) for (hi = ogs_hash_first(http->headers); hi; hi = ogs_hash_next(hi)) { char *key = (char *)ogs_hash_this_key(hi); char *val = ogs_hash_this_val(hi); + ogs_hash_set(http->headers, key, strlen(key), NULL); ogs_free(key); ogs_free(val); } diff --git a/lib/sbi/openapi/external/cJSON.c b/lib/sbi/openapi/external/cJSON.c index 873ca2c25..792c5b753 100644 --- a/lib/sbi/openapi/external/cJSON.c +++ b/lib/sbi/openapi/external/cJSON.c @@ -148,7 +148,9 @@ static void *internal_realloc(void *pointer, size_t size) #include "ogs-core.h" static void *internal_malloc(size_t size) { - return ogs_malloc_or_assert(size); + void *ptr = ogs_malloc(size); + ogs_assert(ptr); + return ptr; } static void internal_free(void *pointer) { @@ -156,7 +158,9 @@ static void internal_free(void *pointer) } static void *internal_realloc(void *pointer, size_t size) { - return ogs_realloc_or_assert(pointer, size); + void *ptr = ogs_realloc(pointer, size); + ogs_assert(ptr); + return ptr; } #endif diff --git a/lib/sbi/openapi/include/list.h b/lib/sbi/openapi/include/list.h index 986693358..425e3e665 100644 --- a/lib/sbi/openapi/include/list.h +++ b/lib/sbi/openapi/include/list.h @@ -8,8 +8,6 @@ extern "C" { #endif -#define OpenAPI_malloc(__sIZE) __sIZE == 0 ? NULL : ogs_malloc_or_assert(__sIZE) - typedef struct OpenAPI_list_s OpenAPI_list_t; typedef struct OpenAPI_lnode_s OpenAPI_lnode_t; diff --git a/lib/sbi/openapi/model/acc_net_ch_id.c b/lib/sbi/openapi/model/acc_net_ch_id.c index db8f80cae..67af933b9 100644 --- a/lib/sbi/openapi/model/acc_net_ch_id.c +++ b/lib/sbi/openapi/model/acc_net_ch_id.c @@ -11,10 +11,9 @@ OpenAPI_acc_net_ch_id_t *OpenAPI_acc_net_ch_id_create( int session_ch_scope ) { - OpenAPI_acc_net_ch_id_t *acc_net_ch_id_local_var = OpenAPI_malloc(sizeof(OpenAPI_acc_net_ch_id_t)); - if (!acc_net_ch_id_local_var) { - return NULL; - } + OpenAPI_acc_net_ch_id_t *acc_net_ch_id_local_var = ogs_malloc(sizeof(OpenAPI_acc_net_ch_id_t)); + ogs_assert(acc_net_ch_id_local_var); + acc_net_ch_id_local_var->acc_net_cha_id_value = acc_net_cha_id_value; acc_net_ch_id_local_var->ref_pcc_rule_ids = ref_pcc_rule_ids; acc_net_ch_id_local_var->is_session_ch_scope = is_session_ch_scope; @@ -108,7 +107,7 @@ OpenAPI_acc_net_ch_id_t *OpenAPI_acc_net_ch_id_parseFromJSON(cJSON *acc_net_ch_i ogs_error("OpenAPI_acc_net_ch_id_parseFromJSON() failed [ref_pcc_rule_ids]"); goto end; } - OpenAPI_list_add(ref_pcc_rule_idsList , ogs_strdup_or_assert(ref_pcc_rule_ids_local->valuestring)); + OpenAPI_list_add(ref_pcc_rule_idsList , ogs_strdup(ref_pcc_rule_ids_local->valuestring)); } } diff --git a/lib/sbi/openapi/model/acc_net_charging_address.c b/lib/sbi/openapi/model/acc_net_charging_address.c index 24125af5a..5a80dc0b9 100644 --- a/lib/sbi/openapi/model/acc_net_charging_address.c +++ b/lib/sbi/openapi/model/acc_net_charging_address.c @@ -9,10 +9,9 @@ OpenAPI_acc_net_charging_address_t *OpenAPI_acc_net_charging_address_create( char *an_charg_ipv6_addr ) { - OpenAPI_acc_net_charging_address_t *acc_net_charging_address_local_var = OpenAPI_malloc(sizeof(OpenAPI_acc_net_charging_address_t)); - if (!acc_net_charging_address_local_var) { - return NULL; - } + OpenAPI_acc_net_charging_address_t *acc_net_charging_address_local_var = ogs_malloc(sizeof(OpenAPI_acc_net_charging_address_t)); + ogs_assert(acc_net_charging_address_local_var); + acc_net_charging_address_local_var->an_charg_ipv4_addr = an_charg_ipv4_addr; acc_net_charging_address_local_var->an_charg_ipv6_addr = an_charg_ipv6_addr; @@ -80,8 +79,8 @@ OpenAPI_acc_net_charging_address_t *OpenAPI_acc_net_charging_address_parseFromJS } acc_net_charging_address_local_var = OpenAPI_acc_net_charging_address_create ( - an_charg_ipv4_addr ? ogs_strdup_or_assert(an_charg_ipv4_addr->valuestring) : NULL, - an_charg_ipv6_addr ? ogs_strdup_or_assert(an_charg_ipv6_addr->valuestring) : NULL + an_charg_ipv4_addr ? ogs_strdup(an_charg_ipv4_addr->valuestring) : NULL, + an_charg_ipv6_addr ? ogs_strdup(an_charg_ipv6_addr->valuestring) : NULL ); return acc_net_charging_address_local_var; diff --git a/lib/sbi/openapi/model/acceptable_service_info.c b/lib/sbi/openapi/model/acceptable_service_info.c index a1beafcab..0d72d2b85 100644 --- a/lib/sbi/openapi/model/acceptable_service_info.c +++ b/lib/sbi/openapi/model/acceptable_service_info.c @@ -10,10 +10,9 @@ OpenAPI_acceptable_service_info_t *OpenAPI_acceptable_service_info_create( char *mar_bw_dl ) { - OpenAPI_acceptable_service_info_t *acceptable_service_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_acceptable_service_info_t)); - if (!acceptable_service_info_local_var) { - return NULL; - } + OpenAPI_acceptable_service_info_t *acceptable_service_info_local_var = ogs_malloc(sizeof(OpenAPI_acceptable_service_info_t)); + ogs_assert(acceptable_service_info_local_var); + acceptable_service_info_local_var->acc_bw_med_comps = acc_bw_med_comps; acceptable_service_info_local_var->mar_bw_ul = mar_bw_ul; acceptable_service_info_local_var->mar_bw_dl = mar_bw_dl; @@ -29,6 +28,7 @@ void OpenAPI_acceptable_service_info_free(OpenAPI_acceptable_service_info_t *acc OpenAPI_lnode_t *node; OpenAPI_list_for_each(acceptable_service_info->acc_bw_med_comps, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_media_component_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -107,9 +107,9 @@ OpenAPI_acceptable_service_info_t *OpenAPI_acceptable_service_info_parseFromJSON cJSON *localMapObject = acc_bw_med_comps_local_map; if (cJSON_IsObject(acc_bw_med_comps_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_media_component_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_media_component_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(acc_bw_med_comps_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_acceptable_service_info_parseFromJSON() failed [acc_bw_med_comps]"); goto end; @@ -138,8 +138,8 @@ OpenAPI_acceptable_service_info_t *OpenAPI_acceptable_service_info_parseFromJSON acceptable_service_info_local_var = OpenAPI_acceptable_service_info_create ( acc_bw_med_comps ? acc_bw_med_compsList : NULL, - mar_bw_ul ? ogs_strdup_or_assert(mar_bw_ul->valuestring) : NULL, - mar_bw_dl ? ogs_strdup_or_assert(mar_bw_dl->valuestring) : NULL + mar_bw_ul ? ogs_strdup(mar_bw_ul->valuestring) : NULL, + mar_bw_dl ? ogs_strdup(mar_bw_dl->valuestring) : NULL ); return acceptable_service_info_local_var; diff --git a/lib/sbi/openapi/model/access_and_mobility_data.c b/lib/sbi/openapi/model/access_and_mobility_data.c index 84da909ed..4d5f55cb3 100644 --- a/lib/sbi/openapi/model/access_and_mobility_data.c +++ b/lib/sbi/openapi/model/access_and_mobility_data.c @@ -28,10 +28,9 @@ OpenAPI_access_and_mobility_data_t *OpenAPI_access_and_mobility_data_create( char *supp_feat ) { - OpenAPI_access_and_mobility_data_t *access_and_mobility_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_access_and_mobility_data_t)); - if (!access_and_mobility_data_local_var) { - return NULL; - } + OpenAPI_access_and_mobility_data_t *access_and_mobility_data_local_var = ogs_malloc(sizeof(OpenAPI_access_and_mobility_data_t)); + ogs_assert(access_and_mobility_data_local_var); + access_and_mobility_data_local_var->location = location; access_and_mobility_data_local_var->location_ts = location_ts; access_and_mobility_data_local_var->time_zone = time_zone; @@ -519,26 +518,26 @@ OpenAPI_access_and_mobility_data_t *OpenAPI_access_and_mobility_data_parseFromJS access_and_mobility_data_local_var = OpenAPI_access_and_mobility_data_create ( location ? location_local_nonprim : NULL, - location_ts ? ogs_strdup_or_assert(location_ts->valuestring) : NULL, - time_zone ? ogs_strdup_or_assert(time_zone->valuestring) : NULL, - time_zone_ts ? ogs_strdup_or_assert(time_zone_ts->valuestring) : NULL, + location_ts ? ogs_strdup(location_ts->valuestring) : NULL, + time_zone ? ogs_strdup(time_zone->valuestring) : NULL, + time_zone_ts ? ogs_strdup(time_zone_ts->valuestring) : NULL, access_type ? access_typeVariable : 0, reg_states ? reg_statesList : NULL, - reg_states_ts ? ogs_strdup_or_assert(reg_states_ts->valuestring) : NULL, + reg_states_ts ? ogs_strdup(reg_states_ts->valuestring) : NULL, conn_states ? conn_statesList : NULL, - conn_states_ts ? ogs_strdup_or_assert(conn_states_ts->valuestring) : NULL, + conn_states_ts ? ogs_strdup(conn_states_ts->valuestring) : NULL, reachability_status ? reachability_status_local_nonprim : NULL, - reachability_status_ts ? ogs_strdup_or_assert(reachability_status_ts->valuestring) : NULL, + reachability_status_ts ? ogs_strdup(reachability_status_ts->valuestring) : NULL, sms_over_nas_status ? sms_over_nas_statusVariable : 0, - sms_over_nas_status_ts ? ogs_strdup_or_assert(sms_over_nas_status_ts->valuestring) : NULL, + sms_over_nas_status_ts ? ogs_strdup(sms_over_nas_status_ts->valuestring) : NULL, roaming_status ? true : false, roaming_status ? roaming_status->valueint : 0, - roaming_status_ts ? ogs_strdup_or_assert(roaming_status_ts->valuestring) : NULL, + roaming_status_ts ? ogs_strdup(roaming_status_ts->valuestring) : NULL, current_plmn ? current_plmn_local_nonprim : NULL, - current_plmn_ts ? ogs_strdup_or_assert(current_plmn_ts->valuestring) : NULL, + current_plmn_ts ? ogs_strdup(current_plmn_ts->valuestring) : NULL, rat_type ? rat_typeList : NULL, - rat_types_ts ? ogs_strdup_or_assert(rat_types_ts->valuestring) : NULL, - supp_feat ? ogs_strdup_or_assert(supp_feat->valuestring) : NULL + rat_types_ts ? ogs_strdup(rat_types_ts->valuestring) : NULL, + supp_feat ? ogs_strdup(supp_feat->valuestring) : NULL ); return access_and_mobility_data_local_var; diff --git a/lib/sbi/openapi/model/access_and_mobility_subscription_data.c b/lib/sbi/openapi/model/access_and_mobility_subscription_data.c index e2c8cbdde..0444330e0 100644 --- a/lib/sbi/openapi/model/access_and_mobility_subscription_data.c +++ b/lib/sbi/openapi/model/access_and_mobility_subscription_data.c @@ -66,10 +66,9 @@ OpenAPI_access_and_mobility_subscription_data_t *OpenAPI_access_and_mobility_sub OpenAPI_wireline_service_area_restriction_t *wireline_service_area_restriction ) { - OpenAPI_access_and_mobility_subscription_data_t *access_and_mobility_subscription_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_access_and_mobility_subscription_data_t)); - if (!access_and_mobility_subscription_data_local_var) { - return NULL; - } + OpenAPI_access_and_mobility_subscription_data_t *access_and_mobility_subscription_data_local_var = ogs_malloc(sizeof(OpenAPI_access_and_mobility_subscription_data_t)); + ogs_assert(access_and_mobility_subscription_data_local_var); + access_and_mobility_subscription_data_local_var->supported_features = supported_features; access_and_mobility_subscription_data_local_var->gpsis = gpsis; access_and_mobility_subscription_data_local_var->internal_group_ids = internal_group_ids; @@ -150,6 +149,7 @@ void OpenAPI_access_and_mobility_subscription_data_free(OpenAPI_access_and_mobil OpenAPI_list_free(access_and_mobility_subscription_data->internal_group_ids); OpenAPI_list_for_each(access_and_mobility_subscription_data->shared_vn_group_data_ids, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); ogs_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -759,7 +759,7 @@ OpenAPI_access_and_mobility_subscription_data_t *OpenAPI_access_and_mobility_sub ogs_error("OpenAPI_access_and_mobility_subscription_data_parseFromJSON() failed [gpsis]"); goto end; } - OpenAPI_list_add(gpsisList , ogs_strdup_or_assert(gpsis_local->valuestring)); + OpenAPI_list_add(gpsisList , ogs_strdup(gpsis_local->valuestring)); } } @@ -779,7 +779,7 @@ OpenAPI_access_and_mobility_subscription_data_t *OpenAPI_access_and_mobility_sub ogs_error("OpenAPI_access_and_mobility_subscription_data_parseFromJSON() failed [internal_group_ids]"); goto end; } - OpenAPI_list_add(internal_group_idsList , ogs_strdup_or_assert(internal_group_ids_local->valuestring)); + OpenAPI_list_add(internal_group_idsList , ogs_strdup(internal_group_ids_local->valuestring)); } } @@ -1021,7 +1021,7 @@ OpenAPI_access_and_mobility_subscription_data_t *OpenAPI_access_and_mobility_sub ogs_error("OpenAPI_access_and_mobility_subscription_data_parseFromJSON() failed [shared_am_data_ids]"); goto end; } - OpenAPI_list_add(shared_am_data_idsList , ogs_strdup_or_assert(shared_am_data_ids_local->valuestring)); + OpenAPI_list_add(shared_am_data_idsList , ogs_strdup(shared_am_data_ids_local->valuestring)); } } @@ -1052,7 +1052,7 @@ OpenAPI_access_and_mobility_subscription_data_t *OpenAPI_access_and_mobility_sub ogs_error("OpenAPI_access_and_mobility_subscription_data_parseFromJSON() failed [subscribed_dnn_list]"); goto end; } - OpenAPI_list_add(subscribed_dnn_listList , ogs_strdup_or_assert(subscribed_dnn_list_local->valuestring)); + OpenAPI_list_add(subscribed_dnn_listList , ogs_strdup(subscribed_dnn_list_local->valuestring)); } } @@ -1295,7 +1295,7 @@ OpenAPI_access_and_mobility_subscription_data_t *OpenAPI_access_and_mobility_sub } access_and_mobility_subscription_data_local_var = OpenAPI_access_and_mobility_subscription_data_create ( - supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, + supported_features ? ogs_strdup(supported_features->valuestring) : NULL, gpsis ? gpsisList : NULL, internal_group_ids ? internal_group_idsList : NULL, shared_vn_group_data_ids ? shared_vn_group_data_idsList : NULL, @@ -1335,13 +1335,13 @@ OpenAPI_access_and_mobility_subscription_data_t *OpenAPI_access_and_mobility_sub mdt_configuration ? mdt_configuration_local_nonprim : NULL, trace_data ? trace_data_local_nonprim : NULL, cag_data ? cag_data_local_nonprim : NULL, - stn_sr ? ogs_strdup_or_assert(stn_sr->valuestring) : NULL, - c_msisdn ? ogs_strdup_or_assert(c_msisdn->valuestring) : NULL, + stn_sr ? ogs_strdup(stn_sr->valuestring) : NULL, + c_msisdn ? ogs_strdup(c_msisdn->valuestring) : NULL, nb_io_tue_priority ? true : false, nb_io_tue_priority ? nb_io_tue_priority->valuedouble : 0, nssai_inclusion_allowed ? true : false, nssai_inclusion_allowed ? nssai_inclusion_allowed->valueint : 0, - rg_wireline_characteristics ? ogs_strdup_or_assert(rg_wireline_characteristics->valuestring) : NULL, + rg_wireline_characteristics ? ogs_strdup(rg_wireline_characteristics->valuestring) : NULL, ec_restriction_data_wb ? ec_restriction_data_wb_local_nonprim : NULL, ec_restriction_data_nb ? true : false, ec_restriction_data_nb ? ec_restriction_data_nb->valueint : 0, diff --git a/lib/sbi/openapi/model/access_and_mobility_subscription_data_1.c b/lib/sbi/openapi/model/access_and_mobility_subscription_data_1.c index e01ecc793..38e0b33b3 100644 --- a/lib/sbi/openapi/model/access_and_mobility_subscription_data_1.c +++ b/lib/sbi/openapi/model/access_and_mobility_subscription_data_1.c @@ -66,10 +66,9 @@ OpenAPI_access_and_mobility_subscription_data_1_t *OpenAPI_access_and_mobility_s OpenAPI_wireline_service_area_restriction_1_t *wireline_service_area_restriction ) { - OpenAPI_access_and_mobility_subscription_data_1_t *access_and_mobility_subscription_data_1_local_var = OpenAPI_malloc(sizeof(OpenAPI_access_and_mobility_subscription_data_1_t)); - if (!access_and_mobility_subscription_data_1_local_var) { - return NULL; - } + OpenAPI_access_and_mobility_subscription_data_1_t *access_and_mobility_subscription_data_1_local_var = ogs_malloc(sizeof(OpenAPI_access_and_mobility_subscription_data_1_t)); + ogs_assert(access_and_mobility_subscription_data_1_local_var); + access_and_mobility_subscription_data_1_local_var->supported_features = supported_features; access_and_mobility_subscription_data_1_local_var->gpsis = gpsis; access_and_mobility_subscription_data_1_local_var->internal_group_ids = internal_group_ids; @@ -150,6 +149,7 @@ void OpenAPI_access_and_mobility_subscription_data_1_free(OpenAPI_access_and_mob OpenAPI_list_free(access_and_mobility_subscription_data_1->internal_group_ids); OpenAPI_list_for_each(access_and_mobility_subscription_data_1->shared_vn_group_data_ids, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); ogs_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -759,7 +759,7 @@ OpenAPI_access_and_mobility_subscription_data_1_t *OpenAPI_access_and_mobility_s ogs_error("OpenAPI_access_and_mobility_subscription_data_1_parseFromJSON() failed [gpsis]"); goto end; } - OpenAPI_list_add(gpsisList , ogs_strdup_or_assert(gpsis_local->valuestring)); + OpenAPI_list_add(gpsisList , ogs_strdup(gpsis_local->valuestring)); } } @@ -779,7 +779,7 @@ OpenAPI_access_and_mobility_subscription_data_1_t *OpenAPI_access_and_mobility_s ogs_error("OpenAPI_access_and_mobility_subscription_data_1_parseFromJSON() failed [internal_group_ids]"); goto end; } - OpenAPI_list_add(internal_group_idsList , ogs_strdup_or_assert(internal_group_ids_local->valuestring)); + OpenAPI_list_add(internal_group_idsList , ogs_strdup(internal_group_ids_local->valuestring)); } } @@ -1021,7 +1021,7 @@ OpenAPI_access_and_mobility_subscription_data_1_t *OpenAPI_access_and_mobility_s ogs_error("OpenAPI_access_and_mobility_subscription_data_1_parseFromJSON() failed [shared_am_data_ids]"); goto end; } - OpenAPI_list_add(shared_am_data_idsList , ogs_strdup_or_assert(shared_am_data_ids_local->valuestring)); + OpenAPI_list_add(shared_am_data_idsList , ogs_strdup(shared_am_data_ids_local->valuestring)); } } @@ -1052,7 +1052,7 @@ OpenAPI_access_and_mobility_subscription_data_1_t *OpenAPI_access_and_mobility_s ogs_error("OpenAPI_access_and_mobility_subscription_data_1_parseFromJSON() failed [subscribed_dnn_list]"); goto end; } - OpenAPI_list_add(subscribed_dnn_listList , ogs_strdup_or_assert(subscribed_dnn_list_local->valuestring)); + OpenAPI_list_add(subscribed_dnn_listList , ogs_strdup(subscribed_dnn_list_local->valuestring)); } } @@ -1295,7 +1295,7 @@ OpenAPI_access_and_mobility_subscription_data_1_t *OpenAPI_access_and_mobility_s } access_and_mobility_subscription_data_1_local_var = OpenAPI_access_and_mobility_subscription_data_1_create ( - supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, + supported_features ? ogs_strdup(supported_features->valuestring) : NULL, gpsis ? gpsisList : NULL, internal_group_ids ? internal_group_idsList : NULL, shared_vn_group_data_ids ? shared_vn_group_data_idsList : NULL, @@ -1335,13 +1335,13 @@ OpenAPI_access_and_mobility_subscription_data_1_t *OpenAPI_access_and_mobility_s mdt_configuration ? mdt_configuration_local_nonprim : NULL, trace_data ? trace_data_local_nonprim : NULL, cag_data ? cag_data_local_nonprim : NULL, - stn_sr ? ogs_strdup_or_assert(stn_sr->valuestring) : NULL, - c_msisdn ? ogs_strdup_or_assert(c_msisdn->valuestring) : NULL, + stn_sr ? ogs_strdup(stn_sr->valuestring) : NULL, + c_msisdn ? ogs_strdup(c_msisdn->valuestring) : NULL, nb_io_tue_priority ? true : false, nb_io_tue_priority ? nb_io_tue_priority->valuedouble : 0, nssai_inclusion_allowed ? true : false, nssai_inclusion_allowed ? nssai_inclusion_allowed->valueint : 0, - rg_wireline_characteristics ? ogs_strdup_or_assert(rg_wireline_characteristics->valuestring) : NULL, + rg_wireline_characteristics ? ogs_strdup(rg_wireline_characteristics->valuestring) : NULL, ec_restriction_data_wb ? ec_restriction_data_wb_local_nonprim : NULL, ec_restriction_data_nb ? true : false, ec_restriction_data_nb ? ec_restriction_data_nb->valueint : 0, diff --git a/lib/sbi/openapi/model/access_net_charging_identifier.c b/lib/sbi/openapi/model/access_net_charging_identifier.c index 534215554..5af580870 100644 --- a/lib/sbi/openapi/model/access_net_charging_identifier.c +++ b/lib/sbi/openapi/model/access_net_charging_identifier.c @@ -9,10 +9,9 @@ OpenAPI_access_net_charging_identifier_t *OpenAPI_access_net_charging_identifier OpenAPI_list_t *flows ) { - OpenAPI_access_net_charging_identifier_t *access_net_charging_identifier_local_var = OpenAPI_malloc(sizeof(OpenAPI_access_net_charging_identifier_t)); - if (!access_net_charging_identifier_local_var) { - return NULL; - } + OpenAPI_access_net_charging_identifier_t *access_net_charging_identifier_local_var = ogs_malloc(sizeof(OpenAPI_access_net_charging_identifier_t)); + ogs_assert(access_net_charging_identifier_local_var); + access_net_charging_identifier_local_var->acc_net_cha_id_value = acc_net_cha_id_value; access_net_charging_identifier_local_var->flows = flows; diff --git a/lib/sbi/openapi/model/access_right_status.c b/lib/sbi/openapi/model/access_right_status.c index c03475a23..142862deb 100644 --- a/lib/sbi/openapi/model/access_right_status.c +++ b/lib/sbi/openapi/model/access_right_status.c @@ -7,10 +7,9 @@ OpenAPI_access_right_status_t *OpenAPI_access_right_status_create( ) { - OpenAPI_access_right_status_t *access_right_status_local_var = OpenAPI_malloc(sizeof(OpenAPI_access_right_status_t)); - if (!access_right_status_local_var) { - return NULL; - } + OpenAPI_access_right_status_t *access_right_status_local_var = ogs_malloc(sizeof(OpenAPI_access_right_status_t)); + ogs_assert(access_right_status_local_var); + return access_right_status_local_var; } diff --git a/lib/sbi/openapi/model/access_tech.c b/lib/sbi/openapi/model/access_tech.c index 4673c9e3f..33e209ff4 100644 --- a/lib/sbi/openapi/model/access_tech.c +++ b/lib/sbi/openapi/model/access_tech.c @@ -7,10 +7,9 @@ OpenAPI_access_tech_t *OpenAPI_access_tech_create( ) { - OpenAPI_access_tech_t *access_tech_local_var = OpenAPI_malloc(sizeof(OpenAPI_access_tech_t)); - if (!access_tech_local_var) { - return NULL; - } + OpenAPI_access_tech_t *access_tech_local_var = ogs_malloc(sizeof(OpenAPI_access_tech_t)); + ogs_assert(access_tech_local_var); + return access_tech_local_var; } diff --git a/lib/sbi/openapi/model/access_token_err.c b/lib/sbi/openapi/model/access_token_err.c index 00ba28e9a..bf3e72895 100644 --- a/lib/sbi/openapi/model/access_token_err.c +++ b/lib/sbi/openapi/model/access_token_err.c @@ -33,10 +33,9 @@ OpenAPI_access_token_err_t *OpenAPI_access_token_err_create( char *error_uri ) { - OpenAPI_access_token_err_t *access_token_err_local_var = OpenAPI_malloc(sizeof(OpenAPI_access_token_err_t)); - if (!access_token_err_local_var) { - return NULL; - } + OpenAPI_access_token_err_t *access_token_err_local_var = ogs_malloc(sizeof(OpenAPI_access_token_err_t)); + ogs_assert(access_token_err_local_var); + access_token_err_local_var->error = error; access_token_err_local_var->error_description = error_description; access_token_err_local_var->error_uri = error_uri; @@ -124,8 +123,8 @@ OpenAPI_access_token_err_t *OpenAPI_access_token_err_parseFromJSON(cJSON *access access_token_err_local_var = OpenAPI_access_token_err_create ( errorVariable, - error_description ? ogs_strdup_or_assert(error_description->valuestring) : NULL, - error_uri ? ogs_strdup_or_assert(error_uri->valuestring) : NULL + error_description ? ogs_strdup(error_description->valuestring) : NULL, + error_uri ? ogs_strdup(error_uri->valuestring) : NULL ); return access_token_err_local_var; diff --git a/lib/sbi/openapi/model/access_token_req.c b/lib/sbi/openapi/model/access_token_req.c index efe8207d9..512f9d866 100644 --- a/lib/sbi/openapi/model/access_token_req.c +++ b/lib/sbi/openapi/model/access_token_req.c @@ -46,10 +46,9 @@ OpenAPI_access_token_req_t *OpenAPI_access_token_req_create( char *target_nf_service_set_id ) { - OpenAPI_access_token_req_t *access_token_req_local_var = OpenAPI_malloc(sizeof(OpenAPI_access_token_req_t)); - if (!access_token_req_local_var) { - return NULL; - } + OpenAPI_access_token_req_t *access_token_req_local_var = ogs_malloc(sizeof(OpenAPI_access_token_req_t)); + ogs_assert(access_token_req_local_var); + access_token_req_local_var->grant_type = grant_type; access_token_req_local_var->nf_instance_id = nf_instance_id; access_token_req_local_var->nf_type = nf_type; @@ -500,7 +499,7 @@ OpenAPI_access_token_req_t *OpenAPI_access_token_req_parseFromJSON(cJSON *access ogs_error("OpenAPI_access_token_req_parseFromJSON() failed [target_nsi_list]"); goto end; } - OpenAPI_list_add(target_nsi_listList , ogs_strdup_or_assert(target_nsi_list_local->valuestring)); + OpenAPI_list_add(target_nsi_listList , ogs_strdup(target_nsi_list_local->valuestring)); } } @@ -524,21 +523,21 @@ OpenAPI_access_token_req_t *OpenAPI_access_token_req_parseFromJSON(cJSON *access access_token_req_local_var = OpenAPI_access_token_req_create ( grant_typeVariable, - ogs_strdup_or_assert(nf_instance_id->valuestring), + ogs_strdup(nf_instance_id->valuestring), nf_type ? nf_typeVariable : 0, target_nf_type ? target_nf_typeVariable : 0, - ogs_strdup_or_assert(scope->valuestring), - target_nf_instance_id ? ogs_strdup_or_assert(target_nf_instance_id->valuestring) : NULL, + ogs_strdup(scope->valuestring), + target_nf_instance_id ? ogs_strdup(target_nf_instance_id->valuestring) : NULL, requester_plmn ? requester_plmn_local_nonprim : NULL, requester_plmn_list ? requester_plmn_listList : NULL, requester_snssai_list ? requester_snssai_listList : NULL, - requester_fqdn ? ogs_strdup_or_assert(requester_fqdn->valuestring) : NULL, + requester_fqdn ? ogs_strdup(requester_fqdn->valuestring) : NULL, requester_snpn_list ? requester_snpn_listList : NULL, target_plmn ? target_plmn_local_nonprim : NULL, target_snssai_list ? target_snssai_listList : NULL, target_nsi_list ? target_nsi_listList : NULL, - target_nf_set_id ? ogs_strdup_or_assert(target_nf_set_id->valuestring) : NULL, - target_nf_service_set_id ? ogs_strdup_or_assert(target_nf_service_set_id->valuestring) : NULL + target_nf_set_id ? ogs_strdup(target_nf_set_id->valuestring) : NULL, + target_nf_service_set_id ? ogs_strdup(target_nf_service_set_id->valuestring) : NULL ); return access_token_req_local_var; diff --git a/lib/sbi/openapi/model/access_type_rm.c b/lib/sbi/openapi/model/access_type_rm.c index fa665b3c6..52c06f8f1 100644 --- a/lib/sbi/openapi/model/access_type_rm.c +++ b/lib/sbi/openapi/model/access_type_rm.c @@ -7,10 +7,9 @@ OpenAPI_access_type_rm_t *OpenAPI_access_type_rm_create( ) { - OpenAPI_access_type_rm_t *access_type_rm_local_var = OpenAPI_malloc(sizeof(OpenAPI_access_type_rm_t)); - if (!access_type_rm_local_var) { - return NULL; - } + OpenAPI_access_type_rm_t *access_type_rm_local_var = ogs_malloc(sizeof(OpenAPI_access_type_rm_t)); + ogs_assert(access_type_rm_local_var); + return access_type_rm_local_var; } diff --git a/lib/sbi/openapi/model/accu_usage_report.c b/lib/sbi/openapi/model/accu_usage_report.c index 4da6f55f8..4d3777354 100644 --- a/lib/sbi/openapi/model/accu_usage_report.c +++ b/lib/sbi/openapi/model/accu_usage_report.c @@ -24,10 +24,9 @@ OpenAPI_accu_usage_report_t *OpenAPI_accu_usage_report_create( int next_time_usage ) { - OpenAPI_accu_usage_report_t *accu_usage_report_local_var = OpenAPI_malloc(sizeof(OpenAPI_accu_usage_report_t)); - if (!accu_usage_report_local_var) { - return NULL; - } + OpenAPI_accu_usage_report_t *accu_usage_report_local_var = ogs_malloc(sizeof(OpenAPI_accu_usage_report_t)); + ogs_assert(accu_usage_report_local_var); + accu_usage_report_local_var->ref_um_ids = ref_um_ids; accu_usage_report_local_var->is_vol_usage = is_vol_usage; accu_usage_report_local_var->vol_usage = vol_usage; @@ -221,7 +220,7 @@ OpenAPI_accu_usage_report_t *OpenAPI_accu_usage_report_parseFromJSON(cJSON *accu } accu_usage_report_local_var = OpenAPI_accu_usage_report_create ( - ogs_strdup_or_assert(ref_um_ids->valuestring), + ogs_strdup(ref_um_ids->valuestring), vol_usage ? true : false, vol_usage ? vol_usage->valuedouble : 0, vol_usage_uplink ? true : false, diff --git a/lib/sbi/openapi/model/accumulated_usage.c b/lib/sbi/openapi/model/accumulated_usage.c index 77d9484e2..2c3a083bb 100644 --- a/lib/sbi/openapi/model/accumulated_usage.c +++ b/lib/sbi/openapi/model/accumulated_usage.c @@ -15,10 +15,9 @@ OpenAPI_accumulated_usage_t *OpenAPI_accumulated_usage_create( long uplink_volume ) { - OpenAPI_accumulated_usage_t *accumulated_usage_local_var = OpenAPI_malloc(sizeof(OpenAPI_accumulated_usage_t)); - if (!accumulated_usage_local_var) { - return NULL; - } + OpenAPI_accumulated_usage_t *accumulated_usage_local_var = ogs_malloc(sizeof(OpenAPI_accumulated_usage_t)); + ogs_assert(accumulated_usage_local_var); + accumulated_usage_local_var->is_duration = is_duration; accumulated_usage_local_var->duration = duration; accumulated_usage_local_var->is_total_volume = is_total_volume; diff --git a/lib/sbi/openapi/model/acknowledge_info.c b/lib/sbi/openapi/model/acknowledge_info.c index 7e7c96010..6a6e817a2 100644 --- a/lib/sbi/openapi/model/acknowledge_info.c +++ b/lib/sbi/openapi/model/acknowledge_info.c @@ -13,10 +13,9 @@ OpenAPI_acknowledge_info_t *OpenAPI_acknowledge_info_create( int ue_not_reachable ) { - OpenAPI_acknowledge_info_t *acknowledge_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_acknowledge_info_t)); - if (!acknowledge_info_local_var) { - return NULL; - } + OpenAPI_acknowledge_info_t *acknowledge_info_local_var = ogs_malloc(sizeof(OpenAPI_acknowledge_info_t)); + ogs_assert(acknowledge_info_local_var); + acknowledge_info_local_var->sor_mac_iue = sor_mac_iue; acknowledge_info_local_var->upu_mac_iue = upu_mac_iue; acknowledge_info_local_var->secured_packet = secured_packet; @@ -138,10 +137,10 @@ OpenAPI_acknowledge_info_t *OpenAPI_acknowledge_info_parseFromJSON(cJSON *acknow } acknowledge_info_local_var = OpenAPI_acknowledge_info_create ( - sor_mac_iue ? ogs_strdup_or_assert(sor_mac_iue->valuestring) : NULL, - upu_mac_iue ? ogs_strdup_or_assert(upu_mac_iue->valuestring) : NULL, - secured_packet ? ogs_strdup_or_assert(secured_packet->valuestring) : NULL, - ogs_strdup_or_assert(provisioning_time->valuestring), + sor_mac_iue ? ogs_strdup(sor_mac_iue->valuestring) : NULL, + upu_mac_iue ? ogs_strdup(upu_mac_iue->valuestring) : NULL, + secured_packet ? ogs_strdup(secured_packet->valuestring) : NULL, + ogs_strdup(provisioning_time->valuestring), ue_not_reachable ? true : false, ue_not_reachable ? ue_not_reachable->valueint : 0 ); diff --git a/lib/sbi/openapi/model/acs_info.c b/lib/sbi/openapi/model/acs_info.c index acc1c375e..c43d7d373 100644 --- a/lib/sbi/openapi/model/acs_info.c +++ b/lib/sbi/openapi/model/acs_info.c @@ -10,10 +10,9 @@ OpenAPI_acs_info_t *OpenAPI_acs_info_create( char *acs_ipv6_addr ) { - OpenAPI_acs_info_t *acs_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_acs_info_t)); - if (!acs_info_local_var) { - return NULL; - } + OpenAPI_acs_info_t *acs_info_local_var = ogs_malloc(sizeof(OpenAPI_acs_info_t)); + ogs_assert(acs_info_local_var); + acs_info_local_var->acs_url = acs_url; acs_info_local_var->acs_ipv4_addr = acs_ipv4_addr; acs_info_local_var->acs_ipv6_addr = acs_ipv6_addr; @@ -99,9 +98,9 @@ OpenAPI_acs_info_t *OpenAPI_acs_info_parseFromJSON(cJSON *acs_infoJSON) } acs_info_local_var = OpenAPI_acs_info_create ( - acs_url ? ogs_strdup_or_assert(acs_url->valuestring) : NULL, - acs_ipv4_addr ? ogs_strdup_or_assert(acs_ipv4_addr->valuestring) : NULL, - acs_ipv6_addr ? ogs_strdup_or_assert(acs_ipv6_addr->valuestring) : NULL + acs_url ? ogs_strdup(acs_url->valuestring) : NULL, + acs_ipv4_addr ? ogs_strdup(acs_ipv4_addr->valuestring) : NULL, + acs_ipv6_addr ? ogs_strdup(acs_ipv6_addr->valuestring) : NULL ); return acs_info_local_var; diff --git a/lib/sbi/openapi/model/acs_info_1.c b/lib/sbi/openapi/model/acs_info_1.c index 337b5f994..e2bc91bb7 100644 --- a/lib/sbi/openapi/model/acs_info_1.c +++ b/lib/sbi/openapi/model/acs_info_1.c @@ -10,10 +10,9 @@ OpenAPI_acs_info_1_t *OpenAPI_acs_info_1_create( char *acs_ipv6_addr ) { - OpenAPI_acs_info_1_t *acs_info_1_local_var = OpenAPI_malloc(sizeof(OpenAPI_acs_info_1_t)); - if (!acs_info_1_local_var) { - return NULL; - } + OpenAPI_acs_info_1_t *acs_info_1_local_var = ogs_malloc(sizeof(OpenAPI_acs_info_1_t)); + ogs_assert(acs_info_1_local_var); + acs_info_1_local_var->acs_url = acs_url; acs_info_1_local_var->acs_ipv4_addr = acs_ipv4_addr; acs_info_1_local_var->acs_ipv6_addr = acs_ipv6_addr; @@ -99,9 +98,9 @@ OpenAPI_acs_info_1_t *OpenAPI_acs_info_1_parseFromJSON(cJSON *acs_info_1JSON) } acs_info_1_local_var = OpenAPI_acs_info_1_create ( - acs_url ? ogs_strdup_or_assert(acs_url->valuestring) : NULL, - acs_ipv4_addr ? ogs_strdup_or_assert(acs_ipv4_addr->valuestring) : NULL, - acs_ipv6_addr ? ogs_strdup_or_assert(acs_ipv6_addr->valuestring) : NULL + acs_url ? ogs_strdup(acs_url->valuestring) : NULL, + acs_ipv4_addr ? ogs_strdup(acs_ipv4_addr->valuestring) : NULL, + acs_ipv6_addr ? ogs_strdup(acs_ipv6_addr->valuestring) : NULL ); return acs_info_1_local_var; diff --git a/lib/sbi/openapi/model/acs_info_rm.c b/lib/sbi/openapi/model/acs_info_rm.c index 1ff177bc2..d5b189a55 100644 --- a/lib/sbi/openapi/model/acs_info_rm.c +++ b/lib/sbi/openapi/model/acs_info_rm.c @@ -10,10 +10,9 @@ OpenAPI_acs_info_rm_t *OpenAPI_acs_info_rm_create( char *acs_ipv6_addr ) { - OpenAPI_acs_info_rm_t *acs_info_rm_local_var = OpenAPI_malloc(sizeof(OpenAPI_acs_info_rm_t)); - if (!acs_info_rm_local_var) { - return NULL; - } + OpenAPI_acs_info_rm_t *acs_info_rm_local_var = ogs_malloc(sizeof(OpenAPI_acs_info_rm_t)); + ogs_assert(acs_info_rm_local_var); + acs_info_rm_local_var->acs_url = acs_url; acs_info_rm_local_var->acs_ipv4_addr = acs_ipv4_addr; acs_info_rm_local_var->acs_ipv6_addr = acs_ipv6_addr; @@ -99,9 +98,9 @@ OpenAPI_acs_info_rm_t *OpenAPI_acs_info_rm_parseFromJSON(cJSON *acs_info_rmJSON) } acs_info_rm_local_var = OpenAPI_acs_info_rm_create ( - acs_url ? ogs_strdup_or_assert(acs_url->valuestring) : NULL, - acs_ipv4_addr ? ogs_strdup_or_assert(acs_ipv4_addr->valuestring) : NULL, - acs_ipv6_addr ? ogs_strdup_or_assert(acs_ipv6_addr->valuestring) : NULL + acs_url ? ogs_strdup(acs_url->valuestring) : NULL, + acs_ipv4_addr ? ogs_strdup(acs_ipv4_addr->valuestring) : NULL, + acs_ipv6_addr ? ogs_strdup(acs_ipv6_addr->valuestring) : NULL ); return acs_info_rm_local_var; diff --git a/lib/sbi/openapi/model/additional_access_info.c b/lib/sbi/openapi/model/additional_access_info.c index dd341bbac..0ad13e04c 100644 --- a/lib/sbi/openapi/model/additional_access_info.c +++ b/lib/sbi/openapi/model/additional_access_info.c @@ -9,10 +9,9 @@ OpenAPI_additional_access_info_t *OpenAPI_additional_access_info_create( OpenAPI_rat_type_e rat_type ) { - OpenAPI_additional_access_info_t *additional_access_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_additional_access_info_t)); - if (!additional_access_info_local_var) { - return NULL; - } + OpenAPI_additional_access_info_t *additional_access_info_local_var = ogs_malloc(sizeof(OpenAPI_additional_access_info_t)); + ogs_assert(additional_access_info_local_var); + additional_access_info_local_var->access_type = access_type; additional_access_info_local_var->rat_type = rat_type; diff --git a/lib/sbi/openapi/model/additional_snssai_data.c b/lib/sbi/openapi/model/additional_snssai_data.c index 2f68caf76..58005bfff 100644 --- a/lib/sbi/openapi/model/additional_snssai_data.c +++ b/lib/sbi/openapi/model/additional_snssai_data.c @@ -9,10 +9,9 @@ OpenAPI_additional_snssai_data_t *OpenAPI_additional_snssai_data_create( int required_authn_authz ) { - OpenAPI_additional_snssai_data_t *additional_snssai_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_additional_snssai_data_t)); - if (!additional_snssai_data_local_var) { - return NULL; - } + OpenAPI_additional_snssai_data_t *additional_snssai_data_local_var = ogs_malloc(sizeof(OpenAPI_additional_snssai_data_t)); + ogs_assert(additional_snssai_data_local_var); + additional_snssai_data_local_var->is_required_authn_authz = is_required_authn_authz; additional_snssai_data_local_var->required_authn_authz = required_authn_authz; diff --git a/lib/sbi/openapi/model/af_event_exposure_data.c b/lib/sbi/openapi/model/af_event_exposure_data.c index 82c18c639..264e822aa 100644 --- a/lib/sbi/openapi/model/af_event_exposure_data.c +++ b/lib/sbi/openapi/model/af_event_exposure_data.c @@ -10,10 +10,9 @@ OpenAPI_af_event_exposure_data_t *OpenAPI_af_event_exposure_data_create( OpenAPI_list_t *app_ids ) { - OpenAPI_af_event_exposure_data_t *af_event_exposure_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_af_event_exposure_data_t)); - if (!af_event_exposure_data_local_var) { - return NULL; - } + OpenAPI_af_event_exposure_data_t *af_event_exposure_data_local_var = ogs_malloc(sizeof(OpenAPI_af_event_exposure_data_t)); + ogs_assert(af_event_exposure_data_local_var); + af_event_exposure_data_local_var->af_events = af_events; af_event_exposure_data_local_var->af_ids = af_ids; af_event_exposure_data_local_var->app_ids = app_ids; @@ -141,7 +140,7 @@ OpenAPI_af_event_exposure_data_t *OpenAPI_af_event_exposure_data_parseFromJSON(c ogs_error("OpenAPI_af_event_exposure_data_parseFromJSON() failed [af_ids]"); goto end; } - OpenAPI_list_add(af_idsList , ogs_strdup_or_assert(af_ids_local->valuestring)); + OpenAPI_list_add(af_idsList , ogs_strdup(af_ids_local->valuestring)); } } @@ -161,7 +160,7 @@ OpenAPI_af_event_exposure_data_t *OpenAPI_af_event_exposure_data_parseFromJSON(c ogs_error("OpenAPI_af_event_exposure_data_parseFromJSON() failed [app_ids]"); goto end; } - OpenAPI_list_add(app_idsList , ogs_strdup_or_assert(app_ids_local->valuestring)); + OpenAPI_list_add(app_idsList , ogs_strdup(app_ids_local->valuestring)); } } diff --git a/lib/sbi/openapi/model/af_event_notification.c b/lib/sbi/openapi/model/af_event_notification.c index b0646a742..44bafeac7 100644 --- a/lib/sbi/openapi/model/af_event_notification.c +++ b/lib/sbi/openapi/model/af_event_notification.c @@ -9,10 +9,9 @@ OpenAPI_af_event_notification_t *OpenAPI_af_event_notification_create( OpenAPI_list_t *flows ) { - OpenAPI_af_event_notification_t *af_event_notification_local_var = OpenAPI_malloc(sizeof(OpenAPI_af_event_notification_t)); - if (!af_event_notification_local_var) { - return NULL; - } + OpenAPI_af_event_notification_t *af_event_notification_local_var = ogs_malloc(sizeof(OpenAPI_af_event_notification_t)); + ogs_assert(af_event_notification_local_var); + af_event_notification_local_var->event = event; af_event_notification_local_var->flows = flows; diff --git a/lib/sbi/openapi/model/af_event_subscription.c b/lib/sbi/openapi/model/af_event_subscription.c index 2a54b7e95..ac5dc02ac 100644 --- a/lib/sbi/openapi/model/af_event_subscription.c +++ b/lib/sbi/openapi/model/af_event_subscription.c @@ -13,10 +13,9 @@ OpenAPI_af_event_subscription_t *OpenAPI_af_event_subscription_create( int wait_time ) { - OpenAPI_af_event_subscription_t *af_event_subscription_local_var = OpenAPI_malloc(sizeof(OpenAPI_af_event_subscription_t)); - if (!af_event_subscription_local_var) { - return NULL; - } + OpenAPI_af_event_subscription_t *af_event_subscription_local_var = ogs_malloc(sizeof(OpenAPI_af_event_subscription_t)); + ogs_assert(af_event_subscription_local_var); + af_event_subscription_local_var->event = event; af_event_subscription_local_var->notif_method = notif_method; af_event_subscription_local_var->is_rep_period = is_rep_period; diff --git a/lib/sbi/openapi/model/af_external.c b/lib/sbi/openapi/model/af_external.c index ef8c39085..8701adf4d 100644 --- a/lib/sbi/openapi/model/af_external.c +++ b/lib/sbi/openapi/model/af_external.c @@ -11,10 +11,9 @@ OpenAPI_af_external_t *OpenAPI_af_external_create( OpenAPI_valid_time_period_t *valid_time_period ) { - OpenAPI_af_external_t *af_external_local_var = OpenAPI_malloc(sizeof(OpenAPI_af_external_t)); - if (!af_external_local_var) { - return NULL; - } + OpenAPI_af_external_t *af_external_local_var = ogs_malloc(sizeof(OpenAPI_af_external_t)); + ogs_assert(af_external_local_var); + af_external_local_var->af_id = af_id; af_external_local_var->allowed_geographic_area = allowed_geographic_area; af_external_local_var->privacy_check_related_action = privacy_check_related_action; @@ -153,7 +152,7 @@ OpenAPI_af_external_t *OpenAPI_af_external_parseFromJSON(cJSON *af_externalJSON) } af_external_local_var = OpenAPI_af_external_create ( - af_id ? ogs_strdup_or_assert(af_id->valuestring) : NULL, + af_id ? ogs_strdup(af_id->valuestring) : NULL, allowed_geographic_area ? allowed_geographic_areaList : NULL, privacy_check_related_action ? privacy_check_related_actionVariable : 0, valid_time_period ? valid_time_period_local_nonprim : NULL diff --git a/lib/sbi/openapi/model/af_routing_requirement.c b/lib/sbi/openapi/model/af_routing_requirement.c index 0d5072a07..245f8370c 100644 --- a/lib/sbi/openapi/model/af_routing_requirement.c +++ b/lib/sbi/openapi/model/af_routing_requirement.c @@ -15,10 +15,9 @@ OpenAPI_af_routing_requirement_t *OpenAPI_af_routing_requirement_create( int addr_preser_ind ) { - OpenAPI_af_routing_requirement_t *af_routing_requirement_local_var = OpenAPI_malloc(sizeof(OpenAPI_af_routing_requirement_t)); - if (!af_routing_requirement_local_var) { - return NULL; - } + OpenAPI_af_routing_requirement_t *af_routing_requirement_local_var = ogs_malloc(sizeof(OpenAPI_af_routing_requirement_t)); + ogs_assert(af_routing_requirement_local_var); + af_routing_requirement_local_var->is_app_reloc = is_app_reloc; af_routing_requirement_local_var->app_reloc = app_reloc; af_routing_requirement_local_var->route_to_locs = route_to_locs; diff --git a/lib/sbi/openapi/model/af_routing_requirement_rm.c b/lib/sbi/openapi/model/af_routing_requirement_rm.c index e29bf8d8b..f261f40f3 100644 --- a/lib/sbi/openapi/model/af_routing_requirement_rm.c +++ b/lib/sbi/openapi/model/af_routing_requirement_rm.c @@ -15,10 +15,9 @@ OpenAPI_af_routing_requirement_rm_t *OpenAPI_af_routing_requirement_rm_create( int addr_preser_ind ) { - OpenAPI_af_routing_requirement_rm_t *af_routing_requirement_rm_local_var = OpenAPI_malloc(sizeof(OpenAPI_af_routing_requirement_rm_t)); - if (!af_routing_requirement_rm_local_var) { - return NULL; - } + OpenAPI_af_routing_requirement_rm_t *af_routing_requirement_rm_local_var = ogs_malloc(sizeof(OpenAPI_af_routing_requirement_rm_t)); + ogs_assert(af_routing_requirement_rm_local_var); + af_routing_requirement_rm_local_var->is_app_reloc = is_app_reloc; af_routing_requirement_rm_local_var->app_reloc = app_reloc; af_routing_requirement_rm_local_var->route_to_locs = route_to_locs; diff --git a/lib/sbi/openapi/model/allowed_mtc_provider_info.c b/lib/sbi/openapi/model/allowed_mtc_provider_info.c index 4bcf49ae2..618a53c07 100644 --- a/lib/sbi/openapi/model/allowed_mtc_provider_info.c +++ b/lib/sbi/openapi/model/allowed_mtc_provider_info.c @@ -9,10 +9,9 @@ OpenAPI_allowed_mtc_provider_info_t *OpenAPI_allowed_mtc_provider_info_create( char *af_id ) { - OpenAPI_allowed_mtc_provider_info_t *allowed_mtc_provider_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_allowed_mtc_provider_info_t)); - if (!allowed_mtc_provider_info_local_var) { - return NULL; - } + OpenAPI_allowed_mtc_provider_info_t *allowed_mtc_provider_info_local_var = ogs_malloc(sizeof(OpenAPI_allowed_mtc_provider_info_t)); + ogs_assert(allowed_mtc_provider_info_local_var); + allowed_mtc_provider_info_local_var->mtc_provider_information = mtc_provider_information; allowed_mtc_provider_info_local_var->af_id = af_id; @@ -80,8 +79,8 @@ OpenAPI_allowed_mtc_provider_info_t *OpenAPI_allowed_mtc_provider_info_parseFrom } allowed_mtc_provider_info_local_var = OpenAPI_allowed_mtc_provider_info_create ( - mtc_provider_information ? ogs_strdup_or_assert(mtc_provider_information->valuestring) : NULL, - af_id ? ogs_strdup_or_assert(af_id->valuestring) : NULL + mtc_provider_information ? ogs_strdup(mtc_provider_information->valuestring) : NULL, + af_id ? ogs_strdup(af_id->valuestring) : NULL ); return allowed_mtc_provider_info_local_var; diff --git a/lib/sbi/openapi/model/allowed_nssai.c b/lib/sbi/openapi/model/allowed_nssai.c index 60ce29481..be11cfcf1 100644 --- a/lib/sbi/openapi/model/allowed_nssai.c +++ b/lib/sbi/openapi/model/allowed_nssai.c @@ -9,10 +9,9 @@ OpenAPI_allowed_nssai_t *OpenAPI_allowed_nssai_create( OpenAPI_access_type_e access_type ) { - OpenAPI_allowed_nssai_t *allowed_nssai_local_var = OpenAPI_malloc(sizeof(OpenAPI_allowed_nssai_t)); - if (!allowed_nssai_local_var) { - return NULL; - } + OpenAPI_allowed_nssai_t *allowed_nssai_local_var = ogs_malloc(sizeof(OpenAPI_allowed_nssai_t)); + ogs_assert(allowed_nssai_local_var); + allowed_nssai_local_var->allowed_snssai_list = allowed_snssai_list; allowed_nssai_local_var->access_type = access_type; diff --git a/lib/sbi/openapi/model/allowed_snssai.c b/lib/sbi/openapi/model/allowed_snssai.c index 8713164fa..5146814ec 100644 --- a/lib/sbi/openapi/model/allowed_snssai.c +++ b/lib/sbi/openapi/model/allowed_snssai.c @@ -10,10 +10,9 @@ OpenAPI_allowed_snssai_t *OpenAPI_allowed_snssai_create( OpenAPI_snssai_t *mapped_home_snssai ) { - OpenAPI_allowed_snssai_t *allowed_snssai_local_var = OpenAPI_malloc(sizeof(OpenAPI_allowed_snssai_t)); - if (!allowed_snssai_local_var) { - return NULL; - } + OpenAPI_allowed_snssai_t *allowed_snssai_local_var = ogs_malloc(sizeof(OpenAPI_allowed_snssai_t)); + ogs_assert(allowed_snssai_local_var); + allowed_snssai_local_var->allowed_snssai = allowed_snssai; allowed_snssai_local_var->nsi_information_list = nsi_information_list; allowed_snssai_local_var->mapped_home_snssai = mapped_home_snssai; diff --git a/lib/sbi/openapi/model/alternative_qos_profile.c b/lib/sbi/openapi/model/alternative_qos_profile.c index 0097bf576..6739c0e16 100644 --- a/lib/sbi/openapi/model/alternative_qos_profile.c +++ b/lib/sbi/openapi/model/alternative_qos_profile.c @@ -13,10 +13,9 @@ OpenAPI_alternative_qos_profile_t *OpenAPI_alternative_qos_profile_create( char *packet_err_rate ) { - OpenAPI_alternative_qos_profile_t *alternative_qos_profile_local_var = OpenAPI_malloc(sizeof(OpenAPI_alternative_qos_profile_t)); - if (!alternative_qos_profile_local_var) { - return NULL; - } + OpenAPI_alternative_qos_profile_t *alternative_qos_profile_local_var = ogs_malloc(sizeof(OpenAPI_alternative_qos_profile_t)); + ogs_assert(alternative_qos_profile_local_var); + alternative_qos_profile_local_var->index = index; alternative_qos_profile_local_var->gua_fbr_dl = gua_fbr_dl; alternative_qos_profile_local_var->gua_fbr_ul = gua_fbr_ul; @@ -139,11 +138,11 @@ OpenAPI_alternative_qos_profile_t *OpenAPI_alternative_qos_profile_parseFromJSON alternative_qos_profile_local_var = OpenAPI_alternative_qos_profile_create ( index->valuedouble, - gua_fbr_dl ? ogs_strdup_or_assert(gua_fbr_dl->valuestring) : NULL, - gua_fbr_ul ? ogs_strdup_or_assert(gua_fbr_ul->valuestring) : NULL, + gua_fbr_dl ? ogs_strdup(gua_fbr_dl->valuestring) : NULL, + gua_fbr_ul ? ogs_strdup(gua_fbr_ul->valuestring) : NULL, packet_delay_budget ? true : false, packet_delay_budget ? packet_delay_budget->valuedouble : 0, - packet_err_rate ? ogs_strdup_or_assert(packet_err_rate->valuestring) : NULL + packet_err_rate ? ogs_strdup(packet_err_rate->valuestring) : NULL ); return alternative_qos_profile_local_var; diff --git a/lib/sbi/openapi/model/am_policy_data.c b/lib/sbi/openapi/model/am_policy_data.c index 8643a3b35..033ab979d 100644 --- a/lib/sbi/openapi/model/am_policy_data.c +++ b/lib/sbi/openapi/model/am_policy_data.c @@ -9,10 +9,9 @@ OpenAPI_am_policy_data_t *OpenAPI_am_policy_data_create( OpenAPI_list_t *subsc_cats ) { - OpenAPI_am_policy_data_t *am_policy_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_am_policy_data_t)); - if (!am_policy_data_local_var) { - return NULL; - } + OpenAPI_am_policy_data_t *am_policy_data_local_var = ogs_malloc(sizeof(OpenAPI_am_policy_data_t)); + ogs_assert(am_policy_data_local_var); + am_policy_data_local_var->pra_infos = pra_infos; am_policy_data_local_var->subsc_cats = subsc_cats; @@ -27,6 +26,7 @@ void OpenAPI_am_policy_data_free(OpenAPI_am_policy_data_t *am_policy_data) OpenAPI_lnode_t *node; OpenAPI_list_for_each(am_policy_data->pra_infos, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_presence_info_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -109,9 +109,9 @@ OpenAPI_am_policy_data_t *OpenAPI_am_policy_data_parseFromJSON(cJSON *am_policy_ cJSON *localMapObject = pra_infos_local_map; if (cJSON_IsObject(pra_infos_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_presence_info_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_presence_info_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(pra_infos_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_am_policy_data_parseFromJSON() failed [pra_infos]"); goto end; @@ -136,7 +136,7 @@ OpenAPI_am_policy_data_t *OpenAPI_am_policy_data_parseFromJSON(cJSON *am_policy_ ogs_error("OpenAPI_am_policy_data_parseFromJSON() failed [subsc_cats]"); goto end; } - OpenAPI_list_add(subsc_catsList , ogs_strdup_or_assert(subsc_cats_local->valuestring)); + OpenAPI_list_add(subsc_catsList , ogs_strdup(subsc_cats_local->valuestring)); } } diff --git a/lib/sbi/openapi/model/ambr.c b/lib/sbi/openapi/model/ambr.c index 7a40dc058..b4f3812cb 100644 --- a/lib/sbi/openapi/model/ambr.c +++ b/lib/sbi/openapi/model/ambr.c @@ -9,10 +9,9 @@ OpenAPI_ambr_t *OpenAPI_ambr_create( char *downlink ) { - OpenAPI_ambr_t *ambr_local_var = OpenAPI_malloc(sizeof(OpenAPI_ambr_t)); - if (!ambr_local_var) { - return NULL; - } + OpenAPI_ambr_t *ambr_local_var = ogs_malloc(sizeof(OpenAPI_ambr_t)); + ogs_assert(ambr_local_var); + ambr_local_var->uplink = uplink; ambr_local_var->downlink = downlink; @@ -80,8 +79,8 @@ OpenAPI_ambr_t *OpenAPI_ambr_parseFromJSON(cJSON *ambrJSON) } ambr_local_var = OpenAPI_ambr_create ( - ogs_strdup_or_assert(uplink->valuestring), - ogs_strdup_or_assert(downlink->valuestring) + ogs_strdup(uplink->valuestring), + ogs_strdup(downlink->valuestring) ); return ambr_local_var; diff --git a/lib/sbi/openapi/model/ambr_1.c b/lib/sbi/openapi/model/ambr_1.c index c5dec4f6e..fa2b32993 100644 --- a/lib/sbi/openapi/model/ambr_1.c +++ b/lib/sbi/openapi/model/ambr_1.c @@ -9,10 +9,9 @@ OpenAPI_ambr_1_t *OpenAPI_ambr_1_create( char *downlink ) { - OpenAPI_ambr_1_t *ambr_1_local_var = OpenAPI_malloc(sizeof(OpenAPI_ambr_1_t)); - if (!ambr_1_local_var) { - return NULL; - } + OpenAPI_ambr_1_t *ambr_1_local_var = ogs_malloc(sizeof(OpenAPI_ambr_1_t)); + ogs_assert(ambr_1_local_var); + ambr_1_local_var->uplink = uplink; ambr_1_local_var->downlink = downlink; @@ -80,8 +79,8 @@ OpenAPI_ambr_1_t *OpenAPI_ambr_1_parseFromJSON(cJSON *ambr_1JSON) } ambr_1_local_var = OpenAPI_ambr_1_create ( - ogs_strdup_or_assert(uplink->valuestring), - ogs_strdup_or_assert(downlink->valuestring) + ogs_strdup(uplink->valuestring), + ogs_strdup(downlink->valuestring) ); return ambr_1_local_var; diff --git a/lib/sbi/openapi/model/ambr_rm.c b/lib/sbi/openapi/model/ambr_rm.c index 154c100d9..366f59cb6 100644 --- a/lib/sbi/openapi/model/ambr_rm.c +++ b/lib/sbi/openapi/model/ambr_rm.c @@ -9,10 +9,9 @@ OpenAPI_ambr_rm_t *OpenAPI_ambr_rm_create( char *downlink ) { - OpenAPI_ambr_rm_t *ambr_rm_local_var = OpenAPI_malloc(sizeof(OpenAPI_ambr_rm_t)); - if (!ambr_rm_local_var) { - return NULL; - } + OpenAPI_ambr_rm_t *ambr_rm_local_var = ogs_malloc(sizeof(OpenAPI_ambr_rm_t)); + ogs_assert(ambr_rm_local_var); + ambr_rm_local_var->uplink = uplink; ambr_rm_local_var->downlink = downlink; @@ -80,8 +79,8 @@ OpenAPI_ambr_rm_t *OpenAPI_ambr_rm_parseFromJSON(cJSON *ambr_rmJSON) } ambr_rm_local_var = OpenAPI_ambr_rm_create ( - ogs_strdup_or_assert(uplink->valuestring), - ogs_strdup_or_assert(downlink->valuestring) + ogs_strdup(uplink->valuestring), + ogs_strdup(downlink->valuestring) ); return ambr_rm_local_var; diff --git a/lib/sbi/openapi/model/amf3_gpp_access_registration.c b/lib/sbi/openapi/model/amf3_gpp_access_registration.c index cf88c744e..07dd8bb79 100644 --- a/lib/sbi/openapi/model/amf3_gpp_access_registration.c +++ b/lib/sbi/openapi/model/amf3_gpp_access_registration.c @@ -36,10 +36,9 @@ OpenAPI_amf3_gpp_access_registration_t *OpenAPI_amf3_gpp_access_registration_cre char *supi ) { - OpenAPI_amf3_gpp_access_registration_t *amf3_gpp_access_registration_local_var = OpenAPI_malloc(sizeof(OpenAPI_amf3_gpp_access_registration_t)); - if (!amf3_gpp_access_registration_local_var) { - return NULL; - } + OpenAPI_amf3_gpp_access_registration_t *amf3_gpp_access_registration_local_var = ogs_malloc(sizeof(OpenAPI_amf3_gpp_access_registration_t)); + ogs_assert(amf3_gpp_access_registration_local_var); + amf3_gpp_access_registration_local_var->amf_instance_id = amf_instance_id; amf3_gpp_access_registration_local_var->supported_features = supported_features; amf3_gpp_access_registration_local_var->is_purge_flag = is_purge_flag; @@ -533,16 +532,16 @@ OpenAPI_amf3_gpp_access_registration_t *OpenAPI_amf3_gpp_access_registration_par } amf3_gpp_access_registration_local_var = OpenAPI_amf3_gpp_access_registration_create ( - ogs_strdup_or_assert(amf_instance_id->valuestring), - supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, + ogs_strdup(amf_instance_id->valuestring), + supported_features ? ogs_strdup(supported_features->valuestring) : NULL, purge_flag ? true : false, purge_flag ? purge_flag->valueint : 0, - pei ? ogs_strdup_or_assert(pei->valuestring) : NULL, + pei ? ogs_strdup(pei->valuestring) : NULL, ims_vo_ps ? ims_vo_psVariable : 0, - ogs_strdup_or_assert(dereg_callback_uri->valuestring), - amf_service_name_dereg ? ogs_strdup_or_assert(amf_service_name_dereg->valuestring) : NULL, - pcscf_restoration_callback_uri ? ogs_strdup_or_assert(pcscf_restoration_callback_uri->valuestring) : NULL, - amf_service_name_pcscf_rest ? ogs_strdup_or_assert(amf_service_name_pcscf_rest->valuestring) : NULL, + ogs_strdup(dereg_callback_uri->valuestring), + amf_service_name_dereg ? ogs_strdup(amf_service_name_dereg->valuestring) : NULL, + pcscf_restoration_callback_uri ? ogs_strdup(pcscf_restoration_callback_uri->valuestring) : NULL, + amf_service_name_pcscf_rest ? ogs_strdup(amf_service_name_pcscf_rest->valuestring) : NULL, initial_registration_ind ? true : false, initial_registration_ind ? initial_registration_ind->valueint : 0, guami_local_nonprim, @@ -552,16 +551,16 @@ OpenAPI_amf3_gpp_access_registration_t *OpenAPI_amf3_gpp_access_registration_par rat_typeVariable, urrp_indicator ? true : false, urrp_indicator ? urrp_indicator->valueint : 0, - amf_ee_subscription_id ? ogs_strdup_or_assert(amf_ee_subscription_id->valuestring) : NULL, + amf_ee_subscription_id ? ogs_strdup(amf_ee_subscription_id->valuestring) : NULL, eps_interworking_info ? eps_interworking_info_local_nonprim : NULL, ue_srvcc_capability ? true : false, ue_srvcc_capability ? ue_srvcc_capability->valueint : 0, - registration_time ? ogs_strdup_or_assert(registration_time->valuestring) : NULL, + registration_time ? ogs_strdup(registration_time->valuestring) : NULL, vgmlc_address ? vgmlc_address_local_nonprim : NULL, context_info ? context_info_local_nonprim : NULL, no_ee_subscription_ind ? true : false, no_ee_subscription_ind ? no_ee_subscription_ind->valueint : 0, - supi ? ogs_strdup_or_assert(supi->valuestring) : NULL + supi ? ogs_strdup(supi->valuestring) : NULL ); return amf3_gpp_access_registration_local_var; diff --git a/lib/sbi/openapi/model/amf3_gpp_access_registration_modification.c b/lib/sbi/openapi/model/amf3_gpp_access_registration_modification.c index b73857cd8..97bcfd5e6 100644 --- a/lib/sbi/openapi/model/amf3_gpp_access_registration_modification.c +++ b/lib/sbi/openapi/model/amf3_gpp_access_registration_modification.c @@ -16,10 +16,9 @@ OpenAPI_amf3_gpp_access_registration_modification_t *OpenAPI_amf3_gpp_access_reg int ue_srvcc_capability ) { - OpenAPI_amf3_gpp_access_registration_modification_t *amf3_gpp_access_registration_modification_local_var = OpenAPI_malloc(sizeof(OpenAPI_amf3_gpp_access_registration_modification_t)); - if (!amf3_gpp_access_registration_modification_local_var) { - return NULL; - } + OpenAPI_amf3_gpp_access_registration_modification_t *amf3_gpp_access_registration_modification_local_var = ogs_malloc(sizeof(OpenAPI_amf3_gpp_access_registration_modification_t)); + ogs_assert(amf3_gpp_access_registration_modification_local_var); + amf3_gpp_access_registration_modification_local_var->guami = guami; amf3_gpp_access_registration_modification_local_var->is_purge_flag = is_purge_flag; amf3_gpp_access_registration_modification_local_var->purge_flag = purge_flag; @@ -219,7 +218,7 @@ OpenAPI_amf3_gpp_access_registration_modification_t *OpenAPI_amf3_gpp_access_reg guami_local_nonprim, purge_flag ? true : false, purge_flag ? purge_flag->valueint : 0, - pei ? ogs_strdup_or_assert(pei->valuestring) : NULL, + pei ? ogs_strdup(pei->valuestring) : NULL, ims_vo_ps ? ims_vo_psVariable : 0, backup_amf_info ? backup_amf_infoList : NULL, eps_interworking_info ? eps_interworking_info_local_nonprim : NULL, diff --git a/lib/sbi/openapi/model/amf_cond.c b/lib/sbi/openapi/model/amf_cond.c index d47489eb5..446e7e594 100644 --- a/lib/sbi/openapi/model/amf_cond.c +++ b/lib/sbi/openapi/model/amf_cond.c @@ -9,10 +9,9 @@ OpenAPI_amf_cond_t *OpenAPI_amf_cond_create( char *amf_region_id ) { - OpenAPI_amf_cond_t *amf_cond_local_var = OpenAPI_malloc(sizeof(OpenAPI_amf_cond_t)); - if (!amf_cond_local_var) { - return NULL; - } + OpenAPI_amf_cond_t *amf_cond_local_var = ogs_malloc(sizeof(OpenAPI_amf_cond_t)); + ogs_assert(amf_cond_local_var); + amf_cond_local_var->amf_set_id = amf_set_id; amf_cond_local_var->amf_region_id = amf_region_id; @@ -80,8 +79,8 @@ OpenAPI_amf_cond_t *OpenAPI_amf_cond_parseFromJSON(cJSON *amf_condJSON) } amf_cond_local_var = OpenAPI_amf_cond_create ( - amf_set_id ? ogs_strdup_or_assert(amf_set_id->valuestring) : NULL, - amf_region_id ? ogs_strdup_or_assert(amf_region_id->valuestring) : NULL + amf_set_id ? ogs_strdup(amf_set_id->valuestring) : NULL, + amf_region_id ? ogs_strdup(amf_region_id->valuestring) : NULL ); return amf_cond_local_var; diff --git a/lib/sbi/openapi/model/amf_dereg_info.c b/lib/sbi/openapi/model/amf_dereg_info.c index 8d5a61c1a..2ce1c94d0 100644 --- a/lib/sbi/openapi/model/amf_dereg_info.c +++ b/lib/sbi/openapi/model/amf_dereg_info.c @@ -8,10 +8,9 @@ OpenAPI_amf_dereg_info_t *OpenAPI_amf_dereg_info_create( OpenAPI_deregistration_reason_e dereg_reason ) { - OpenAPI_amf_dereg_info_t *amf_dereg_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_amf_dereg_info_t)); - if (!amf_dereg_info_local_var) { - return NULL; - } + OpenAPI_amf_dereg_info_t *amf_dereg_info_local_var = ogs_malloc(sizeof(OpenAPI_amf_dereg_info_t)); + ogs_assert(amf_dereg_info_local_var); + amf_dereg_info_local_var->dereg_reason = dereg_reason; return amf_dereg_info_local_var; diff --git a/lib/sbi/openapi/model/amf_event.c b/lib/sbi/openapi/model/amf_event.c index 696176f03..0a4429c34 100644 --- a/lib/sbi/openapi/model/amf_event.c +++ b/lib/sbi/openapi/model/amf_event.c @@ -22,10 +22,9 @@ OpenAPI_amf_event_t *OpenAPI_amf_event_create( int max_response_time ) { - OpenAPI_amf_event_t *amf_event_local_var = OpenAPI_malloc(sizeof(OpenAPI_amf_event_t)); - if (!amf_event_local_var) { - return NULL; - } + OpenAPI_amf_event_t *amf_event_local_var = ogs_malloc(sizeof(OpenAPI_amf_event_t)); + ogs_assert(amf_event_local_var); + amf_event_local_var->type = type; amf_event_local_var->is_immediate_flag = is_immediate_flag; amf_event_local_var->immediate_flag = immediate_flag; diff --git a/lib/sbi/openapi/model/amf_event_area.c b/lib/sbi/openapi/model/amf_event_area.c index 8a7d655e5..f6d920e6b 100644 --- a/lib/sbi/openapi/model/amf_event_area.c +++ b/lib/sbi/openapi/model/amf_event_area.c @@ -11,10 +11,9 @@ OpenAPI_amf_event_area_t *OpenAPI_amf_event_area_create( char *nsi_id ) { - OpenAPI_amf_event_area_t *amf_event_area_local_var = OpenAPI_malloc(sizeof(OpenAPI_amf_event_area_t)); - if (!amf_event_area_local_var) { - return NULL; - } + OpenAPI_amf_event_area_t *amf_event_area_local_var = ogs_malloc(sizeof(OpenAPI_amf_event_area_t)); + ogs_assert(amf_event_area_local_var); + amf_event_area_local_var->presence_info = presence_info; amf_event_area_local_var->ladn_info = ladn_info; amf_event_area_local_var->s_nssai = s_nssai; @@ -133,7 +132,7 @@ OpenAPI_amf_event_area_t *OpenAPI_amf_event_area_parseFromJSON(cJSON *amf_event_ presence_info ? presence_info_local_nonprim : NULL, ladn_info ? ladn_info_local_nonprim : NULL, s_nssai ? s_nssai_local_nonprim : NULL, - nsi_id ? ogs_strdup_or_assert(nsi_id->valuestring) : NULL + nsi_id ? ogs_strdup(nsi_id->valuestring) : NULL ); return amf_event_area_local_var; diff --git a/lib/sbi/openapi/model/amf_event_mode.c b/lib/sbi/openapi/model/amf_event_mode.c index af83cfbcd..82877de62 100644 --- a/lib/sbi/openapi/model/amf_event_mode.c +++ b/lib/sbi/openapi/model/amf_event_mode.c @@ -15,10 +15,9 @@ OpenAPI_amf_event_mode_t *OpenAPI_amf_event_mode_create( int samp_ratio ) { - OpenAPI_amf_event_mode_t *amf_event_mode_local_var = OpenAPI_malloc(sizeof(OpenAPI_amf_event_mode_t)); - if (!amf_event_mode_local_var) { - return NULL; - } + OpenAPI_amf_event_mode_t *amf_event_mode_local_var = ogs_malloc(sizeof(OpenAPI_amf_event_mode_t)); + ogs_assert(amf_event_mode_local_var); + amf_event_mode_local_var->trigger = trigger; amf_event_mode_local_var->is_max_reports = is_max_reports; amf_event_mode_local_var->max_reports = max_reports; @@ -147,7 +146,7 @@ OpenAPI_amf_event_mode_t *OpenAPI_amf_event_mode_parseFromJSON(cJSON *amf_event_ trigger_local_nonprim, max_reports ? true : false, max_reports ? max_reports->valuedouble : 0, - expiry ? ogs_strdup_or_assert(expiry->valuestring) : NULL, + expiry ? ogs_strdup(expiry->valuestring) : NULL, rep_period ? true : false, rep_period ? rep_period->valuedouble : 0, samp_ratio ? true : false, diff --git a/lib/sbi/openapi/model/amf_event_subscription.c b/lib/sbi/openapi/model/amf_event_subscription.c index 882e9a7c7..5b1c007dc 100644 --- a/lib/sbi/openapi/model/amf_event_subscription.c +++ b/lib/sbi/openapi/model/amf_event_subscription.c @@ -21,10 +21,9 @@ OpenAPI_amf_event_subscription_t *OpenAPI_amf_event_subscription_create( OpenAPI_nf_type_e source_nf_type ) { - OpenAPI_amf_event_subscription_t *amf_event_subscription_local_var = OpenAPI_malloc(sizeof(OpenAPI_amf_event_subscription_t)); - if (!amf_event_subscription_local_var) { - return NULL; - } + OpenAPI_amf_event_subscription_t *amf_event_subscription_local_var = ogs_malloc(sizeof(OpenAPI_amf_event_subscription_t)); + ogs_assert(amf_event_subscription_local_var); + amf_event_subscription_local_var->event_list = event_list; amf_event_subscription_local_var->event_notify_uri = event_notify_uri; amf_event_subscription_local_var->notify_correlation_id = notify_correlation_id; @@ -326,15 +325,15 @@ OpenAPI_amf_event_subscription_t *OpenAPI_amf_event_subscription_parseFromJSON(c amf_event_subscription_local_var = OpenAPI_amf_event_subscription_create ( event_listList, - ogs_strdup_or_assert(event_notify_uri->valuestring), - ogs_strdup_or_assert(notify_correlation_id->valuestring), - ogs_strdup_or_assert(nf_id->valuestring), - subs_change_notify_uri ? ogs_strdup_or_assert(subs_change_notify_uri->valuestring) : NULL, - subs_change_notify_correlation_id ? ogs_strdup_or_assert(subs_change_notify_correlation_id->valuestring) : NULL, - supi ? ogs_strdup_or_assert(supi->valuestring) : NULL, - group_id ? ogs_strdup_or_assert(group_id->valuestring) : NULL, - gpsi ? ogs_strdup_or_assert(gpsi->valuestring) : NULL, - pei ? ogs_strdup_or_assert(pei->valuestring) : NULL, + ogs_strdup(event_notify_uri->valuestring), + ogs_strdup(notify_correlation_id->valuestring), + ogs_strdup(nf_id->valuestring), + subs_change_notify_uri ? ogs_strdup(subs_change_notify_uri->valuestring) : NULL, + subs_change_notify_correlation_id ? ogs_strdup(subs_change_notify_correlation_id->valuestring) : NULL, + supi ? ogs_strdup(supi->valuestring) : NULL, + group_id ? ogs_strdup(group_id->valuestring) : NULL, + gpsi ? ogs_strdup(gpsi->valuestring) : NULL, + pei ? ogs_strdup(pei->valuestring) : NULL, any_ue ? true : false, any_ue ? any_ue->valueint : 0, options ? options_local_nonprim : NULL, diff --git a/lib/sbi/openapi/model/amf_event_subscription_add_info.c b/lib/sbi/openapi/model/amf_event_subscription_add_info.c index 48e470973..d7f451e34 100644 --- a/lib/sbi/openapi/model/amf_event_subscription_add_info.c +++ b/lib/sbi/openapi/model/amf_event_subscription_add_info.c @@ -9,10 +9,9 @@ OpenAPI_amf_event_subscription_add_info_t *OpenAPI_amf_event_subscription_add_in OpenAPI_nf_type_e subscribing_nf_type ) { - OpenAPI_amf_event_subscription_add_info_t *amf_event_subscription_add_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_amf_event_subscription_add_info_t)); - if (!amf_event_subscription_add_info_local_var) { - return NULL; - } + OpenAPI_amf_event_subscription_add_info_t *amf_event_subscription_add_info_local_var = ogs_malloc(sizeof(OpenAPI_amf_event_subscription_add_info_t)); + ogs_assert(amf_event_subscription_add_info_local_var); + amf_event_subscription_add_info_local_var->binding_info = binding_info; amf_event_subscription_add_info_local_var->subscribing_nf_type = subscribing_nf_type; @@ -88,7 +87,7 @@ OpenAPI_amf_event_subscription_add_info_t *OpenAPI_amf_event_subscription_add_in ogs_error("OpenAPI_amf_event_subscription_add_info_parseFromJSON() failed [binding_info]"); goto end; } - OpenAPI_list_add(binding_infoList , ogs_strdup_or_assert(binding_info_local->valuestring)); + OpenAPI_list_add(binding_infoList , ogs_strdup(binding_info_local->valuestring)); } } diff --git a/lib/sbi/openapi/model/amf_event_trigger.c b/lib/sbi/openapi/model/amf_event_trigger.c index 13a45e63b..d6030181e 100644 --- a/lib/sbi/openapi/model/amf_event_trigger.c +++ b/lib/sbi/openapi/model/amf_event_trigger.c @@ -7,10 +7,9 @@ OpenAPI_amf_event_trigger_t *OpenAPI_amf_event_trigger_create( ) { - OpenAPI_amf_event_trigger_t *amf_event_trigger_local_var = OpenAPI_malloc(sizeof(OpenAPI_amf_event_trigger_t)); - if (!amf_event_trigger_local_var) { - return NULL; - } + OpenAPI_amf_event_trigger_t *amf_event_trigger_local_var = ogs_malloc(sizeof(OpenAPI_amf_event_trigger_t)); + ogs_assert(amf_event_trigger_local_var); + return amf_event_trigger_local_var; } diff --git a/lib/sbi/openapi/model/amf_event_type.c b/lib/sbi/openapi/model/amf_event_type.c index 5f3d10282..3c6e0b39a 100644 --- a/lib/sbi/openapi/model/amf_event_type.c +++ b/lib/sbi/openapi/model/amf_event_type.c @@ -7,10 +7,9 @@ OpenAPI_amf_event_type_t *OpenAPI_amf_event_type_create( ) { - OpenAPI_amf_event_type_t *amf_event_type_local_var = OpenAPI_malloc(sizeof(OpenAPI_amf_event_type_t)); - if (!amf_event_type_local_var) { - return NULL; - } + OpenAPI_amf_event_type_t *amf_event_type_local_var = ogs_malloc(sizeof(OpenAPI_amf_event_type_t)); + ogs_assert(amf_event_type_local_var); + return amf_event_type_local_var; } diff --git a/lib/sbi/openapi/model/amf_info.c b/lib/sbi/openapi/model/amf_info.c index eb991aefb..9e30c99e1 100644 --- a/lib/sbi/openapi/model/amf_info.c +++ b/lib/sbi/openapi/model/amf_info.c @@ -15,10 +15,9 @@ OpenAPI_amf_info_t *OpenAPI_amf_info_create( OpenAPI_n2_interface_amf_info_t *n2_interface_amf_info ) { - OpenAPI_amf_info_t *amf_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_amf_info_t)); - if (!amf_info_local_var) { - return NULL; - } + OpenAPI_amf_info_t *amf_info_local_var = ogs_malloc(sizeof(OpenAPI_amf_info_t)); + ogs_assert(amf_info_local_var); + amf_info_local_var->amf_set_id = amf_set_id; amf_info_local_var->amf_region_id = amf_region_id; amf_info_local_var->guami_list = guami_list; @@ -348,8 +347,8 @@ OpenAPI_amf_info_t *OpenAPI_amf_info_parseFromJSON(cJSON *amf_infoJSON) } amf_info_local_var = OpenAPI_amf_info_create ( - ogs_strdup_or_assert(amf_set_id->valuestring), - ogs_strdup_or_assert(amf_region_id->valuestring), + ogs_strdup(amf_set_id->valuestring), + ogs_strdup(amf_region_id->valuestring), guami_listList, tai_list ? tai_listList : NULL, tai_range_list ? tai_range_listList : NULL, diff --git a/lib/sbi/openapi/model/amf_non3_gpp_access_registration.c b/lib/sbi/openapi/model/amf_non3_gpp_access_registration.c index 531ae8f95..f8b2e32d2 100644 --- a/lib/sbi/openapi/model/amf_non3_gpp_access_registration.c +++ b/lib/sbi/openapi/model/amf_non3_gpp_access_registration.c @@ -29,10 +29,9 @@ OpenAPI_amf_non3_gpp_access_registration_t *OpenAPI_amf_non3_gpp_access_registra char *supi ) { - OpenAPI_amf_non3_gpp_access_registration_t *amf_non3_gpp_access_registration_local_var = OpenAPI_malloc(sizeof(OpenAPI_amf_non3_gpp_access_registration_t)); - if (!amf_non3_gpp_access_registration_local_var) { - return NULL; - } + OpenAPI_amf_non3_gpp_access_registration_t *amf_non3_gpp_access_registration_local_var = ogs_malloc(sizeof(OpenAPI_amf_non3_gpp_access_registration_t)); + ogs_assert(amf_non3_gpp_access_registration_local_var); + amf_non3_gpp_access_registration_local_var->amf_instance_id = amf_instance_id; amf_non3_gpp_access_registration_local_var->supported_features = supported_features; amf_non3_gpp_access_registration_local_var->is_purge_flag = is_purge_flag; @@ -450,28 +449,28 @@ OpenAPI_amf_non3_gpp_access_registration_t *OpenAPI_amf_non3_gpp_access_registra } amf_non3_gpp_access_registration_local_var = OpenAPI_amf_non3_gpp_access_registration_create ( - ogs_strdup_or_assert(amf_instance_id->valuestring), - supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, + ogs_strdup(amf_instance_id->valuestring), + supported_features ? ogs_strdup(supported_features->valuestring) : NULL, purge_flag ? true : false, purge_flag ? purge_flag->valueint : 0, - pei ? ogs_strdup_or_assert(pei->valuestring) : NULL, + pei ? ogs_strdup(pei->valuestring) : NULL, ims_vo_psVariable, - ogs_strdup_or_assert(dereg_callback_uri->valuestring), - amf_service_name_dereg ? ogs_strdup_or_assert(amf_service_name_dereg->valuestring) : NULL, - pcscf_restoration_callback_uri ? ogs_strdup_or_assert(pcscf_restoration_callback_uri->valuestring) : NULL, - amf_service_name_pcscf_rest ? ogs_strdup_or_assert(amf_service_name_pcscf_rest->valuestring) : NULL, + ogs_strdup(dereg_callback_uri->valuestring), + amf_service_name_dereg ? ogs_strdup(amf_service_name_dereg->valuestring) : NULL, + pcscf_restoration_callback_uri ? ogs_strdup(pcscf_restoration_callback_uri->valuestring) : NULL, + amf_service_name_pcscf_rest ? ogs_strdup(amf_service_name_pcscf_rest->valuestring) : NULL, guami_local_nonprim, backup_amf_info ? backup_amf_infoList : NULL, rat_typeVariable, urrp_indicator ? true : false, urrp_indicator ? urrp_indicator->valueint : 0, - amf_ee_subscription_id ? ogs_strdup_or_assert(amf_ee_subscription_id->valuestring) : NULL, - registration_time ? ogs_strdup_or_assert(registration_time->valuestring) : NULL, + amf_ee_subscription_id ? ogs_strdup(amf_ee_subscription_id->valuestring) : NULL, + registration_time ? ogs_strdup(registration_time->valuestring) : NULL, vgmlc_address ? vgmlc_address_local_nonprim : NULL, context_info ? context_info_local_nonprim : NULL, no_ee_subscription_ind ? true : false, no_ee_subscription_ind ? no_ee_subscription_ind->valueint : 0, - supi ? ogs_strdup_or_assert(supi->valuestring) : NULL + supi ? ogs_strdup(supi->valuestring) : NULL ); return amf_non3_gpp_access_registration_local_var; diff --git a/lib/sbi/openapi/model/amf_non3_gpp_access_registration_modification.c b/lib/sbi/openapi/model/amf_non3_gpp_access_registration_modification.c index b5c382974..aca6347f7 100644 --- a/lib/sbi/openapi/model/amf_non3_gpp_access_registration_modification.c +++ b/lib/sbi/openapi/model/amf_non3_gpp_access_registration_modification.c @@ -13,10 +13,9 @@ OpenAPI_amf_non3_gpp_access_registration_modification_t *OpenAPI_amf_non3_gpp_ac OpenAPI_list_t *backup_amf_info ) { - OpenAPI_amf_non3_gpp_access_registration_modification_t *amf_non3_gpp_access_registration_modification_local_var = OpenAPI_malloc(sizeof(OpenAPI_amf_non3_gpp_access_registration_modification_t)); - if (!amf_non3_gpp_access_registration_modification_local_var) { - return NULL; - } + OpenAPI_amf_non3_gpp_access_registration_modification_t *amf_non3_gpp_access_registration_modification_local_var = ogs_malloc(sizeof(OpenAPI_amf_non3_gpp_access_registration_modification_t)); + ogs_assert(amf_non3_gpp_access_registration_modification_local_var); + amf_non3_gpp_access_registration_modification_local_var->guami = guami; amf_non3_gpp_access_registration_modification_local_var->is_purge_flag = is_purge_flag; amf_non3_gpp_access_registration_modification_local_var->purge_flag = purge_flag; @@ -176,7 +175,7 @@ OpenAPI_amf_non3_gpp_access_registration_modification_t *OpenAPI_amf_non3_gpp_ac guami_local_nonprim, purge_flag ? true : false, purge_flag ? purge_flag->valueint : 0, - pei ? ogs_strdup_or_assert(pei->valuestring) : NULL, + pei ? ogs_strdup(pei->valuestring) : NULL, ims_vo_ps ? ims_vo_psVariable : 0, backup_amf_info ? backup_amf_infoList : NULL ); diff --git a/lib/sbi/openapi/model/amf_status_change_notification.c b/lib/sbi/openapi/model/amf_status_change_notification.c index c0cf00331..b003ce9cf 100644 --- a/lib/sbi/openapi/model/amf_status_change_notification.c +++ b/lib/sbi/openapi/model/amf_status_change_notification.c @@ -8,10 +8,9 @@ OpenAPI_amf_status_change_notification_t *OpenAPI_amf_status_change_notification OpenAPI_list_t *amf_status_info_list ) { - OpenAPI_amf_status_change_notification_t *amf_status_change_notification_local_var = OpenAPI_malloc(sizeof(OpenAPI_amf_status_change_notification_t)); - if (!amf_status_change_notification_local_var) { - return NULL; - } + OpenAPI_amf_status_change_notification_t *amf_status_change_notification_local_var = ogs_malloc(sizeof(OpenAPI_amf_status_change_notification_t)); + ogs_assert(amf_status_change_notification_local_var); + amf_status_change_notification_local_var->amf_status_info_list = amf_status_info_list; return amf_status_change_notification_local_var; diff --git a/lib/sbi/openapi/model/amf_status_change_subscription_data.c b/lib/sbi/openapi/model/amf_status_change_subscription_data.c index 607e826d7..e49528ced 100644 --- a/lib/sbi/openapi/model/amf_status_change_subscription_data.c +++ b/lib/sbi/openapi/model/amf_status_change_subscription_data.c @@ -9,10 +9,9 @@ OpenAPI_amf_status_change_subscription_data_t *OpenAPI_amf_status_change_subscri OpenAPI_list_t *guami_list ) { - OpenAPI_amf_status_change_subscription_data_t *amf_status_change_subscription_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_amf_status_change_subscription_data_t)); - if (!amf_status_change_subscription_data_local_var) { - return NULL; - } + OpenAPI_amf_status_change_subscription_data_t *amf_status_change_subscription_data_local_var = ogs_malloc(sizeof(OpenAPI_amf_status_change_subscription_data_t)); + ogs_assert(amf_status_change_subscription_data_local_var); + amf_status_change_subscription_data_local_var->amf_status_uri = amf_status_uri; amf_status_change_subscription_data_local_var->guami_list = guami_list; @@ -110,7 +109,7 @@ OpenAPI_amf_status_change_subscription_data_t *OpenAPI_amf_status_change_subscri } amf_status_change_subscription_data_local_var = OpenAPI_amf_status_change_subscription_data_create ( - ogs_strdup_or_assert(amf_status_uri->valuestring), + ogs_strdup(amf_status_uri->valuestring), guami_list ? guami_listList : NULL ); diff --git a/lib/sbi/openapi/model/amf_status_info.c b/lib/sbi/openapi/model/amf_status_info.c index 6405b9cfe..670eab977 100644 --- a/lib/sbi/openapi/model/amf_status_info.c +++ b/lib/sbi/openapi/model/amf_status_info.c @@ -11,10 +11,9 @@ OpenAPI_amf_status_info_t *OpenAPI_amf_status_info_create( char *target_amf_failure ) { - OpenAPI_amf_status_info_t *amf_status_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_amf_status_info_t)); - if (!amf_status_info_local_var) { - return NULL; - } + OpenAPI_amf_status_info_t *amf_status_info_local_var = ogs_malloc(sizeof(OpenAPI_amf_status_info_t)); + ogs_assert(amf_status_info_local_var); + amf_status_info_local_var->guami_list = guami_list; amf_status_info_local_var->status_change = status_change; amf_status_info_local_var->target_amf_removal = target_amf_removal; @@ -151,8 +150,8 @@ OpenAPI_amf_status_info_t *OpenAPI_amf_status_info_parseFromJSON(cJSON *amf_stat amf_status_info_local_var = OpenAPI_amf_status_info_create ( guami_listList, status_changeVariable, - target_amf_removal ? ogs_strdup_or_assert(target_amf_removal->valuestring) : NULL, - target_amf_failure ? ogs_strdup_or_assert(target_amf_failure->valuestring) : NULL + target_amf_removal ? ogs_strdup(target_amf_removal->valuestring) : NULL, + target_amf_failure ? ogs_strdup(target_amf_failure->valuestring) : NULL ); return amf_status_info_local_var; diff --git a/lib/sbi/openapi/model/amf_subscription_info.c b/lib/sbi/openapi/model/amf_subscription_info.c index b3d1deac3..ca6fbff0f 100644 --- a/lib/sbi/openapi/model/amf_subscription_info.c +++ b/lib/sbi/openapi/model/amf_subscription_info.c @@ -10,10 +10,9 @@ OpenAPI_amf_subscription_info_t *OpenAPI_amf_subscription_info_create( char *subs_change_notify_correlation_id ) { - OpenAPI_amf_subscription_info_t *amf_subscription_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_amf_subscription_info_t)); - if (!amf_subscription_info_local_var) { - return NULL; - } + OpenAPI_amf_subscription_info_t *amf_subscription_info_local_var = ogs_malloc(sizeof(OpenAPI_amf_subscription_info_t)); + ogs_assert(amf_subscription_info_local_var); + amf_subscription_info_local_var->amf_instance_id = amf_instance_id; amf_subscription_info_local_var->subscription_id = subscription_id; amf_subscription_info_local_var->subs_change_notify_correlation_id = subs_change_notify_correlation_id; @@ -99,9 +98,9 @@ OpenAPI_amf_subscription_info_t *OpenAPI_amf_subscription_info_parseFromJSON(cJS } amf_subscription_info_local_var = OpenAPI_amf_subscription_info_create ( - ogs_strdup_or_assert(amf_instance_id->valuestring), - ogs_strdup_or_assert(subscription_id->valuestring), - subs_change_notify_correlation_id ? ogs_strdup_or_assert(subs_change_notify_correlation_id->valuestring) : NULL + ogs_strdup(amf_instance_id->valuestring), + ogs_strdup(subscription_id->valuestring), + subs_change_notify_correlation_id ? ogs_strdup(subs_change_notify_correlation_id->valuestring) : NULL ); return amf_subscription_info_local_var; diff --git a/lib/sbi/openapi/model/an_gw_address.c b/lib/sbi/openapi/model/an_gw_address.c index 10fb22c5f..c0facc1ba 100644 --- a/lib/sbi/openapi/model/an_gw_address.c +++ b/lib/sbi/openapi/model/an_gw_address.c @@ -9,10 +9,9 @@ OpenAPI_an_gw_address_t *OpenAPI_an_gw_address_create( char *an_gw_ipv6_addr ) { - OpenAPI_an_gw_address_t *an_gw_address_local_var = OpenAPI_malloc(sizeof(OpenAPI_an_gw_address_t)); - if (!an_gw_address_local_var) { - return NULL; - } + OpenAPI_an_gw_address_t *an_gw_address_local_var = ogs_malloc(sizeof(OpenAPI_an_gw_address_t)); + ogs_assert(an_gw_address_local_var); + an_gw_address_local_var->an_gw_ipv4_addr = an_gw_ipv4_addr; an_gw_address_local_var->an_gw_ipv6_addr = an_gw_ipv6_addr; @@ -80,8 +79,8 @@ OpenAPI_an_gw_address_t *OpenAPI_an_gw_address_parseFromJSON(cJSON *an_gw_addres } an_gw_address_local_var = OpenAPI_an_gw_address_create ( - an_gw_ipv4_addr ? ogs_strdup_or_assert(an_gw_ipv4_addr->valuestring) : NULL, - an_gw_ipv6_addr ? ogs_strdup_or_assert(an_gw_ipv6_addr->valuestring) : NULL + an_gw_ipv4_addr ? ogs_strdup(an_gw_ipv4_addr->valuestring) : NULL, + an_gw_ipv6_addr ? ogs_strdup(an_gw_ipv6_addr->valuestring) : NULL ); return an_gw_address_local_var; diff --git a/lib/sbi/openapi/model/apn_rate_status.c b/lib/sbi/openapi/model/apn_rate_status.c index 9b10ebe35..2e5cdae84 100644 --- a/lib/sbi/openapi/model/apn_rate_status.c +++ b/lib/sbi/openapi/model/apn_rate_status.c @@ -16,10 +16,9 @@ OpenAPI_apn_rate_status_t *OpenAPI_apn_rate_status_create( int remain_ex_reports_dl ) { - OpenAPI_apn_rate_status_t *apn_rate_status_local_var = OpenAPI_malloc(sizeof(OpenAPI_apn_rate_status_t)); - if (!apn_rate_status_local_var) { - return NULL; - } + OpenAPI_apn_rate_status_t *apn_rate_status_local_var = ogs_malloc(sizeof(OpenAPI_apn_rate_status_t)); + ogs_assert(apn_rate_status_local_var); + apn_rate_status_local_var->is_remain_packets_ul = is_remain_packets_ul; apn_rate_status_local_var->remain_packets_ul = remain_packets_ul; apn_rate_status_local_var->is_remain_packets_dl = is_remain_packets_dl; @@ -145,7 +144,7 @@ OpenAPI_apn_rate_status_t *OpenAPI_apn_rate_status_parseFromJSON(cJSON *apn_rate remain_packets_ul ? remain_packets_ul->valuedouble : 0, remain_packets_dl ? true : false, remain_packets_dl ? remain_packets_dl->valuedouble : 0, - validity_time ? ogs_strdup_or_assert(validity_time->valuestring) : NULL, + validity_time ? ogs_strdup(validity_time->valuestring) : NULL, remain_ex_reports_ul ? true : false, remain_ex_reports_ul ? remain_ex_reports_ul->valuedouble : 0, remain_ex_reports_dl ? true : false, diff --git a/lib/sbi/openapi/model/app_descriptor.c b/lib/sbi/openapi/model/app_descriptor.c index c5d3a9d2c..72ae582dc 100644 --- a/lib/sbi/openapi/model/app_descriptor.c +++ b/lib/sbi/openapi/model/app_descriptor.c @@ -9,10 +9,9 @@ OpenAPI_app_descriptor_t *OpenAPI_app_descriptor_create( char *app_id ) { - OpenAPI_app_descriptor_t *app_descriptor_local_var = OpenAPI_malloc(sizeof(OpenAPI_app_descriptor_t)); - if (!app_descriptor_local_var) { - return NULL; - } + OpenAPI_app_descriptor_t *app_descriptor_local_var = ogs_malloc(sizeof(OpenAPI_app_descriptor_t)); + ogs_assert(app_descriptor_local_var); + app_descriptor_local_var->os_id = os_id; app_descriptor_local_var->app_id = app_id; @@ -80,8 +79,8 @@ OpenAPI_app_descriptor_t *OpenAPI_app_descriptor_parseFromJSON(cJSON *app_descri } app_descriptor_local_var = OpenAPI_app_descriptor_create ( - os_id ? ogs_strdup_or_assert(os_id->valuestring) : NULL, - app_id ? ogs_strdup_or_assert(app_id->valuestring) : NULL + os_id ? ogs_strdup(os_id->valuestring) : NULL, + app_id ? ogs_strdup(app_id->valuestring) : NULL ); return app_descriptor_local_var; diff --git a/lib/sbi/openapi/model/app_detection_info.c b/lib/sbi/openapi/model/app_detection_info.c index da6fcaf7b..58186fdd2 100644 --- a/lib/sbi/openapi/model/app_detection_info.c +++ b/lib/sbi/openapi/model/app_detection_info.c @@ -10,10 +10,9 @@ OpenAPI_app_detection_info_t *OpenAPI_app_detection_info_create( OpenAPI_list_t *sdf_descriptions ) { - OpenAPI_app_detection_info_t *app_detection_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_app_detection_info_t)); - if (!app_detection_info_local_var) { - return NULL; - } + OpenAPI_app_detection_info_t *app_detection_info_local_var = ogs_malloc(sizeof(OpenAPI_app_detection_info_t)); + ogs_assert(app_detection_info_local_var); + app_detection_info_local_var->app_id = app_id; app_detection_info_local_var->instance_id = instance_id; app_detection_info_local_var->sdf_descriptions = sdf_descriptions; @@ -129,8 +128,8 @@ OpenAPI_app_detection_info_t *OpenAPI_app_detection_info_parseFromJSON(cJSON *ap } app_detection_info_local_var = OpenAPI_app_detection_info_create ( - ogs_strdup_or_assert(app_id->valuestring), - instance_id ? ogs_strdup_or_assert(instance_id->valuestring) : NULL, + ogs_strdup(app_id->valuestring), + instance_id ? ogs_strdup(instance_id->valuestring) : NULL, sdf_descriptions ? sdf_descriptionsList : NULL ); diff --git a/lib/sbi/openapi/model/app_port_id.c b/lib/sbi/openapi/model/app_port_id.c index 2d48ed78d..56ed97a4c 100644 --- a/lib/sbi/openapi/model/app_port_id.c +++ b/lib/sbi/openapi/model/app_port_id.c @@ -11,10 +11,9 @@ OpenAPI_app_port_id_t *OpenAPI_app_port_id_create( int originator_port ) { - OpenAPI_app_port_id_t *app_port_id_local_var = OpenAPI_malloc(sizeof(OpenAPI_app_port_id_t)); - if (!app_port_id_local_var) { - return NULL; - } + OpenAPI_app_port_id_t *app_port_id_local_var = ogs_malloc(sizeof(OpenAPI_app_port_id_t)); + ogs_assert(app_port_id_local_var); + app_port_id_local_var->is_destination_port = is_destination_port; app_port_id_local_var->destination_port = destination_port; app_port_id_local_var->is_originator_port = is_originator_port; diff --git a/lib/sbi/openapi/model/app_session_context.c b/lib/sbi/openapi/model/app_session_context.c index 956c2438d..fa668c8ff 100644 --- a/lib/sbi/openapi/model/app_session_context.c +++ b/lib/sbi/openapi/model/app_session_context.c @@ -10,10 +10,9 @@ OpenAPI_app_session_context_t *OpenAPI_app_session_context_create( OpenAPI_events_notification_t *evs_notif ) { - OpenAPI_app_session_context_t *app_session_context_local_var = OpenAPI_malloc(sizeof(OpenAPI_app_session_context_t)); - if (!app_session_context_local_var) { - return NULL; - } + OpenAPI_app_session_context_t *app_session_context_local_var = ogs_malloc(sizeof(OpenAPI_app_session_context_t)); + ogs_assert(app_session_context_local_var); + app_session_context_local_var->asc_req_data = asc_req_data; app_session_context_local_var->asc_resp_data = asc_resp_data; app_session_context_local_var->evs_notif = evs_notif; diff --git a/lib/sbi/openapi/model/app_session_context_req_data.c b/lib/sbi/openapi/model/app_session_context_req_data.c index 5580429b2..d030aa1a2 100644 --- a/lib/sbi/openapi/model/app_session_context_req_data.c +++ b/lib/sbi/openapi/model/app_session_context_req_data.c @@ -38,10 +38,9 @@ OpenAPI_app_session_context_req_data_t *OpenAPI_app_session_context_req_data_cre OpenAPI_list_t *tsn_port_man_cont_nwtts ) { - OpenAPI_app_session_context_req_data_t *app_session_context_req_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_app_session_context_req_data_t)); - if (!app_session_context_req_data_local_var) { - return NULL; - } + OpenAPI_app_session_context_req_data_t *app_session_context_req_data_local_var = ogs_malloc(sizeof(OpenAPI_app_session_context_req_data_t)); + ogs_assert(app_session_context_req_data_local_var); + app_session_context_req_data_local_var->af_app_id = af_app_id; app_session_context_req_data_local_var->af_charg_id = af_charg_id; app_session_context_req_data_local_var->af_req_data = af_req_data; @@ -94,6 +93,7 @@ void OpenAPI_app_session_context_req_data_free(OpenAPI_app_session_context_req_d ogs_free(app_session_context_req_data->mc_video_id); OpenAPI_list_for_each(app_session_context_req_data->med_components, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_media_component_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -512,9 +512,9 @@ OpenAPI_app_session_context_req_data_t *OpenAPI_app_session_context_req_data_par cJSON *localMapObject = med_components_local_map; if (cJSON_IsObject(med_components_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_media_component_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_media_component_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(med_components_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_app_session_context_req_data_parseFromJSON() failed [med_components]"); goto end; @@ -724,34 +724,34 @@ OpenAPI_app_session_context_req_data_t *OpenAPI_app_session_context_req_data_par } app_session_context_req_data_local_var = OpenAPI_app_session_context_req_data_create ( - af_app_id ? ogs_strdup_or_assert(af_app_id->valuestring) : NULL, - af_charg_id ? ogs_strdup_or_assert(af_charg_id->valuestring) : NULL, + af_app_id ? ogs_strdup(af_app_id->valuestring) : NULL, + af_charg_id ? ogs_strdup(af_charg_id->valuestring) : NULL, af_req_data ? af_req_dataVariable : 0, af_rout_req ? af_rout_req_local_nonprim : NULL, - asp_id ? ogs_strdup_or_assert(asp_id->valuestring) : NULL, - bdt_ref_id ? ogs_strdup_or_assert(bdt_ref_id->valuestring) : NULL, - dnn ? ogs_strdup_or_assert(dnn->valuestring) : NULL, + asp_id ? ogs_strdup(asp_id->valuestring) : NULL, + bdt_ref_id ? ogs_strdup(bdt_ref_id->valuestring) : NULL, + dnn ? ogs_strdup(dnn->valuestring) : NULL, ev_subsc ? ev_subsc_local_nonprim : NULL, - mcptt_id ? ogs_strdup_or_assert(mcptt_id->valuestring) : NULL, - mc_video_id ? ogs_strdup_or_assert(mc_video_id->valuestring) : NULL, + mcptt_id ? ogs_strdup(mcptt_id->valuestring) : NULL, + mc_video_id ? ogs_strdup(mc_video_id->valuestring) : NULL, med_components ? med_componentsList : NULL, - ip_domain ? ogs_strdup_or_assert(ip_domain->valuestring) : NULL, - mps_id ? ogs_strdup_or_assert(mps_id->valuestring) : NULL, - mcs_id ? ogs_strdup_or_assert(mcs_id->valuestring) : NULL, + ip_domain ? ogs_strdup(ip_domain->valuestring) : NULL, + mps_id ? ogs_strdup(mps_id->valuestring) : NULL, + mcs_id ? ogs_strdup(mcs_id->valuestring) : NULL, preempt_control_info ? preempt_control_infoVariable : 0, res_prio ? res_prioVariable : 0, serv_inf_status ? serv_inf_statusVariable : 0, - ogs_strdup_or_assert(notif_uri->valuestring), - serv_urn ? ogs_strdup_or_assert(serv_urn->valuestring) : NULL, + ogs_strdup(notif_uri->valuestring), + serv_urn ? ogs_strdup(serv_urn->valuestring) : NULL, slice_info ? slice_info_local_nonprim : NULL, - spon_id ? ogs_strdup_or_assert(spon_id->valuestring) : NULL, + spon_id ? ogs_strdup(spon_id->valuestring) : NULL, spon_status ? spon_statusVariable : 0, - supi ? ogs_strdup_or_assert(supi->valuestring) : NULL, - gpsi ? ogs_strdup_or_assert(gpsi->valuestring) : NULL, - ogs_strdup_or_assert(supp_feat->valuestring), - ue_ipv4 ? ogs_strdup_or_assert(ue_ipv4->valuestring) : NULL, - ue_ipv6 ? ogs_strdup_or_assert(ue_ipv6->valuestring) : NULL, - ue_mac ? ogs_strdup_or_assert(ue_mac->valuestring) : NULL, + supi ? ogs_strdup(supi->valuestring) : NULL, + gpsi ? ogs_strdup(gpsi->valuestring) : NULL, + ogs_strdup(supp_feat->valuestring), + ue_ipv4 ? ogs_strdup(ue_ipv4->valuestring) : NULL, + ue_ipv6 ? ogs_strdup(ue_ipv6->valuestring) : NULL, + ue_mac ? ogs_strdup(ue_mac->valuestring) : NULL, tsn_bridge_man_cont ? tsn_bridge_man_cont_local_nonprim : NULL, tsn_port_man_cont_dstt ? tsn_port_man_cont_dstt_local_nonprim : NULL, tsn_port_man_cont_nwtts ? tsn_port_man_cont_nwttsList : NULL diff --git a/lib/sbi/openapi/model/app_session_context_resp_data.c b/lib/sbi/openapi/model/app_session_context_resp_data.c index 4b43a76ba..676e912b1 100644 --- a/lib/sbi/openapi/model/app_session_context_resp_data.c +++ b/lib/sbi/openapi/model/app_session_context_resp_data.c @@ -10,10 +10,9 @@ OpenAPI_app_session_context_resp_data_t *OpenAPI_app_session_context_resp_data_c char *supp_feat ) { - OpenAPI_app_session_context_resp_data_t *app_session_context_resp_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_app_session_context_resp_data_t)); - if (!app_session_context_resp_data_local_var) { - return NULL; - } + OpenAPI_app_session_context_resp_data_t *app_session_context_resp_data_local_var = ogs_malloc(sizeof(OpenAPI_app_session_context_resp_data_t)); + ogs_assert(app_session_context_resp_data_local_var); + app_session_context_resp_data_local_var->serv_auth_info = serv_auth_info; app_session_context_resp_data_local_var->ue_ids = ue_ids; app_session_context_resp_data_local_var->supp_feat = supp_feat; @@ -132,7 +131,7 @@ OpenAPI_app_session_context_resp_data_t *OpenAPI_app_session_context_resp_data_p app_session_context_resp_data_local_var = OpenAPI_app_session_context_resp_data_create ( serv_auth_info ? serv_auth_infoVariable : 0, ue_ids ? ue_idsList : NULL, - supp_feat ? ogs_strdup_or_assert(supp_feat->valuestring) : NULL + supp_feat ? ogs_strdup(supp_feat->valuestring) : NULL ); return app_session_context_resp_data_local_var; diff --git a/lib/sbi/openapi/model/app_session_context_update_data.c b/lib/sbi/openapi/model/app_session_context_update_data.c index 1ae815d10..8a6cec4c9 100644 --- a/lib/sbi/openapi/model/app_session_context_update_data.c +++ b/lib/sbi/openapi/model/app_session_context_update_data.c @@ -26,10 +26,9 @@ OpenAPI_app_session_context_update_data_t *OpenAPI_app_session_context_update_da OpenAPI_list_t *tsn_port_man_cont_nwtts ) { - OpenAPI_app_session_context_update_data_t *app_session_context_update_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_app_session_context_update_data_t)); - if (!app_session_context_update_data_local_var) { - return NULL; - } + OpenAPI_app_session_context_update_data_t *app_session_context_update_data_local_var = ogs_malloc(sizeof(OpenAPI_app_session_context_update_data_t)); + ogs_assert(app_session_context_update_data_local_var); + app_session_context_update_data_local_var->af_app_id = af_app_id; app_session_context_update_data_local_var->af_rout_req = af_rout_req; app_session_context_update_data_local_var->asp_id = asp_id; @@ -68,6 +67,7 @@ void OpenAPI_app_session_context_update_data_free(OpenAPI_app_session_context_up ogs_free(app_session_context_update_data->mc_video_id); OpenAPI_list_for_each(app_session_context_update_data->med_components, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_media_component_rm_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -368,9 +368,9 @@ OpenAPI_app_session_context_update_data_t *OpenAPI_app_session_context_update_da cJSON *localMapObject = med_components_local_map; if (cJSON_IsObject(med_components_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_media_component_rm_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_media_component_rm_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(med_components_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_app_session_context_update_data_parseFromJSON() failed [med_components]"); goto end; @@ -495,21 +495,21 @@ OpenAPI_app_session_context_update_data_t *OpenAPI_app_session_context_update_da } app_session_context_update_data_local_var = OpenAPI_app_session_context_update_data_create ( - af_app_id ? ogs_strdup_or_assert(af_app_id->valuestring) : NULL, + af_app_id ? ogs_strdup(af_app_id->valuestring) : NULL, af_rout_req ? af_rout_req_local_nonprim : NULL, - asp_id ? ogs_strdup_or_assert(asp_id->valuestring) : NULL, - bdt_ref_id ? ogs_strdup_or_assert(bdt_ref_id->valuestring) : NULL, + asp_id ? ogs_strdup(asp_id->valuestring) : NULL, + bdt_ref_id ? ogs_strdup(bdt_ref_id->valuestring) : NULL, ev_subsc ? ev_subsc_local_nonprim : NULL, - mcptt_id ? ogs_strdup_or_assert(mcptt_id->valuestring) : NULL, - mc_video_id ? ogs_strdup_or_assert(mc_video_id->valuestring) : NULL, + mcptt_id ? ogs_strdup(mcptt_id->valuestring) : NULL, + mc_video_id ? ogs_strdup(mc_video_id->valuestring) : NULL, med_components ? med_componentsList : NULL, - mps_id ? ogs_strdup_or_assert(mps_id->valuestring) : NULL, - mcs_id ? ogs_strdup_or_assert(mcs_id->valuestring) : NULL, + mps_id ? ogs_strdup(mps_id->valuestring) : NULL, + mcs_id ? ogs_strdup(mcs_id->valuestring) : NULL, preempt_control_info ? preempt_control_info_local_nonprim : NULL, res_prio ? res_prioVariable : 0, serv_inf_status ? serv_inf_statusVariable : 0, sip_fork_ind ? sip_fork_indVariable : 0, - spon_id ? ogs_strdup_or_assert(spon_id->valuestring) : NULL, + spon_id ? ogs_strdup(spon_id->valuestring) : NULL, spon_status ? spon_statusVariable : 0, tsn_bridge_man_cont ? tsn_bridge_man_cont_local_nonprim : NULL, tsn_port_man_cont_dstt ? tsn_port_man_cont_dstt_local_nonprim : NULL, diff --git a/lib/sbi/openapi/model/app_session_context_update_data_patch.c b/lib/sbi/openapi/model/app_session_context_update_data_patch.c index 02dafee2d..ab21acdab 100644 --- a/lib/sbi/openapi/model/app_session_context_update_data_patch.c +++ b/lib/sbi/openapi/model/app_session_context_update_data_patch.c @@ -8,10 +8,9 @@ OpenAPI_app_session_context_update_data_patch_t *OpenAPI_app_session_context_upd OpenAPI_app_session_context_update_data_t *asc_req_data ) { - OpenAPI_app_session_context_update_data_patch_t *app_session_context_update_data_patch_local_var = OpenAPI_malloc(sizeof(OpenAPI_app_session_context_update_data_patch_t)); - if (!app_session_context_update_data_patch_local_var) { - return NULL; - } + OpenAPI_app_session_context_update_data_patch_t *app_session_context_update_data_patch_local_var = ogs_malloc(sizeof(OpenAPI_app_session_context_update_data_patch_t)); + ogs_assert(app_session_context_update_data_patch_local_var); + app_session_context_update_data_patch_local_var->asc_req_data = asc_req_data; return app_session_context_update_data_patch_local_var; diff --git a/lib/sbi/openapi/model/application_data_change_notif.c b/lib/sbi/openapi/model/application_data_change_notif.c index d9d291ba7..fc6dadfc1 100644 --- a/lib/sbi/openapi/model/application_data_change_notif.c +++ b/lib/sbi/openapi/model/application_data_change_notif.c @@ -12,10 +12,9 @@ OpenAPI_application_data_change_notif_t *OpenAPI_application_data_change_notif_c OpenAPI_service_parameter_data_t *ser_param_data ) { - OpenAPI_application_data_change_notif_t *application_data_change_notif_local_var = OpenAPI_malloc(sizeof(OpenAPI_application_data_change_notif_t)); - if (!application_data_change_notif_local_var) { - return NULL; - } + OpenAPI_application_data_change_notif_t *application_data_change_notif_local_var = ogs_malloc(sizeof(OpenAPI_application_data_change_notif_t)); + ogs_assert(application_data_change_notif_local_var); + application_data_change_notif_local_var->iptv_config_data = iptv_config_data; application_data_change_notif_local_var->pfd_data = pfd_data; application_data_change_notif_local_var->bdt_policy_data = bdt_policy_data; @@ -156,7 +155,7 @@ OpenAPI_application_data_change_notif_t *OpenAPI_application_data_change_notif_p iptv_config_data ? iptv_config_data_local_nonprim : NULL, pfd_data ? pfd_data_local_nonprim : NULL, bdt_policy_data ? bdt_policy_data_local_nonprim : NULL, - ogs_strdup_or_assert(res_uri->valuestring), + ogs_strdup(res_uri->valuestring), ser_param_data ? ser_param_data_local_nonprim : NULL ); diff --git a/lib/sbi/openapi/model/application_data_subs.c b/lib/sbi/openapi/model/application_data_subs.c index a780b60cb..c69d9f238 100644 --- a/lib/sbi/openapi/model/application_data_subs.c +++ b/lib/sbi/openapi/model/application_data_subs.c @@ -11,10 +11,9 @@ OpenAPI_application_data_subs_t *OpenAPI_application_data_subs_create( char *supported_features ) { - OpenAPI_application_data_subs_t *application_data_subs_local_var = OpenAPI_malloc(sizeof(OpenAPI_application_data_subs_t)); - if (!application_data_subs_local_var) { - return NULL; - } + OpenAPI_application_data_subs_t *application_data_subs_local_var = ogs_malloc(sizeof(OpenAPI_application_data_subs_t)); + ogs_assert(application_data_subs_local_var); + application_data_subs_local_var->notification_uri = notification_uri; application_data_subs_local_var->data_filters = data_filters; application_data_subs_local_var->expiry = expiry; @@ -148,10 +147,10 @@ OpenAPI_application_data_subs_t *OpenAPI_application_data_subs_parseFromJSON(cJS } application_data_subs_local_var = OpenAPI_application_data_subs_create ( - ogs_strdup_or_assert(notification_uri->valuestring), + ogs_strdup(notification_uri->valuestring), data_filters ? data_filtersList : NULL, - expiry ? ogs_strdup_or_assert(expiry->valuestring) : NULL, - supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL + expiry ? ogs_strdup(expiry->valuestring) : NULL, + supported_features ? ogs_strdup(supported_features->valuestring) : NULL ); return application_data_subs_local_var; diff --git a/lib/sbi/openapi/model/area.c b/lib/sbi/openapi/model/area.c index ab0701467..18db86b55 100644 --- a/lib/sbi/openapi/model/area.c +++ b/lib/sbi/openapi/model/area.c @@ -9,10 +9,9 @@ OpenAPI_area_t *OpenAPI_area_create( char *area_code ) { - OpenAPI_area_t *area_local_var = OpenAPI_malloc(sizeof(OpenAPI_area_t)); - if (!area_local_var) { - return NULL; - } + OpenAPI_area_t *area_local_var = ogs_malloc(sizeof(OpenAPI_area_t)); + ogs_assert(area_local_var); + area_local_var->tacs = tacs; area_local_var->area_code = area_code; @@ -89,7 +88,7 @@ OpenAPI_area_t *OpenAPI_area_parseFromJSON(cJSON *areaJSON) ogs_error("OpenAPI_area_parseFromJSON() failed [tacs]"); goto end; } - OpenAPI_list_add(tacsList , ogs_strdup_or_assert(tacs_local->valuestring)); + OpenAPI_list_add(tacsList , ogs_strdup(tacs_local->valuestring)); } } @@ -104,7 +103,7 @@ OpenAPI_area_t *OpenAPI_area_parseFromJSON(cJSON *areaJSON) area_local_var = OpenAPI_area_create ( tacs ? tacsList : NULL, - area_code ? ogs_strdup_or_assert(area_code->valuestring) : NULL + area_code ? ogs_strdup(area_code->valuestring) : NULL ); return area_local_var; diff --git a/lib/sbi/openapi/model/area_1.c b/lib/sbi/openapi/model/area_1.c index eb0cea7f0..dff3141d2 100644 --- a/lib/sbi/openapi/model/area_1.c +++ b/lib/sbi/openapi/model/area_1.c @@ -9,10 +9,9 @@ OpenAPI_area_1_t *OpenAPI_area_1_create( char *area_code ) { - OpenAPI_area_1_t *area_1_local_var = OpenAPI_malloc(sizeof(OpenAPI_area_1_t)); - if (!area_1_local_var) { - return NULL; - } + OpenAPI_area_1_t *area_1_local_var = ogs_malloc(sizeof(OpenAPI_area_1_t)); + ogs_assert(area_1_local_var); + area_1_local_var->tacs = tacs; area_1_local_var->area_code = area_code; @@ -89,7 +88,7 @@ OpenAPI_area_1_t *OpenAPI_area_1_parseFromJSON(cJSON *area_1JSON) ogs_error("OpenAPI_area_1_parseFromJSON() failed [tacs]"); goto end; } - OpenAPI_list_add(tacsList , ogs_strdup_or_assert(tacs_local->valuestring)); + OpenAPI_list_add(tacsList , ogs_strdup(tacs_local->valuestring)); } } @@ -104,7 +103,7 @@ OpenAPI_area_1_t *OpenAPI_area_1_parseFromJSON(cJSON *area_1JSON) area_1_local_var = OpenAPI_area_1_create ( tacs ? tacsList : NULL, - area_code ? ogs_strdup_or_assert(area_code->valuestring) : NULL + area_code ? ogs_strdup(area_code->valuestring) : NULL ); return area_1_local_var; diff --git a/lib/sbi/openapi/model/area_of_validity.c b/lib/sbi/openapi/model/area_of_validity.c index 653508622..53341e92e 100644 --- a/lib/sbi/openapi/model/area_of_validity.c +++ b/lib/sbi/openapi/model/area_of_validity.c @@ -8,10 +8,9 @@ OpenAPI_area_of_validity_t *OpenAPI_area_of_validity_create( OpenAPI_list_t *tai_list ) { - OpenAPI_area_of_validity_t *area_of_validity_local_var = OpenAPI_malloc(sizeof(OpenAPI_area_of_validity_t)); - if (!area_of_validity_local_var) { - return NULL; - } + OpenAPI_area_of_validity_t *area_of_validity_local_var = ogs_malloc(sizeof(OpenAPI_area_of_validity_t)); + ogs_assert(area_of_validity_local_var); + area_of_validity_local_var->tai_list = tai_list; return area_of_validity_local_var; diff --git a/lib/sbi/openapi/model/area_scope.c b/lib/sbi/openapi/model/area_scope.c index 1c0f199b2..efb4b8720 100644 --- a/lib/sbi/openapi/model/area_scope.c +++ b/lib/sbi/openapi/model/area_scope.c @@ -11,10 +11,9 @@ OpenAPI_area_scope_t *OpenAPI_area_scope_create( OpenAPI_list_t* tac_info_per_plmn ) { - OpenAPI_area_scope_t *area_scope_local_var = OpenAPI_malloc(sizeof(OpenAPI_area_scope_t)); - if (!area_scope_local_var) { - return NULL; - } + OpenAPI_area_scope_t *area_scope_local_var = ogs_malloc(sizeof(OpenAPI_area_scope_t)); + ogs_assert(area_scope_local_var); + area_scope_local_var->eutra_cell_id_list = eutra_cell_id_list; area_scope_local_var->nr_cell_id_list = nr_cell_id_list; area_scope_local_var->tac_list = tac_list; @@ -43,6 +42,7 @@ void OpenAPI_area_scope_free(OpenAPI_area_scope_t *area_scope) OpenAPI_list_free(area_scope->tac_list); OpenAPI_list_for_each(area_scope->tac_info_per_plmn, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_tac_info_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -154,7 +154,7 @@ OpenAPI_area_scope_t *OpenAPI_area_scope_parseFromJSON(cJSON *area_scopeJSON) ogs_error("OpenAPI_area_scope_parseFromJSON() failed [eutra_cell_id_list]"); goto end; } - OpenAPI_list_add(eutra_cell_id_listList , ogs_strdup_or_assert(eutra_cell_id_list_local->valuestring)); + OpenAPI_list_add(eutra_cell_id_listList , ogs_strdup(eutra_cell_id_list_local->valuestring)); } } @@ -174,7 +174,7 @@ OpenAPI_area_scope_t *OpenAPI_area_scope_parseFromJSON(cJSON *area_scopeJSON) ogs_error("OpenAPI_area_scope_parseFromJSON() failed [nr_cell_id_list]"); goto end; } - OpenAPI_list_add(nr_cell_id_listList , ogs_strdup_or_assert(nr_cell_id_list_local->valuestring)); + OpenAPI_list_add(nr_cell_id_listList , ogs_strdup(nr_cell_id_list_local->valuestring)); } } @@ -194,7 +194,7 @@ OpenAPI_area_scope_t *OpenAPI_area_scope_parseFromJSON(cJSON *area_scopeJSON) ogs_error("OpenAPI_area_scope_parseFromJSON() failed [tac_list]"); goto end; } - OpenAPI_list_add(tac_listList , ogs_strdup_or_assert(tac_list_local->valuestring)); + OpenAPI_list_add(tac_listList , ogs_strdup(tac_list_local->valuestring)); } } @@ -213,9 +213,9 @@ OpenAPI_area_scope_t *OpenAPI_area_scope_parseFromJSON(cJSON *area_scopeJSON) cJSON *localMapObject = tac_info_per_plmn_local_map; if (cJSON_IsObject(tac_info_per_plmn_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_tac_info_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_tac_info_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(tac_info_per_plmn_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_area_scope_parseFromJSON() failed [tac_info_per_plmn]"); goto end; diff --git a/lib/sbi/openapi/model/arp.c b/lib/sbi/openapi/model/arp.c index 92542300c..e0539a9b4 100644 --- a/lib/sbi/openapi/model/arp.c +++ b/lib/sbi/openapi/model/arp.c @@ -10,10 +10,9 @@ OpenAPI_arp_t *OpenAPI_arp_create( OpenAPI_preemption_vulnerability_e preempt_vuln ) { - OpenAPI_arp_t *arp_local_var = OpenAPI_malloc(sizeof(OpenAPI_arp_t)); - if (!arp_local_var) { - return NULL; - } + OpenAPI_arp_t *arp_local_var = ogs_malloc(sizeof(OpenAPI_arp_t)); + ogs_assert(arp_local_var); + arp_local_var->priority_level = priority_level; arp_local_var->preempt_cap = preempt_cap; arp_local_var->preempt_vuln = preempt_vuln; diff --git a/lib/sbi/openapi/model/arp_1.c b/lib/sbi/openapi/model/arp_1.c index a9a980fbb..df2d2b9a5 100644 --- a/lib/sbi/openapi/model/arp_1.c +++ b/lib/sbi/openapi/model/arp_1.c @@ -10,10 +10,9 @@ OpenAPI_arp_1_t *OpenAPI_arp_1_create( OpenAPI_preemption_vulnerability_e preempt_vuln ) { - OpenAPI_arp_1_t *arp_1_local_var = OpenAPI_malloc(sizeof(OpenAPI_arp_1_t)); - if (!arp_1_local_var) { - return NULL; - } + OpenAPI_arp_1_t *arp_1_local_var = ogs_malloc(sizeof(OpenAPI_arp_1_t)); + ogs_assert(arp_1_local_var); + arp_1_local_var->priority_level = priority_level; arp_1_local_var->preempt_cap = preempt_cap; arp_1_local_var->preempt_vuln = preempt_vuln; diff --git a/lib/sbi/openapi/model/assign_ebi_data.c b/lib/sbi/openapi/model/assign_ebi_data.c index e9dfe5bd3..b53fff61b 100644 --- a/lib/sbi/openapi/model/assign_ebi_data.c +++ b/lib/sbi/openapi/model/assign_ebi_data.c @@ -11,10 +11,9 @@ OpenAPI_assign_ebi_data_t *OpenAPI_assign_ebi_data_create( OpenAPI_guami_t *old_guami ) { - OpenAPI_assign_ebi_data_t *assign_ebi_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_assign_ebi_data_t)); - if (!assign_ebi_data_local_var) { - return NULL; - } + OpenAPI_assign_ebi_data_t *assign_ebi_data_local_var = ogs_malloc(sizeof(OpenAPI_assign_ebi_data_t)); + ogs_assert(assign_ebi_data_local_var); + assign_ebi_data_local_var->pdu_session_id = pdu_session_id; assign_ebi_data_local_var->arp_list = arp_list; assign_ebi_data_local_var->released_ebi_list = released_ebi_list; diff --git a/lib/sbi/openapi/model/assign_ebi_error.c b/lib/sbi/openapi/model/assign_ebi_error.c index 2f2c2fbdf..7024ca38a 100644 --- a/lib/sbi/openapi/model/assign_ebi_error.c +++ b/lib/sbi/openapi/model/assign_ebi_error.c @@ -9,10 +9,9 @@ OpenAPI_assign_ebi_error_t *OpenAPI_assign_ebi_error_create( OpenAPI_assign_ebi_failed_t *failure_details ) { - OpenAPI_assign_ebi_error_t *assign_ebi_error_local_var = OpenAPI_malloc(sizeof(OpenAPI_assign_ebi_error_t)); - if (!assign_ebi_error_local_var) { - return NULL; - } + OpenAPI_assign_ebi_error_t *assign_ebi_error_local_var = ogs_malloc(sizeof(OpenAPI_assign_ebi_error_t)); + ogs_assert(assign_ebi_error_local_var); + assign_ebi_error_local_var->error = error; assign_ebi_error_local_var->failure_details = failure_details; diff --git a/lib/sbi/openapi/model/assign_ebi_failed.c b/lib/sbi/openapi/model/assign_ebi_failed.c index f622fbdf0..826de0468 100644 --- a/lib/sbi/openapi/model/assign_ebi_failed.c +++ b/lib/sbi/openapi/model/assign_ebi_failed.c @@ -9,10 +9,9 @@ OpenAPI_assign_ebi_failed_t *OpenAPI_assign_ebi_failed_create( OpenAPI_list_t *failed_arp_list ) { - OpenAPI_assign_ebi_failed_t *assign_ebi_failed_local_var = OpenAPI_malloc(sizeof(OpenAPI_assign_ebi_failed_t)); - if (!assign_ebi_failed_local_var) { - return NULL; - } + OpenAPI_assign_ebi_failed_t *assign_ebi_failed_local_var = ogs_malloc(sizeof(OpenAPI_assign_ebi_failed_t)); + ogs_assert(assign_ebi_failed_local_var); + assign_ebi_failed_local_var->pdu_session_id = pdu_session_id; assign_ebi_failed_local_var->failed_arp_list = failed_arp_list; diff --git a/lib/sbi/openapi/model/assigned_ebi_data.c b/lib/sbi/openapi/model/assigned_ebi_data.c index d53108bc2..5f5d60bcf 100644 --- a/lib/sbi/openapi/model/assigned_ebi_data.c +++ b/lib/sbi/openapi/model/assigned_ebi_data.c @@ -11,10 +11,9 @@ OpenAPI_assigned_ebi_data_t *OpenAPI_assigned_ebi_data_create( OpenAPI_list_t *released_ebi_list ) { - OpenAPI_assigned_ebi_data_t *assigned_ebi_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_assigned_ebi_data_t)); - if (!assigned_ebi_data_local_var) { - return NULL; - } + OpenAPI_assigned_ebi_data_t *assigned_ebi_data_local_var = ogs_malloc(sizeof(OpenAPI_assigned_ebi_data_t)); + ogs_assert(assigned_ebi_data_local_var); + assigned_ebi_data_local_var->pdu_session_id = pdu_session_id; assigned_ebi_data_local_var->assigned_ebi_list = assigned_ebi_list; assigned_ebi_data_local_var->failed_arp_list = failed_arp_list; diff --git a/lib/sbi/openapi/model/association_type.c b/lib/sbi/openapi/model/association_type.c index 57a0498eb..75e7bbd20 100644 --- a/lib/sbi/openapi/model/association_type.c +++ b/lib/sbi/openapi/model/association_type.c @@ -7,10 +7,9 @@ OpenAPI_association_type_t *OpenAPI_association_type_create( ) { - OpenAPI_association_type_t *association_type_local_var = OpenAPI_malloc(sizeof(OpenAPI_association_type_t)); - if (!association_type_local_var) { - return NULL; - } + OpenAPI_association_type_t *association_type_local_var = ogs_malloc(sizeof(OpenAPI_association_type_t)); + ogs_assert(association_type_local_var); + return association_type_local_var; } diff --git a/lib/sbi/openapi/model/atom.c b/lib/sbi/openapi/model/atom.c index e9bc75a00..863611195 100644 --- a/lib/sbi/openapi/model/atom.c +++ b/lib/sbi/openapi/model/atom.c @@ -11,10 +11,9 @@ OpenAPI_atom_t *OpenAPI_atom_create( int negative ) { - OpenAPI_atom_t *atom_local_var = OpenAPI_malloc(sizeof(OpenAPI_atom_t)); - if (!atom_local_var) { - return NULL; - } + OpenAPI_atom_t *atom_local_var = ogs_malloc(sizeof(OpenAPI_atom_t)); + ogs_assert(atom_local_var); + atom_local_var->attr = attr; atom_local_var->value = value; atom_local_var->is_negative = is_negative; @@ -100,8 +99,8 @@ OpenAPI_atom_t *OpenAPI_atom_parseFromJSON(cJSON *atomJSON) } atom_local_var = OpenAPI_atom_create ( - ogs_strdup_or_assert(attr->valuestring), - ogs_strdup_or_assert(value->valuestring), + ogs_strdup(attr->valuestring), + ogs_strdup(value->valuestring), negative ? true : false, negative ? negative->valueint : 0 ); diff --git a/lib/sbi/openapi/model/atsss_capability.c b/lib/sbi/openapi/model/atsss_capability.c index fc6fafab4..40e00761e 100644 --- a/lib/sbi/openapi/model/atsss_capability.c +++ b/lib/sbi/openapi/model/atsss_capability.c @@ -13,10 +13,9 @@ OpenAPI_atsss_capability_t *OpenAPI_atsss_capability_create( int rtt_without_pmf ) { - OpenAPI_atsss_capability_t *atsss_capability_local_var = OpenAPI_malloc(sizeof(OpenAPI_atsss_capability_t)); - if (!atsss_capability_local_var) { - return NULL; - } + OpenAPI_atsss_capability_t *atsss_capability_local_var = ogs_malloc(sizeof(OpenAPI_atsss_capability_t)); + ogs_assert(atsss_capability_local_var); + atsss_capability_local_var->is_atsss_ll = is_atsss_ll; atsss_capability_local_var->atsss_ll = atsss_ll; atsss_capability_local_var->is_mptcp = is_mptcp; diff --git a/lib/sbi/openapi/model/ausf_info.c b/lib/sbi/openapi/model/ausf_info.c index d6ad4c13b..bf84f9405 100644 --- a/lib/sbi/openapi/model/ausf_info.c +++ b/lib/sbi/openapi/model/ausf_info.c @@ -10,10 +10,9 @@ OpenAPI_ausf_info_t *OpenAPI_ausf_info_create( OpenAPI_list_t *routing_indicators ) { - OpenAPI_ausf_info_t *ausf_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_ausf_info_t)); - if (!ausf_info_local_var) { - return NULL; - } + OpenAPI_ausf_info_t *ausf_info_local_var = ogs_malloc(sizeof(OpenAPI_ausf_info_t)); + ogs_assert(ausf_info_local_var); + ausf_info_local_var->group_id = group_id; ausf_info_local_var->supi_ranges = supi_ranges; ausf_info_local_var->routing_indicators = routing_indicators; @@ -147,12 +146,12 @@ OpenAPI_ausf_info_t *OpenAPI_ausf_info_parseFromJSON(cJSON *ausf_infoJSON) ogs_error("OpenAPI_ausf_info_parseFromJSON() failed [routing_indicators]"); goto end; } - OpenAPI_list_add(routing_indicatorsList , ogs_strdup_or_assert(routing_indicators_local->valuestring)); + OpenAPI_list_add(routing_indicatorsList , ogs_strdup(routing_indicators_local->valuestring)); } } ausf_info_local_var = OpenAPI_ausf_info_create ( - group_id ? ogs_strdup_or_assert(group_id->valuestring) : NULL, + group_id ? ogs_strdup(group_id->valuestring) : NULL, supi_ranges ? supi_rangesList : NULL, routing_indicators ? routing_indicatorsList : NULL ); diff --git a/lib/sbi/openapi/model/auth_event.c b/lib/sbi/openapi/model/auth_event.c index 0f497a2f3..4438f7214 100644 --- a/lib/sbi/openapi/model/auth_event.c +++ b/lib/sbi/openapi/model/auth_event.c @@ -14,10 +14,9 @@ OpenAPI_auth_event_t *OpenAPI_auth_event_create( int auth_removal_ind ) { - OpenAPI_auth_event_t *auth_event_local_var = OpenAPI_malloc(sizeof(OpenAPI_auth_event_t)); - if (!auth_event_local_var) { - return NULL; - } + OpenAPI_auth_event_t *auth_event_local_var = ogs_malloc(sizeof(OpenAPI_auth_event_t)); + ogs_assert(auth_event_local_var); + auth_event_local_var->nf_instance_id = nf_instance_id; auth_event_local_var->success = success; auth_event_local_var->time_stamp = time_stamp; @@ -157,12 +156,12 @@ OpenAPI_auth_event_t *OpenAPI_auth_event_parseFromJSON(cJSON *auth_eventJSON) } auth_event_local_var = OpenAPI_auth_event_create ( - ogs_strdup_or_assert(nf_instance_id->valuestring), + ogs_strdup(nf_instance_id->valuestring), success->valueint, - ogs_strdup_or_assert(time_stamp->valuestring), + ogs_strdup(time_stamp->valuestring), auth_typeVariable, - ogs_strdup_or_assert(serving_network_name->valuestring), + ogs_strdup(serving_network_name->valuestring), auth_removal_ind ? true : false, auth_removal_ind ? auth_removal_ind->valueint : 0 ); diff --git a/lib/sbi/openapi/model/authentication_info.c b/lib/sbi/openapi/model/authentication_info.c index 043c0201c..1cb909d4a 100644 --- a/lib/sbi/openapi/model/authentication_info.c +++ b/lib/sbi/openapi/model/authentication_info.c @@ -18,10 +18,9 @@ OpenAPI_authentication_info_t *OpenAPI_authentication_info_create( char *supported_features ) { - OpenAPI_authentication_info_t *authentication_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_authentication_info_t)); - if (!authentication_info_local_var) { - return NULL; - } + OpenAPI_authentication_info_t *authentication_info_local_var = ogs_malloc(sizeof(OpenAPI_authentication_info_t)); + ogs_assert(authentication_info_local_var); + authentication_info_local_var->supi_or_suci = supi_or_suci; authentication_info_local_var->serving_network_name = serving_network_name; authentication_info_local_var->resynchronization_info = resynchronization_info; @@ -241,7 +240,7 @@ OpenAPI_authentication_info_t *OpenAPI_authentication_info_parseFromJSON(cJSON * ogs_error("OpenAPI_authentication_info_parseFromJSON() failed [cell_cag_info]"); goto end; } - OpenAPI_list_add(cell_cag_infoList , ogs_strdup_or_assert(cell_cag_info_local->valuestring)); + OpenAPI_list_add(cell_cag_infoList , ogs_strdup(cell_cag_info_local->valuestring)); } } @@ -264,17 +263,17 @@ OpenAPI_authentication_info_t *OpenAPI_authentication_info_parseFromJSON(cJSON * } authentication_info_local_var = OpenAPI_authentication_info_create ( - ogs_strdup_or_assert(supi_or_suci->valuestring), - ogs_strdup_or_assert(serving_network_name->valuestring), + ogs_strdup(supi_or_suci->valuestring), + ogs_strdup(serving_network_name->valuestring), resynchronization_info ? resynchronization_info_local_nonprim : NULL, - pei ? ogs_strdup_or_assert(pei->valuestring) : NULL, + pei ? ogs_strdup(pei->valuestring) : NULL, trace_data ? trace_data_local_nonprim : NULL, - udm_group_id ? ogs_strdup_or_assert(udm_group_id->valuestring) : NULL, - routing_indicator ? ogs_strdup_or_assert(routing_indicator->valuestring) : NULL, + udm_group_id ? ogs_strdup(udm_group_id->valuestring) : NULL, + routing_indicator ? ogs_strdup(routing_indicator->valuestring) : NULL, cell_cag_info ? cell_cag_infoList : NULL, n5gc_ind ? true : false, n5gc_ind ? n5gc_ind->valueint : 0, - supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL + supported_features ? ogs_strdup(supported_features->valuestring) : NULL ); return authentication_info_local_var; diff --git a/lib/sbi/openapi/model/authentication_info_request.c b/lib/sbi/openapi/model/authentication_info_request.c index f43f4e2de..fcf241d61 100644 --- a/lib/sbi/openapi/model/authentication_info_request.c +++ b/lib/sbi/openapi/model/authentication_info_request.c @@ -14,10 +14,9 @@ OpenAPI_authentication_info_request_t *OpenAPI_authentication_info_request_creat int n5gc_ind ) { - OpenAPI_authentication_info_request_t *authentication_info_request_local_var = OpenAPI_malloc(sizeof(OpenAPI_authentication_info_request_t)); - if (!authentication_info_request_local_var) { - return NULL; - } + OpenAPI_authentication_info_request_t *authentication_info_request_local_var = ogs_malloc(sizeof(OpenAPI_authentication_info_request_t)); + ogs_assert(authentication_info_request_local_var); + authentication_info_request_local_var->supported_features = supported_features; authentication_info_request_local_var->serving_network_name = serving_network_name; authentication_info_request_local_var->resynchronization_info = resynchronization_info; @@ -170,7 +169,7 @@ OpenAPI_authentication_info_request_t *OpenAPI_authentication_info_request_parse ogs_error("OpenAPI_authentication_info_request_parseFromJSON() failed [cell_cag_info]"); goto end; } - OpenAPI_list_add(cell_cag_infoList , ogs_strdup_or_assert(cell_cag_info_local->valuestring)); + OpenAPI_list_add(cell_cag_infoList , ogs_strdup(cell_cag_info_local->valuestring)); } } @@ -184,10 +183,10 @@ OpenAPI_authentication_info_request_t *OpenAPI_authentication_info_request_parse } authentication_info_request_local_var = OpenAPI_authentication_info_request_create ( - supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, - ogs_strdup_or_assert(serving_network_name->valuestring), + supported_features ? ogs_strdup(supported_features->valuestring) : NULL, + ogs_strdup(serving_network_name->valuestring), resynchronization_info ? resynchronization_info_local_nonprim : NULL, - ogs_strdup_or_assert(ausf_instance_id->valuestring), + ogs_strdup(ausf_instance_id->valuestring), cell_cag_info ? cell_cag_infoList : NULL, n5gc_ind ? true : false, n5gc_ind ? n5gc_ind->valueint : 0 diff --git a/lib/sbi/openapi/model/authentication_info_result.c b/lib/sbi/openapi/model/authentication_info_result.c index 9dc6effda..b8204cb6f 100644 --- a/lib/sbi/openapi/model/authentication_info_result.c +++ b/lib/sbi/openapi/model/authentication_info_result.c @@ -11,10 +11,9 @@ OpenAPI_authentication_info_result_t *OpenAPI_authentication_info_result_create( char *supi ) { - OpenAPI_authentication_info_result_t *authentication_info_result_local_var = OpenAPI_malloc(sizeof(OpenAPI_authentication_info_result_t)); - if (!authentication_info_result_local_var) { - return NULL; - } + OpenAPI_authentication_info_result_t *authentication_info_result_local_var = ogs_malloc(sizeof(OpenAPI_authentication_info_result_t)); + ogs_assert(authentication_info_result_local_var); + authentication_info_result_local_var->auth_type = auth_type; authentication_info_result_local_var->supported_features = supported_features; authentication_info_result_local_var->authentication_vector = authentication_vector; @@ -124,9 +123,9 @@ OpenAPI_authentication_info_result_t *OpenAPI_authentication_info_result_parseFr authentication_info_result_local_var = OpenAPI_authentication_info_result_create ( auth_typeVariable, - supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, + supported_features ? ogs_strdup(supported_features->valuestring) : NULL, authentication_vector ? authentication_vector_local_nonprim : NULL, - supi ? ogs_strdup_or_assert(supi->valuestring) : NULL + supi ? ogs_strdup(supi->valuestring) : NULL ); return authentication_info_result_local_var; diff --git a/lib/sbi/openapi/model/authentication_subscription.c b/lib/sbi/openapi/model/authentication_subscription.c index f44627aea..c4f42bac3 100644 --- a/lib/sbi/openapi/model/authentication_subscription.c +++ b/lib/sbi/openapi/model/authentication_subscription.c @@ -21,10 +21,9 @@ OpenAPI_authentication_subscription_t *OpenAPI_authentication_subscription_creat char *supi ) { - OpenAPI_authentication_subscription_t *authentication_subscription_local_var = OpenAPI_malloc(sizeof(OpenAPI_authentication_subscription_t)); - if (!authentication_subscription_local_var) { - return NULL; - } + OpenAPI_authentication_subscription_t *authentication_subscription_local_var = ogs_malloc(sizeof(OpenAPI_authentication_subscription_t)); + ogs_assert(authentication_subscription_local_var); + authentication_subscription_local_var->authentication_method = authentication_method; authentication_subscription_local_var->enc_permanent_key = enc_permanent_key; authentication_subscription_local_var->protection_parameter_id = protection_parameter_id; @@ -279,19 +278,19 @@ OpenAPI_authentication_subscription_t *OpenAPI_authentication_subscription_parse authentication_subscription_local_var = OpenAPI_authentication_subscription_create ( authentication_methodVariable, - enc_permanent_key ? ogs_strdup_or_assert(enc_permanent_key->valuestring) : NULL, - protection_parameter_id ? ogs_strdup_or_assert(protection_parameter_id->valuestring) : NULL, + enc_permanent_key ? ogs_strdup(enc_permanent_key->valuestring) : NULL, + protection_parameter_id ? ogs_strdup(protection_parameter_id->valuestring) : NULL, sequence_number ? sequence_number_local_nonprim : NULL, - authentication_management_field ? ogs_strdup_or_assert(authentication_management_field->valuestring) : NULL, - algorithm_id ? ogs_strdup_or_assert(algorithm_id->valuestring) : NULL, - enc_opc_key ? ogs_strdup_or_assert(enc_opc_key->valuestring) : NULL, - enc_topc_key ? ogs_strdup_or_assert(enc_topc_key->valuestring) : NULL, + authentication_management_field ? ogs_strdup(authentication_management_field->valuestring) : NULL, + algorithm_id ? ogs_strdup(algorithm_id->valuestring) : NULL, + enc_opc_key ? ogs_strdup(enc_opc_key->valuestring) : NULL, + enc_topc_key ? ogs_strdup(enc_topc_key->valuestring) : NULL, vector_generation_in_hss ? true : false, vector_generation_in_hss ? vector_generation_in_hss->valueint : 0, n5gc_auth_method ? n5gc_auth_methodVariable : 0, rg_authentication_ind ? true : false, rg_authentication_ind ? rg_authentication_ind->valueint : 0, - supi ? ogs_strdup_or_assert(supi->valuestring) : NULL + supi ? ogs_strdup(supi->valuestring) : NULL ); return authentication_subscription_local_var; diff --git a/lib/sbi/openapi/model/authentication_vector.c b/lib/sbi/openapi/model/authentication_vector.c index d8f83a873..07453990c 100644 --- a/lib/sbi/openapi/model/authentication_vector.c +++ b/lib/sbi/openapi/model/authentication_vector.c @@ -15,10 +15,9 @@ OpenAPI_authentication_vector_t *OpenAPI_authentication_vector_create( char *kausf ) { - OpenAPI_authentication_vector_t *authentication_vector_local_var = OpenAPI_malloc(sizeof(OpenAPI_authentication_vector_t)); - if (!authentication_vector_local_var) { - return NULL; - } + OpenAPI_authentication_vector_t *authentication_vector_local_var = ogs_malloc(sizeof(OpenAPI_authentication_vector_t)); + ogs_assert(authentication_vector_local_var); + authentication_vector_local_var->av_type = av_type; authentication_vector_local_var->rand = rand; authentication_vector_local_var->xres = xres; @@ -196,13 +195,13 @@ OpenAPI_authentication_vector_t *OpenAPI_authentication_vector_parseFromJSON(cJS authentication_vector_local_var = OpenAPI_authentication_vector_create ( av_typeVariable, - ogs_strdup_or_assert(rand->valuestring), - xres ? ogs_strdup_or_assert(xres->valuestring) : NULL, - ogs_strdup_or_assert(autn->valuestring), - ck_prime ? ogs_strdup_or_assert(ck_prime->valuestring) : NULL, - ik_prime ? ogs_strdup_or_assert(ik_prime->valuestring) : NULL, - xres_star ? ogs_strdup_or_assert(xres_star->valuestring) : NULL, - kausf ? ogs_strdup_or_assert(kausf->valuestring) : NULL + ogs_strdup(rand->valuestring), + xres ? ogs_strdup(xres->valuestring) : NULL, + ogs_strdup(autn->valuestring), + ck_prime ? ogs_strdup(ck_prime->valuestring) : NULL, + ik_prime ? ogs_strdup(ik_prime->valuestring) : NULL, + xres_star ? ogs_strdup(xres_star->valuestring) : NULL, + kausf ? ogs_strdup(kausf->valuestring) : NULL ); return authentication_vector_local_var; diff --git a/lib/sbi/openapi/model/authorization_data.c b/lib/sbi/openapi/model/authorization_data.c index 06704a992..3bf502026 100644 --- a/lib/sbi/openapi/model/authorization_data.c +++ b/lib/sbi/openapi/model/authorization_data.c @@ -9,10 +9,9 @@ OpenAPI_authorization_data_t *OpenAPI_authorization_data_create( char *validity_time ) { - OpenAPI_authorization_data_t *authorization_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_authorization_data_t)); - if (!authorization_data_local_var) { - return NULL; - } + OpenAPI_authorization_data_t *authorization_data_local_var = ogs_malloc(sizeof(OpenAPI_authorization_data_t)); + ogs_assert(authorization_data_local_var); + authorization_data_local_var->authorization_data = authorization_data; authorization_data_local_var->validity_time = validity_time; @@ -111,7 +110,7 @@ OpenAPI_authorization_data_t *OpenAPI_authorization_data_parseFromJSON(cJSON *au authorization_data_local_var = OpenAPI_authorization_data_create ( authorization_dataList, - validity_time ? ogs_strdup_or_assert(validity_time->valuestring) : NULL + validity_time ? ogs_strdup(validity_time->valuestring) : NULL ); return authorization_data_local_var; diff --git a/lib/sbi/openapi/model/authorized_default_qos.c b/lib/sbi/openapi/model/authorized_default_qos.c index 3ba00e0e1..c89bf57c2 100644 --- a/lib/sbi/openapi/model/authorized_default_qos.c +++ b/lib/sbi/openapi/model/authorized_default_qos.c @@ -22,10 +22,9 @@ OpenAPI_authorized_default_qos_t *OpenAPI_authorized_default_qos_create( int ext_max_data_burst_vol ) { - OpenAPI_authorized_default_qos_t *authorized_default_qos_local_var = OpenAPI_malloc(sizeof(OpenAPI_authorized_default_qos_t)); - if (!authorized_default_qos_local_var) { - return NULL; - } + OpenAPI_authorized_default_qos_t *authorized_default_qos_local_var = ogs_malloc(sizeof(OpenAPI_authorized_default_qos_t)); + ogs_assert(authorized_default_qos_local_var); + authorized_default_qos_local_var->is__5qi = is__5qi; authorized_default_qos_local_var->_5qi = _5qi; authorized_default_qos_local_var->arp = arp; @@ -250,10 +249,10 @@ OpenAPI_authorized_default_qos_t *OpenAPI_authorized_default_qos_parseFromJSON(c aver_window ? aver_window->valuedouble : 0, max_data_burst_vol ? true : false, max_data_burst_vol ? max_data_burst_vol->valuedouble : 0, - maxbr_ul ? ogs_strdup_or_assert(maxbr_ul->valuestring) : NULL, - maxbr_dl ? ogs_strdup_or_assert(maxbr_dl->valuestring) : NULL, - gbr_ul ? ogs_strdup_or_assert(gbr_ul->valuestring) : NULL, - gbr_dl ? ogs_strdup_or_assert(gbr_dl->valuestring) : NULL, + maxbr_ul ? ogs_strdup(maxbr_ul->valuestring) : NULL, + maxbr_dl ? ogs_strdup(maxbr_dl->valuestring) : NULL, + gbr_ul ? ogs_strdup(gbr_ul->valuestring) : NULL, + gbr_dl ? ogs_strdup(gbr_dl->valuestring) : NULL, ext_max_data_burst_vol ? true : false, ext_max_data_burst_vol ? ext_max_data_burst_vol->valuedouble : 0 ); diff --git a/lib/sbi/openapi/model/authorized_network_slice_info.c b/lib/sbi/openapi/model/authorized_network_slice_info.c index bbc0b14d5..70cb47e6d 100644 --- a/lib/sbi/openapi/model/authorized_network_slice_info.c +++ b/lib/sbi/openapi/model/authorized_network_slice_info.c @@ -19,10 +19,9 @@ OpenAPI_authorized_network_slice_info_t *OpenAPI_authorized_network_slice_info_c char *target_amf_service_set ) { - OpenAPI_authorized_network_slice_info_t *authorized_network_slice_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_authorized_network_slice_info_t)); - if (!authorized_network_slice_info_local_var) { - return NULL; - } + OpenAPI_authorized_network_slice_info_t *authorized_network_slice_info_local_var = ogs_malloc(sizeof(OpenAPI_authorized_network_slice_info_t)); + ogs_assert(authorized_network_slice_info_local_var); + authorized_network_slice_info_local_var->allowed_nssai_list = allowed_nssai_list; authorized_network_slice_info_local_var->configured_nssai = configured_nssai; authorized_network_slice_info_local_var->target_amf_set = target_amf_set; @@ -314,7 +313,7 @@ OpenAPI_authorized_network_slice_info_t *OpenAPI_authorized_network_slice_info_p ogs_error("OpenAPI_authorized_network_slice_info_parseFromJSON() failed [candidate_amf_list]"); goto end; } - OpenAPI_list_add(candidate_amf_listList , ogs_strdup_or_assert(candidate_amf_list_local->valuestring)); + OpenAPI_list_add(candidate_amf_listList , ogs_strdup(candidate_amf_list_local->valuestring)); } } @@ -419,16 +418,16 @@ OpenAPI_authorized_network_slice_info_t *OpenAPI_authorized_network_slice_info_p authorized_network_slice_info_local_var = OpenAPI_authorized_network_slice_info_create ( allowed_nssai_list ? allowed_nssai_listList : NULL, configured_nssai ? configured_nssaiList : NULL, - target_amf_set ? ogs_strdup_or_assert(target_amf_set->valuestring) : NULL, + target_amf_set ? ogs_strdup(target_amf_set->valuestring) : NULL, candidate_amf_list ? candidate_amf_listList : NULL, rejected_nssai_in_plmn ? rejected_nssai_in_plmnList : NULL, rejected_nssai_in_ta ? rejected_nssai_in_taList : NULL, nsi_information ? nsi_information_local_nonprim : NULL, - supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, - nrf_amf_set ? ogs_strdup_or_assert(nrf_amf_set->valuestring) : NULL, - nrf_amf_set_nf_mgt_uri ? ogs_strdup_or_assert(nrf_amf_set_nf_mgt_uri->valuestring) : NULL, - nrf_amf_set_access_token_uri ? ogs_strdup_or_assert(nrf_amf_set_access_token_uri->valuestring) : NULL, - target_amf_service_set ? ogs_strdup_or_assert(target_amf_service_set->valuestring) : NULL + supported_features ? ogs_strdup(supported_features->valuestring) : NULL, + nrf_amf_set ? ogs_strdup(nrf_amf_set->valuestring) : NULL, + nrf_amf_set_nf_mgt_uri ? ogs_strdup(nrf_amf_set_nf_mgt_uri->valuestring) : NULL, + nrf_amf_set_access_token_uri ? ogs_strdup(nrf_amf_set_access_token_uri->valuestring) : NULL, + target_amf_service_set ? ogs_strdup(target_amf_service_set->valuestring) : NULL ); return authorized_network_slice_info_local_var; diff --git a/lib/sbi/openapi/model/av5_ghe_aka.c b/lib/sbi/openapi/model/av5_ghe_aka.c index 216a304ac..e13cb5526 100644 --- a/lib/sbi/openapi/model/av5_ghe_aka.c +++ b/lib/sbi/openapi/model/av5_ghe_aka.c @@ -12,10 +12,9 @@ OpenAPI_av5_ghe_aka_t *OpenAPI_av5_ghe_aka_create( char *kausf ) { - OpenAPI_av5_ghe_aka_t *av5_ghe_aka_local_var = OpenAPI_malloc(sizeof(OpenAPI_av5_ghe_aka_t)); - if (!av5_ghe_aka_local_var) { - return NULL; - } + OpenAPI_av5_ghe_aka_t *av5_ghe_aka_local_var = ogs_malloc(sizeof(OpenAPI_av5_ghe_aka_t)); + ogs_assert(av5_ghe_aka_local_var); + av5_ghe_aka_local_var->av_type = av_type; av5_ghe_aka_local_var->rand = rand; av5_ghe_aka_local_var->xres_star = xres_star; @@ -139,10 +138,10 @@ OpenAPI_av5_ghe_aka_t *OpenAPI_av5_ghe_aka_parseFromJSON(cJSON *av5_ghe_akaJSON) av5_ghe_aka_local_var = OpenAPI_av5_ghe_aka_create ( av_typeVariable, - ogs_strdup_or_assert(rand->valuestring), - xres_star ? ogs_strdup_or_assert(xres_star->valuestring) : NULL, - ogs_strdup_or_assert(autn->valuestring), - kausf ? ogs_strdup_or_assert(kausf->valuestring) : NULL + ogs_strdup(rand->valuestring), + xres_star ? ogs_strdup(xres_star->valuestring) : NULL, + ogs_strdup(autn->valuestring), + kausf ? ogs_strdup(kausf->valuestring) : NULL ); return av5_ghe_aka_local_var; diff --git a/lib/sbi/openapi/model/av5g_aka.c b/lib/sbi/openapi/model/av5g_aka.c index 07edd940f..5436a98c2 100644 --- a/lib/sbi/openapi/model/av5g_aka.c +++ b/lib/sbi/openapi/model/av5g_aka.c @@ -10,10 +10,9 @@ OpenAPI_av5g_aka_t *OpenAPI_av5g_aka_create( char *autn ) { - OpenAPI_av5g_aka_t *av5g_aka_local_var = OpenAPI_malloc(sizeof(OpenAPI_av5g_aka_t)); - if (!av5g_aka_local_var) { - return NULL; - } + OpenAPI_av5g_aka_t *av5g_aka_local_var = ogs_malloc(sizeof(OpenAPI_av5g_aka_t)); + ogs_assert(av5g_aka_local_var); + av5g_aka_local_var->rand = rand; av5g_aka_local_var->hxres_star = hxres_star; av5g_aka_local_var->autn = autn; @@ -99,9 +98,9 @@ OpenAPI_av5g_aka_t *OpenAPI_av5g_aka_parseFromJSON(cJSON *av5g_akaJSON) } av5g_aka_local_var = OpenAPI_av5g_aka_create ( - ogs_strdup_or_assert(rand->valuestring), - ogs_strdup_or_assert(hxres_star->valuestring), - ogs_strdup_or_assert(autn->valuestring) + ogs_strdup(rand->valuestring), + ogs_strdup(hxres_star->valuestring), + ogs_strdup(autn->valuestring) ); return av5g_aka_local_var; diff --git a/lib/sbi/openapi/model/av_eap_aka_prime.c b/lib/sbi/openapi/model/av_eap_aka_prime.c index 5ccb263f7..0a788b47d 100644 --- a/lib/sbi/openapi/model/av_eap_aka_prime.c +++ b/lib/sbi/openapi/model/av_eap_aka_prime.c @@ -13,10 +13,9 @@ OpenAPI_av_eap_aka_prime_t *OpenAPI_av_eap_aka_prime_create( char *ik_prime ) { - OpenAPI_av_eap_aka_prime_t *av_eap_aka_prime_local_var = OpenAPI_malloc(sizeof(OpenAPI_av_eap_aka_prime_t)); - if (!av_eap_aka_prime_local_var) { - return NULL; - } + OpenAPI_av_eap_aka_prime_t *av_eap_aka_prime_local_var = ogs_malloc(sizeof(OpenAPI_av_eap_aka_prime_t)); + ogs_assert(av_eap_aka_prime_local_var); + av_eap_aka_prime_local_var->av_type = av_type; av_eap_aka_prime_local_var->rand = rand; av_eap_aka_prime_local_var->xres = xres; @@ -158,11 +157,11 @@ OpenAPI_av_eap_aka_prime_t *OpenAPI_av_eap_aka_prime_parseFromJSON(cJSON *av_eap av_eap_aka_prime_local_var = OpenAPI_av_eap_aka_prime_create ( av_typeVariable, - ogs_strdup_or_assert(rand->valuestring), - xres ? ogs_strdup_or_assert(xres->valuestring) : NULL, - ogs_strdup_or_assert(autn->valuestring), - ck_prime ? ogs_strdup_or_assert(ck_prime->valuestring) : NULL, - ik_prime ? ogs_strdup_or_assert(ik_prime->valuestring) : NULL + ogs_strdup(rand->valuestring), + xres ? ogs_strdup(xres->valuestring) : NULL, + ogs_strdup(autn->valuestring), + ck_prime ? ogs_strdup(ck_prime->valuestring) : NULL, + ik_prime ? ogs_strdup(ik_prime->valuestring) : NULL ); return av_eap_aka_prime_local_var; diff --git a/lib/sbi/openapi/model/av_eps_aka.c b/lib/sbi/openapi/model/av_eps_aka.c index 507fdc3c0..33c3f153f 100644 --- a/lib/sbi/openapi/model/av_eps_aka.c +++ b/lib/sbi/openapi/model/av_eps_aka.c @@ -12,10 +12,9 @@ OpenAPI_av_eps_aka_t *OpenAPI_av_eps_aka_create( char *kasme ) { - OpenAPI_av_eps_aka_t *av_eps_aka_local_var = OpenAPI_malloc(sizeof(OpenAPI_av_eps_aka_t)); - if (!av_eps_aka_local_var) { - return NULL; - } + OpenAPI_av_eps_aka_t *av_eps_aka_local_var = ogs_malloc(sizeof(OpenAPI_av_eps_aka_t)); + ogs_assert(av_eps_aka_local_var); + av_eps_aka_local_var->av_type = av_type; av_eps_aka_local_var->rand = rand; av_eps_aka_local_var->xres = xres; @@ -139,10 +138,10 @@ OpenAPI_av_eps_aka_t *OpenAPI_av_eps_aka_parseFromJSON(cJSON *av_eps_akaJSON) av_eps_aka_local_var = OpenAPI_av_eps_aka_create ( av_typeVariable, - ogs_strdup_or_assert(rand->valuestring), - ogs_strdup_or_assert(xres->valuestring), - ogs_strdup_or_assert(autn->valuestring), - ogs_strdup_or_assert(kasme->valuestring) + ogs_strdup(rand->valuestring), + ogs_strdup(xres->valuestring), + ogs_strdup(autn->valuestring), + ogs_strdup(kasme->valuestring) ); return av_eps_aka_local_var; diff --git a/lib/sbi/openapi/model/av_ims_gba_eap_aka.c b/lib/sbi/openapi/model/av_ims_gba_eap_aka.c index 9223a206c..31f29d18d 100644 --- a/lib/sbi/openapi/model/av_ims_gba_eap_aka.c +++ b/lib/sbi/openapi/model/av_ims_gba_eap_aka.c @@ -13,10 +13,9 @@ OpenAPI_av_ims_gba_eap_aka_t *OpenAPI_av_ims_gba_eap_aka_create( char *ik ) { - OpenAPI_av_ims_gba_eap_aka_t *av_ims_gba_eap_aka_local_var = OpenAPI_malloc(sizeof(OpenAPI_av_ims_gba_eap_aka_t)); - if (!av_ims_gba_eap_aka_local_var) { - return NULL; - } + OpenAPI_av_ims_gba_eap_aka_t *av_ims_gba_eap_aka_local_var = ogs_malloc(sizeof(OpenAPI_av_ims_gba_eap_aka_t)); + ogs_assert(av_ims_gba_eap_aka_local_var); + av_ims_gba_eap_aka_local_var->av_type = av_type; av_ims_gba_eap_aka_local_var->rand = rand; av_ims_gba_eap_aka_local_var->xres = xres; @@ -158,11 +157,11 @@ OpenAPI_av_ims_gba_eap_aka_t *OpenAPI_av_ims_gba_eap_aka_parseFromJSON(cJSON *av av_ims_gba_eap_aka_local_var = OpenAPI_av_ims_gba_eap_aka_create ( av_typeVariable, - ogs_strdup_or_assert(rand->valuestring), - ogs_strdup_or_assert(xres->valuestring), - ogs_strdup_or_assert(autn->valuestring), - ogs_strdup_or_assert(ck->valuestring), - ogs_strdup_or_assert(ik->valuestring) + ogs_strdup(rand->valuestring), + ogs_strdup(xres->valuestring), + ogs_strdup(autn->valuestring), + ogs_strdup(ck->valuestring), + ogs_strdup(ik->valuestring) ); return av_ims_gba_eap_aka_local_var; diff --git a/lib/sbi/openapi/model/backup_amf_info.c b/lib/sbi/openapi/model/backup_amf_info.c index 8255d9d32..289f1ed70 100644 --- a/lib/sbi/openapi/model/backup_amf_info.c +++ b/lib/sbi/openapi/model/backup_amf_info.c @@ -9,10 +9,9 @@ OpenAPI_backup_amf_info_t *OpenAPI_backup_amf_info_create( OpenAPI_list_t *guami_list ) { - OpenAPI_backup_amf_info_t *backup_amf_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_backup_amf_info_t)); - if (!backup_amf_info_local_var) { - return NULL; - } + OpenAPI_backup_amf_info_t *backup_amf_info_local_var = ogs_malloc(sizeof(OpenAPI_backup_amf_info_t)); + ogs_assert(backup_amf_info_local_var); + backup_amf_info_local_var->backup_amf = backup_amf; backup_amf_info_local_var->guami_list = guami_list; @@ -110,7 +109,7 @@ OpenAPI_backup_amf_info_t *OpenAPI_backup_amf_info_parseFromJSON(cJSON *backup_a } backup_amf_info_local_var = OpenAPI_backup_amf_info_create ( - ogs_strdup_or_assert(backup_amf->valuestring), + ogs_strdup(backup_amf->valuestring), guami_list ? guami_listList : NULL ); diff --git a/lib/sbi/openapi/model/battery_indication.c b/lib/sbi/openapi/model/battery_indication.c index 15ff054ff..c41566732 100644 --- a/lib/sbi/openapi/model/battery_indication.c +++ b/lib/sbi/openapi/model/battery_indication.c @@ -13,10 +13,9 @@ OpenAPI_battery_indication_t *OpenAPI_battery_indication_create( int rechargeable_ind ) { - OpenAPI_battery_indication_t *battery_indication_local_var = OpenAPI_malloc(sizeof(OpenAPI_battery_indication_t)); - if (!battery_indication_local_var) { - return NULL; - } + OpenAPI_battery_indication_t *battery_indication_local_var = ogs_malloc(sizeof(OpenAPI_battery_indication_t)); + ogs_assert(battery_indication_local_var); + battery_indication_local_var->is_battery_ind = is_battery_ind; battery_indication_local_var->battery_ind = battery_ind; battery_indication_local_var->is_replaceable_ind = is_replaceable_ind; diff --git a/lib/sbi/openapi/model/battery_indication_rm.c b/lib/sbi/openapi/model/battery_indication_rm.c index 6b787b28a..5bc37ca82 100644 --- a/lib/sbi/openapi/model/battery_indication_rm.c +++ b/lib/sbi/openapi/model/battery_indication_rm.c @@ -13,10 +13,9 @@ OpenAPI_battery_indication_rm_t *OpenAPI_battery_indication_rm_create( int rechargeable_ind ) { - OpenAPI_battery_indication_rm_t *battery_indication_rm_local_var = OpenAPI_malloc(sizeof(OpenAPI_battery_indication_rm_t)); - if (!battery_indication_rm_local_var) { - return NULL; - } + OpenAPI_battery_indication_rm_t *battery_indication_rm_local_var = ogs_malloc(sizeof(OpenAPI_battery_indication_rm_t)); + ogs_assert(battery_indication_rm_local_var); + battery_indication_rm_local_var->is_battery_ind = is_battery_ind; battery_indication_rm_local_var->battery_ind = battery_ind; battery_indication_rm_local_var->is_replaceable_ind = is_replaceable_ind; diff --git a/lib/sbi/openapi/model/bdt_data.c b/lib/sbi/openapi/model/bdt_data.c index a7feeb465..008c6116c 100644 --- a/lib/sbi/openapi/model/bdt_data.c +++ b/lib/sbi/openapi/model/bdt_data.c @@ -19,10 +19,9 @@ OpenAPI_bdt_data_t *OpenAPI_bdt_data_create( char *supp_feat ) { - OpenAPI_bdt_data_t *bdt_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_bdt_data_t)); - if (!bdt_data_local_var) { - return NULL; - } + OpenAPI_bdt_data_t *bdt_data_local_var = ogs_malloc(sizeof(OpenAPI_bdt_data_t)); + ogs_assert(bdt_data_local_var); + bdt_data_local_var->asp_id = asp_id; bdt_data_local_var->trans_policy = trans_policy; bdt_data_local_var->bdt_ref_id = bdt_ref_id; @@ -272,18 +271,18 @@ OpenAPI_bdt_data_t *OpenAPI_bdt_data_parseFromJSON(cJSON *bdt_dataJSON) } bdt_data_local_var = OpenAPI_bdt_data_create ( - ogs_strdup_or_assert(asp_id->valuestring), + ogs_strdup(asp_id->valuestring), trans_policy_local_nonprim, - bdt_ref_id ? ogs_strdup_or_assert(bdt_ref_id->valuestring) : NULL, + bdt_ref_id ? ogs_strdup(bdt_ref_id->valuestring) : NULL, nw_area_info ? nw_area_info_local_nonprim : NULL, num_of_ues ? true : false, num_of_ues ? num_of_ues->valuedouble : 0, vol_per_ue ? vol_per_ue_local_nonprim : NULL, - dnn ? ogs_strdup_or_assert(dnn->valuestring) : NULL, + dnn ? ogs_strdup(dnn->valuestring) : NULL, snssai ? snssai_local_nonprim : NULL, - traffic_des ? ogs_strdup_or_assert(traffic_des->valuestring) : NULL, + traffic_des ? ogs_strdup(traffic_des->valuestring) : NULL, bdtp_status ? bdtp_status_local_nonprim : NULL, - supp_feat ? ogs_strdup_or_assert(supp_feat->valuestring) : NULL + supp_feat ? ogs_strdup(supp_feat->valuestring) : NULL ); return bdt_data_local_var; diff --git a/lib/sbi/openapi/model/bdt_data_patch.c b/lib/sbi/openapi/model/bdt_data_patch.c index 952720fe3..352c261a9 100644 --- a/lib/sbi/openapi/model/bdt_data_patch.c +++ b/lib/sbi/openapi/model/bdt_data_patch.c @@ -9,10 +9,9 @@ OpenAPI_bdt_data_patch_t *OpenAPI_bdt_data_patch_create( OpenAPI_bdt_policy_status_t *bdtp_status ) { - OpenAPI_bdt_data_patch_t *bdt_data_patch_local_var = OpenAPI_malloc(sizeof(OpenAPI_bdt_data_patch_t)); - if (!bdt_data_patch_local_var) { - return NULL; - } + OpenAPI_bdt_data_patch_t *bdt_data_patch_local_var = ogs_malloc(sizeof(OpenAPI_bdt_data_patch_t)); + ogs_assert(bdt_data_patch_local_var); + bdt_data_patch_local_var->trans_policy = trans_policy; bdt_data_patch_local_var->bdtp_status = bdtp_status; diff --git a/lib/sbi/openapi/model/bdt_policy_data.c b/lib/sbi/openapi/model/bdt_policy_data.c index f62a8a45b..81b15d455 100644 --- a/lib/sbi/openapi/model/bdt_policy_data.c +++ b/lib/sbi/openapi/model/bdt_policy_data.c @@ -13,10 +13,9 @@ OpenAPI_bdt_policy_data_t *OpenAPI_bdt_policy_data_create( char *res_uri ) { - OpenAPI_bdt_policy_data_t *bdt_policy_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_bdt_policy_data_t)); - if (!bdt_policy_data_local_var) { - return NULL; - } + OpenAPI_bdt_policy_data_t *bdt_policy_data_local_var = ogs_malloc(sizeof(OpenAPI_bdt_policy_data_t)); + ogs_assert(bdt_policy_data_local_var); + bdt_policy_data_local_var->inter_group_id = inter_group_id; bdt_policy_data_local_var->supi = supi; bdt_policy_data_local_var->bdt_ref_id = bdt_ref_id; @@ -160,12 +159,12 @@ OpenAPI_bdt_policy_data_t *OpenAPI_bdt_policy_data_parseFromJSON(cJSON *bdt_poli } bdt_policy_data_local_var = OpenAPI_bdt_policy_data_create ( - inter_group_id ? ogs_strdup_or_assert(inter_group_id->valuestring) : NULL, - supi ? ogs_strdup_or_assert(supi->valuestring) : NULL, - ogs_strdup_or_assert(bdt_ref_id->valuestring), - dnn ? ogs_strdup_or_assert(dnn->valuestring) : NULL, + inter_group_id ? ogs_strdup(inter_group_id->valuestring) : NULL, + supi ? ogs_strdup(supi->valuestring) : NULL, + ogs_strdup(bdt_ref_id->valuestring), + dnn ? ogs_strdup(dnn->valuestring) : NULL, snssai ? snssai_local_nonprim : NULL, - res_uri ? ogs_strdup_or_assert(res_uri->valuestring) : NULL + res_uri ? ogs_strdup(res_uri->valuestring) : NULL ); return bdt_policy_data_local_var; diff --git a/lib/sbi/openapi/model/bdt_policy_data_patch.c b/lib/sbi/openapi/model/bdt_policy_data_patch.c index 299059e0c..3869c4ff9 100644 --- a/lib/sbi/openapi/model/bdt_policy_data_patch.c +++ b/lib/sbi/openapi/model/bdt_policy_data_patch.c @@ -8,10 +8,9 @@ OpenAPI_bdt_policy_data_patch_t *OpenAPI_bdt_policy_data_patch_create( char *bdt_ref_id ) { - OpenAPI_bdt_policy_data_patch_t *bdt_policy_data_patch_local_var = OpenAPI_malloc(sizeof(OpenAPI_bdt_policy_data_patch_t)); - if (!bdt_policy_data_patch_local_var) { - return NULL; - } + OpenAPI_bdt_policy_data_patch_t *bdt_policy_data_patch_local_var = ogs_malloc(sizeof(OpenAPI_bdt_policy_data_patch_t)); + ogs_assert(bdt_policy_data_patch_local_var); + bdt_policy_data_patch_local_var->bdt_ref_id = bdt_ref_id; return bdt_policy_data_patch_local_var; @@ -61,7 +60,7 @@ OpenAPI_bdt_policy_data_patch_t *OpenAPI_bdt_policy_data_patch_parseFromJSON(cJS } bdt_policy_data_patch_local_var = OpenAPI_bdt_policy_data_patch_create ( - ogs_strdup_or_assert(bdt_ref_id->valuestring) + ogs_strdup(bdt_ref_id->valuestring) ); return bdt_policy_data_patch_local_var; diff --git a/lib/sbi/openapi/model/bdt_policy_status.c b/lib/sbi/openapi/model/bdt_policy_status.c index 27f7d8ac4..572d81c21 100644 --- a/lib/sbi/openapi/model/bdt_policy_status.c +++ b/lib/sbi/openapi/model/bdt_policy_status.c @@ -7,10 +7,9 @@ OpenAPI_bdt_policy_status_t *OpenAPI_bdt_policy_status_create( ) { - OpenAPI_bdt_policy_status_t *bdt_policy_status_local_var = OpenAPI_malloc(sizeof(OpenAPI_bdt_policy_status_t)); - if (!bdt_policy_status_local_var) { - return NULL; - } + OpenAPI_bdt_policy_status_t *bdt_policy_status_local_var = ogs_malloc(sizeof(OpenAPI_bdt_policy_status_t)); + ogs_assert(bdt_policy_status_local_var); + return bdt_policy_status_local_var; } diff --git a/lib/sbi/openapi/model/binding_resp.c b/lib/sbi/openapi/model/binding_resp.c index e33decc52..a722dc033 100644 --- a/lib/sbi/openapi/model/binding_resp.c +++ b/lib/sbi/openapi/model/binding_resp.c @@ -9,10 +9,9 @@ OpenAPI_binding_resp_t *OpenAPI_binding_resp_create( OpenAPI_list_t *pcf_sm_ip_end_points ) { - OpenAPI_binding_resp_t *binding_resp_local_var = OpenAPI_malloc(sizeof(OpenAPI_binding_resp_t)); - if (!binding_resp_local_var) { - return NULL; - } + OpenAPI_binding_resp_t *binding_resp_local_var = ogs_malloc(sizeof(OpenAPI_binding_resp_t)); + ogs_assert(binding_resp_local_var); + binding_resp_local_var->pcf_sm_fqdn = pcf_sm_fqdn; binding_resp_local_var->pcf_sm_ip_end_points = pcf_sm_ip_end_points; @@ -110,7 +109,7 @@ OpenAPI_binding_resp_t *OpenAPI_binding_resp_parseFromJSON(cJSON *binding_respJS } binding_resp_local_var = OpenAPI_binding_resp_create ( - pcf_sm_fqdn ? ogs_strdup_or_assert(pcf_sm_fqdn->valuestring) : NULL, + pcf_sm_fqdn ? ogs_strdup(pcf_sm_fqdn->valuestring) : NULL, pcf_sm_ip_end_points ? pcf_sm_ip_end_pointsList : NULL ); diff --git a/lib/sbi/openapi/model/bridge_management_container.c b/lib/sbi/openapi/model/bridge_management_container.c index 195fc3b88..0317d66a6 100644 --- a/lib/sbi/openapi/model/bridge_management_container.c +++ b/lib/sbi/openapi/model/bridge_management_container.c @@ -8,10 +8,9 @@ OpenAPI_bridge_management_container_t *OpenAPI_bridge_management_container_creat char bridge_man_cont ) { - OpenAPI_bridge_management_container_t *bridge_management_container_local_var = OpenAPI_malloc(sizeof(OpenAPI_bridge_management_container_t)); - if (!bridge_management_container_local_var) { - return NULL; - } + OpenAPI_bridge_management_container_t *bridge_management_container_local_var = ogs_malloc(sizeof(OpenAPI_bridge_management_container_t)); + ogs_assert(bridge_management_container_local_var); + bridge_management_container_local_var->bridge_man_cont = bridge_man_cont; return bridge_management_container_local_var; diff --git a/lib/sbi/openapi/model/bsf_info.c b/lib/sbi/openapi/model/bsf_info.c index e69dafc6d..7535677d1 100644 --- a/lib/sbi/openapi/model/bsf_info.c +++ b/lib/sbi/openapi/model/bsf_info.c @@ -11,10 +11,9 @@ OpenAPI_bsf_info_t *OpenAPI_bsf_info_create( OpenAPI_list_t *ipv6_prefix_ranges ) { - OpenAPI_bsf_info_t *bsf_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_bsf_info_t)); - if (!bsf_info_local_var) { - return NULL; - } + OpenAPI_bsf_info_t *bsf_info_local_var = ogs_malloc(sizeof(OpenAPI_bsf_info_t)); + ogs_assert(bsf_info_local_var); + bsf_info_local_var->dnn_list = dnn_list; bsf_info_local_var->ip_domain_list = ip_domain_list; bsf_info_local_var->ipv4_address_ranges = ipv4_address_ranges; @@ -153,7 +152,7 @@ OpenAPI_bsf_info_t *OpenAPI_bsf_info_parseFromJSON(cJSON *bsf_infoJSON) ogs_error("OpenAPI_bsf_info_parseFromJSON() failed [dnn_list]"); goto end; } - OpenAPI_list_add(dnn_listList , ogs_strdup_or_assert(dnn_list_local->valuestring)); + OpenAPI_list_add(dnn_listList , ogs_strdup(dnn_list_local->valuestring)); } } @@ -173,7 +172,7 @@ OpenAPI_bsf_info_t *OpenAPI_bsf_info_parseFromJSON(cJSON *bsf_infoJSON) ogs_error("OpenAPI_bsf_info_parseFromJSON() failed [ip_domain_list]"); goto end; } - OpenAPI_list_add(ip_domain_listList , ogs_strdup_or_assert(ip_domain_list_local->valuestring)); + OpenAPI_list_add(ip_domain_listList , ogs_strdup(ip_domain_list_local->valuestring)); } } diff --git a/lib/sbi/openapi/model/cag_ack_data.c b/lib/sbi/openapi/model/cag_ack_data.c index 74c2e3bcc..962c8832b 100644 --- a/lib/sbi/openapi/model/cag_ack_data.c +++ b/lib/sbi/openapi/model/cag_ack_data.c @@ -9,10 +9,9 @@ OpenAPI_cag_ack_data_t *OpenAPI_cag_ack_data_create( OpenAPI_ue_update_status_e ue_update_status ) { - OpenAPI_cag_ack_data_t *cag_ack_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_cag_ack_data_t)); - if (!cag_ack_data_local_var) { - return NULL; - } + OpenAPI_cag_ack_data_t *cag_ack_data_local_var = ogs_malloc(sizeof(OpenAPI_cag_ack_data_t)); + ogs_assert(cag_ack_data_local_var); + cag_ack_data_local_var->provisioning_time = provisioning_time; cag_ack_data_local_var->ue_update_status = ue_update_status; @@ -81,7 +80,7 @@ OpenAPI_cag_ack_data_t *OpenAPI_cag_ack_data_parseFromJSON(cJSON *cag_ack_dataJS ue_update_statusVariable = OpenAPI_ue_update_status_FromString(ue_update_status->valuestring); cag_ack_data_local_var = OpenAPI_cag_ack_data_create ( - ogs_strdup_or_assert(provisioning_time->valuestring), + ogs_strdup(provisioning_time->valuestring), ue_update_statusVariable ); diff --git a/lib/sbi/openapi/model/cag_data.c b/lib/sbi/openapi/model/cag_data.c index 021e2bb56..9113bbd6c 100644 --- a/lib/sbi/openapi/model/cag_data.c +++ b/lib/sbi/openapi/model/cag_data.c @@ -9,10 +9,9 @@ OpenAPI_cag_data_t *OpenAPI_cag_data_create( char *provisioning_time ) { - OpenAPI_cag_data_t *cag_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_cag_data_t)); - if (!cag_data_local_var) { - return NULL; - } + OpenAPI_cag_data_t *cag_data_local_var = ogs_malloc(sizeof(OpenAPI_cag_data_t)); + ogs_assert(cag_data_local_var); + cag_data_local_var->cag_infos = cag_infos; cag_data_local_var->provisioning_time = provisioning_time; @@ -27,6 +26,7 @@ void OpenAPI_cag_data_free(OpenAPI_cag_data_t *cag_data) OpenAPI_lnode_t *node; OpenAPI_list_for_each(cag_data->cag_infos, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_cag_info_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -98,9 +98,9 @@ OpenAPI_cag_data_t *OpenAPI_cag_data_parseFromJSON(cJSON *cag_dataJSON) cJSON *localMapObject = cag_infos_local_map; if (cJSON_IsObject(cag_infos_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_cag_info_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_cag_info_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(cag_infos_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_cag_data_parseFromJSON() failed [cag_infos]"); goto end; @@ -119,7 +119,7 @@ OpenAPI_cag_data_t *OpenAPI_cag_data_parseFromJSON(cJSON *cag_dataJSON) cag_data_local_var = OpenAPI_cag_data_create ( cag_infosList, - provisioning_time ? ogs_strdup_or_assert(provisioning_time->valuestring) : NULL + provisioning_time ? ogs_strdup(provisioning_time->valuestring) : NULL ); return cag_data_local_var; diff --git a/lib/sbi/openapi/model/cag_data_1.c b/lib/sbi/openapi/model/cag_data_1.c index 3d73967b8..6dbcf8273 100644 --- a/lib/sbi/openapi/model/cag_data_1.c +++ b/lib/sbi/openapi/model/cag_data_1.c @@ -9,10 +9,9 @@ OpenAPI_cag_data_1_t *OpenAPI_cag_data_1_create( char *provisioning_time ) { - OpenAPI_cag_data_1_t *cag_data_1_local_var = OpenAPI_malloc(sizeof(OpenAPI_cag_data_1_t)); - if (!cag_data_1_local_var) { - return NULL; - } + OpenAPI_cag_data_1_t *cag_data_1_local_var = ogs_malloc(sizeof(OpenAPI_cag_data_1_t)); + ogs_assert(cag_data_1_local_var); + cag_data_1_local_var->cag_infos = cag_infos; cag_data_1_local_var->provisioning_time = provisioning_time; @@ -27,6 +26,7 @@ void OpenAPI_cag_data_1_free(OpenAPI_cag_data_1_t *cag_data_1) OpenAPI_lnode_t *node; OpenAPI_list_for_each(cag_data_1->cag_infos, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_cag_info_1_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -98,9 +98,9 @@ OpenAPI_cag_data_1_t *OpenAPI_cag_data_1_parseFromJSON(cJSON *cag_data_1JSON) cJSON *localMapObject = cag_infos_local_map; if (cJSON_IsObject(cag_infos_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_cag_info_1_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_cag_info_1_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(cag_infos_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_cag_data_1_parseFromJSON() failed [cag_infos]"); goto end; @@ -119,7 +119,7 @@ OpenAPI_cag_data_1_t *OpenAPI_cag_data_1_parseFromJSON(cJSON *cag_data_1JSON) cag_data_1_local_var = OpenAPI_cag_data_1_create ( cag_infosList, - provisioning_time ? ogs_strdup_or_assert(provisioning_time->valuestring) : NULL + provisioning_time ? ogs_strdup(provisioning_time->valuestring) : NULL ); return cag_data_1_local_var; diff --git a/lib/sbi/openapi/model/cag_info.c b/lib/sbi/openapi/model/cag_info.c index d3bc60662..996180a30 100644 --- a/lib/sbi/openapi/model/cag_info.c +++ b/lib/sbi/openapi/model/cag_info.c @@ -10,10 +10,9 @@ OpenAPI_cag_info_t *OpenAPI_cag_info_create( int cag_only_indicator ) { - OpenAPI_cag_info_t *cag_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_cag_info_t)); - if (!cag_info_local_var) { - return NULL; - } + OpenAPI_cag_info_t *cag_info_local_var = ogs_malloc(sizeof(OpenAPI_cag_info_t)); + ogs_assert(cag_info_local_var); + cag_info_local_var->allowed_cag_list = allowed_cag_list; cag_info_local_var->is_cag_only_indicator = is_cag_only_indicator; cag_info_local_var->cag_only_indicator = cag_only_indicator; @@ -91,7 +90,7 @@ OpenAPI_cag_info_t *OpenAPI_cag_info_parseFromJSON(cJSON *cag_infoJSON) ogs_error("OpenAPI_cag_info_parseFromJSON() failed [allowed_cag_list]"); goto end; } - OpenAPI_list_add(allowed_cag_listList , ogs_strdup_or_assert(allowed_cag_list_local->valuestring)); + OpenAPI_list_add(allowed_cag_listList , ogs_strdup(allowed_cag_list_local->valuestring)); } cJSON *cag_only_indicator = cJSON_GetObjectItemCaseSensitive(cag_infoJSON, "cagOnlyIndicator"); diff --git a/lib/sbi/openapi/model/cag_info_1.c b/lib/sbi/openapi/model/cag_info_1.c index b79802041..8bf98b4fa 100644 --- a/lib/sbi/openapi/model/cag_info_1.c +++ b/lib/sbi/openapi/model/cag_info_1.c @@ -10,10 +10,9 @@ OpenAPI_cag_info_1_t *OpenAPI_cag_info_1_create( int cag_only_indicator ) { - OpenAPI_cag_info_1_t *cag_info_1_local_var = OpenAPI_malloc(sizeof(OpenAPI_cag_info_1_t)); - if (!cag_info_1_local_var) { - return NULL; - } + OpenAPI_cag_info_1_t *cag_info_1_local_var = ogs_malloc(sizeof(OpenAPI_cag_info_1_t)); + ogs_assert(cag_info_1_local_var); + cag_info_1_local_var->allowed_cag_list = allowed_cag_list; cag_info_1_local_var->is_cag_only_indicator = is_cag_only_indicator; cag_info_1_local_var->cag_only_indicator = cag_only_indicator; @@ -91,7 +90,7 @@ OpenAPI_cag_info_1_t *OpenAPI_cag_info_1_parseFromJSON(cJSON *cag_info_1JSON) ogs_error("OpenAPI_cag_info_1_parseFromJSON() failed [allowed_cag_list]"); goto end; } - OpenAPI_list_add(allowed_cag_listList , ogs_strdup_or_assert(allowed_cag_list_local->valuestring)); + OpenAPI_list_add(allowed_cag_listList , ogs_strdup(allowed_cag_list_local->valuestring)); } cJSON *cag_only_indicator = cJSON_GetObjectItemCaseSensitive(cag_info_1JSON, "cagOnlyIndicator"); diff --git a/lib/sbi/openapi/model/candidate_for_replacement.c b/lib/sbi/openapi/model/candidate_for_replacement.c index 4fe04744f..4e3783046 100644 --- a/lib/sbi/openapi/model/candidate_for_replacement.c +++ b/lib/sbi/openapi/model/candidate_for_replacement.c @@ -9,10 +9,9 @@ OpenAPI_candidate_for_replacement_t *OpenAPI_candidate_for_replacement_create( OpenAPI_list_t *dnns ) { - OpenAPI_candidate_for_replacement_t *candidate_for_replacement_local_var = OpenAPI_malloc(sizeof(OpenAPI_candidate_for_replacement_t)); - if (!candidate_for_replacement_local_var) { - return NULL; - } + OpenAPI_candidate_for_replacement_t *candidate_for_replacement_local_var = ogs_malloc(sizeof(OpenAPI_candidate_for_replacement_t)); + ogs_assert(candidate_for_replacement_local_var); + candidate_for_replacement_local_var->snssai = snssai; candidate_for_replacement_local_var->dnns = dnns; @@ -102,7 +101,7 @@ OpenAPI_candidate_for_replacement_t *OpenAPI_candidate_for_replacement_parseFrom ogs_error("OpenAPI_candidate_for_replacement_parseFromJSON() failed [dnns]"); goto end; } - OpenAPI_list_add(dnnsList , ogs_strdup_or_assert(dnns_local->valuestring)); + OpenAPI_list_add(dnnsList , ogs_strdup(dnns_local->valuestring)); } } diff --git a/lib/sbi/openapi/model/ce_mode_b_ind.c b/lib/sbi/openapi/model/ce_mode_b_ind.c index 89380db32..13334969b 100644 --- a/lib/sbi/openapi/model/ce_mode_b_ind.c +++ b/lib/sbi/openapi/model/ce_mode_b_ind.c @@ -8,10 +8,9 @@ OpenAPI_ce_mode_b_ind_t *OpenAPI_ce_mode_b_ind_create( int ce_mode_b_support_ind ) { - OpenAPI_ce_mode_b_ind_t *ce_mode_b_ind_local_var = OpenAPI_malloc(sizeof(OpenAPI_ce_mode_b_ind_t)); - if (!ce_mode_b_ind_local_var) { - return NULL; - } + OpenAPI_ce_mode_b_ind_t *ce_mode_b_ind_local_var = ogs_malloc(sizeof(OpenAPI_ce_mode_b_ind_t)); + ogs_assert(ce_mode_b_ind_local_var); + ce_mode_b_ind_local_var->ce_mode_b_support_ind = ce_mode_b_support_ind; return ce_mode_b_ind_local_var; diff --git a/lib/sbi/openapi/model/change_item.c b/lib/sbi/openapi/model/change_item.c index 9dcb07dca..c20a4cf53 100644 --- a/lib/sbi/openapi/model/change_item.c +++ b/lib/sbi/openapi/model/change_item.c @@ -12,10 +12,9 @@ OpenAPI_change_item_t *OpenAPI_change_item_create( char *new_value ) { - OpenAPI_change_item_t *change_item_local_var = OpenAPI_malloc(sizeof(OpenAPI_change_item_t)); - if (!change_item_local_var) { - return NULL; - } + OpenAPI_change_item_t *change_item_local_var = ogs_malloc(sizeof(OpenAPI_change_item_t)); + ogs_assert(change_item_local_var); + change_item_local_var->op = op; change_item_local_var->path = path; change_item_local_var->from = from; @@ -139,10 +138,10 @@ OpenAPI_change_item_t *OpenAPI_change_item_parseFromJSON(cJSON *change_itemJSON) change_item_local_var = OpenAPI_change_item_create ( opVariable, - ogs_strdup_or_assert(path->valuestring), - from ? ogs_strdup_or_assert(from->valuestring) : NULL, - orig_value ? ogs_strdup_or_assert(orig_value->valuestring) : NULL, - new_value ? ogs_strdup_or_assert(new_value->valuestring) : NULL + ogs_strdup(path->valuestring), + from ? ogs_strdup(from->valuestring) : NULL, + orig_value ? ogs_strdup(orig_value->valuestring) : NULL, + new_value ? ogs_strdup(new_value->valuestring) : NULL ); return change_item_local_var; diff --git a/lib/sbi/openapi/model/charging_data.c b/lib/sbi/openapi/model/charging_data.c index c45c1bba2..f1d0ac23f 100644 --- a/lib/sbi/openapi/model/charging_data.c +++ b/lib/sbi/openapi/model/charging_data.c @@ -25,10 +25,9 @@ OpenAPI_charging_data_t *OpenAPI_charging_data_create( char *af_charg_id ) { - OpenAPI_charging_data_t *charging_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_charging_data_t)); - if (!charging_data_local_var) { - return NULL; - } + OpenAPI_charging_data_t *charging_data_local_var = ogs_malloc(sizeof(OpenAPI_charging_data_t)); + ogs_assert(charging_data_local_var); + charging_data_local_var->chg_id = chg_id; charging_data_local_var->metering_method = metering_method; charging_data_local_var->is_offline = is_offline; @@ -278,7 +277,7 @@ OpenAPI_charging_data_t *OpenAPI_charging_data_parseFromJSON(cJSON *charging_dat } charging_data_local_var = OpenAPI_charging_data_create ( - ogs_strdup_or_assert(chg_id->valuestring), + ogs_strdup(chg_id->valuestring), metering_method ? metering_methodVariable : 0, offline ? true : false, offline ? offline->valueint : 0, @@ -291,11 +290,11 @@ OpenAPI_charging_data_t *OpenAPI_charging_data_parseFromJSON(cJSON *charging_dat reporting_level ? reporting_levelVariable : 0, service_id ? true : false, service_id ? service_id->valuedouble : 0, - sponsor_id ? ogs_strdup_or_assert(sponsor_id->valuestring) : NULL, - app_svc_prov_id ? ogs_strdup_or_assert(app_svc_prov_id->valuestring) : NULL, + sponsor_id ? ogs_strdup(sponsor_id->valuestring) : NULL, + app_svc_prov_id ? ogs_strdup(app_svc_prov_id->valuestring) : NULL, af_charging_identifier ? true : false, af_charging_identifier ? af_charging_identifier->valuedouble : 0, - af_charg_id ? ogs_strdup_or_assert(af_charg_id->valuestring) : NULL + af_charg_id ? ogs_strdup(af_charg_id->valuestring) : NULL ); return charging_data_local_var; diff --git a/lib/sbi/openapi/model/charging_information.c b/lib/sbi/openapi/model/charging_information.c index 80e0b0b4a..f4eb604a5 100644 --- a/lib/sbi/openapi/model/charging_information.c +++ b/lib/sbi/openapi/model/charging_information.c @@ -13,10 +13,9 @@ OpenAPI_charging_information_t *OpenAPI_charging_information_create( char *secondary_chf_instance_id ) { - OpenAPI_charging_information_t *charging_information_local_var = OpenAPI_malloc(sizeof(OpenAPI_charging_information_t)); - if (!charging_information_local_var) { - return NULL; - } + OpenAPI_charging_information_t *charging_information_local_var = ogs_malloc(sizeof(OpenAPI_charging_information_t)); + ogs_assert(charging_information_local_var); + charging_information_local_var->primary_chf_address = primary_chf_address; charging_information_local_var->secondary_chf_address = secondary_chf_address; charging_information_local_var->primary_chf_set_id = primary_chf_set_id; @@ -156,12 +155,12 @@ OpenAPI_charging_information_t *OpenAPI_charging_information_parseFromJSON(cJSON } charging_information_local_var = OpenAPI_charging_information_create ( - ogs_strdup_or_assert(primary_chf_address->valuestring), - ogs_strdup_or_assert(secondary_chf_address->valuestring), - primary_chf_set_id ? ogs_strdup_or_assert(primary_chf_set_id->valuestring) : NULL, - primary_chf_instance_id ? ogs_strdup_or_assert(primary_chf_instance_id->valuestring) : NULL, - secondary_chf_set_id ? ogs_strdup_or_assert(secondary_chf_set_id->valuestring) : NULL, - secondary_chf_instance_id ? ogs_strdup_or_assert(secondary_chf_instance_id->valuestring) : NULL + ogs_strdup(primary_chf_address->valuestring), + ogs_strdup(secondary_chf_address->valuestring), + primary_chf_set_id ? ogs_strdup(primary_chf_set_id->valuestring) : NULL, + primary_chf_instance_id ? ogs_strdup(primary_chf_instance_id->valuestring) : NULL, + secondary_chf_set_id ? ogs_strdup(secondary_chf_set_id->valuestring) : NULL, + secondary_chf_instance_id ? ogs_strdup(secondary_chf_instance_id->valuestring) : NULL ); return charging_information_local_var; diff --git a/lib/sbi/openapi/model/chf_info.c b/lib/sbi/openapi/model/chf_info.c index 640afa08d..bdf7bce5a 100644 --- a/lib/sbi/openapi/model/chf_info.c +++ b/lib/sbi/openapi/model/chf_info.c @@ -13,10 +13,9 @@ OpenAPI_chf_info_t *OpenAPI_chf_info_create( char *secondary_chf_instance ) { - OpenAPI_chf_info_t *chf_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_chf_info_t)); - if (!chf_info_local_var) { - return NULL; - } + OpenAPI_chf_info_t *chf_info_local_var = ogs_malloc(sizeof(OpenAPI_chf_info_t)); + ogs_assert(chf_info_local_var); + chf_info_local_var->supi_range_list = supi_range_list; chf_info_local_var->gpsi_range_list = gpsi_range_list; chf_info_local_var->plmn_range_list = plmn_range_list; @@ -249,9 +248,9 @@ OpenAPI_chf_info_t *OpenAPI_chf_info_parseFromJSON(cJSON *chf_infoJSON) supi_range_list ? supi_range_listList : NULL, gpsi_range_list ? gpsi_range_listList : NULL, plmn_range_list ? plmn_range_listList : NULL, - group_id ? ogs_strdup_or_assert(group_id->valuestring) : NULL, - primary_chf_instance ? ogs_strdup_or_assert(primary_chf_instance->valuestring) : NULL, - secondary_chf_instance ? ogs_strdup_or_assert(secondary_chf_instance->valuestring) : NULL + group_id ? ogs_strdup(group_id->valuestring) : NULL, + primary_chf_instance ? ogs_strdup(primary_chf_instance->valuestring) : NULL, + secondary_chf_instance ? ogs_strdup(secondary_chf_instance->valuestring) : NULL ); return chf_info_local_var; diff --git a/lib/sbi/openapi/model/civic_address.c b/lib/sbi/openapi/model/civic_address.c index 4239f4ad2..54542ed78 100644 --- a/lib/sbi/openapi/model/civic_address.c +++ b/lib/sbi/openapi/model/civic_address.c @@ -41,10 +41,9 @@ OpenAPI_civic_address_t *OpenAPI_civic_address_create( char *provided_by ) { - OpenAPI_civic_address_t *civic_address_local_var = OpenAPI_malloc(sizeof(OpenAPI_civic_address_t)); - if (!civic_address_local_var) { - return NULL; - } + OpenAPI_civic_address_t *civic_address_local_var = ogs_malloc(sizeof(OpenAPI_civic_address_t)); + ogs_assert(civic_address_local_var); + civic_address_local_var->country = country; civic_address_local_var->a1 = a1; civic_address_local_var->a2 = a2; @@ -688,40 +687,40 @@ OpenAPI_civic_address_t *OpenAPI_civic_address_parseFromJSON(cJSON *civic_addres } civic_address_local_var = OpenAPI_civic_address_create ( - country ? ogs_strdup_or_assert(country->valuestring) : NULL, - a1 ? ogs_strdup_or_assert(a1->valuestring) : NULL, - a2 ? ogs_strdup_or_assert(a2->valuestring) : NULL, - a3 ? ogs_strdup_or_assert(a3->valuestring) : NULL, - a4 ? ogs_strdup_or_assert(a4->valuestring) : NULL, - a5 ? ogs_strdup_or_assert(a5->valuestring) : NULL, - a6 ? ogs_strdup_or_assert(a6->valuestring) : NULL, - prd ? ogs_strdup_or_assert(prd->valuestring) : NULL, - pod ? ogs_strdup_or_assert(pod->valuestring) : NULL, - sts ? ogs_strdup_or_assert(sts->valuestring) : NULL, - hno ? ogs_strdup_or_assert(hno->valuestring) : NULL, - hns ? ogs_strdup_or_assert(hns->valuestring) : NULL, - lmk ? ogs_strdup_or_assert(lmk->valuestring) : NULL, - loc ? ogs_strdup_or_assert(loc->valuestring) : NULL, - nam ? ogs_strdup_or_assert(nam->valuestring) : NULL, - pc ? ogs_strdup_or_assert(pc->valuestring) : NULL, - bld ? ogs_strdup_or_assert(bld->valuestring) : NULL, - unit ? ogs_strdup_or_assert(unit->valuestring) : NULL, - flr ? ogs_strdup_or_assert(flr->valuestring) : NULL, - room ? ogs_strdup_or_assert(room->valuestring) : NULL, - plc ? ogs_strdup_or_assert(plc->valuestring) : NULL, - pcn ? ogs_strdup_or_assert(pcn->valuestring) : NULL, - pobox ? ogs_strdup_or_assert(pobox->valuestring) : NULL, - addcode ? ogs_strdup_or_assert(addcode->valuestring) : NULL, - seat ? ogs_strdup_or_assert(seat->valuestring) : NULL, - rd ? ogs_strdup_or_assert(rd->valuestring) : NULL, - rdsec ? ogs_strdup_or_assert(rdsec->valuestring) : NULL, - rdbr ? ogs_strdup_or_assert(rdbr->valuestring) : NULL, - rdsubbr ? ogs_strdup_or_assert(rdsubbr->valuestring) : NULL, - prm ? ogs_strdup_or_assert(prm->valuestring) : NULL, - pom ? ogs_strdup_or_assert(pom->valuestring) : NULL, - usage_rules ? ogs_strdup_or_assert(usage_rules->valuestring) : NULL, - method ? ogs_strdup_or_assert(method->valuestring) : NULL, - provided_by ? ogs_strdup_or_assert(provided_by->valuestring) : NULL + country ? ogs_strdup(country->valuestring) : NULL, + a1 ? ogs_strdup(a1->valuestring) : NULL, + a2 ? ogs_strdup(a2->valuestring) : NULL, + a3 ? ogs_strdup(a3->valuestring) : NULL, + a4 ? ogs_strdup(a4->valuestring) : NULL, + a5 ? ogs_strdup(a5->valuestring) : NULL, + a6 ? ogs_strdup(a6->valuestring) : NULL, + prd ? ogs_strdup(prd->valuestring) : NULL, + pod ? ogs_strdup(pod->valuestring) : NULL, + sts ? ogs_strdup(sts->valuestring) : NULL, + hno ? ogs_strdup(hno->valuestring) : NULL, + hns ? ogs_strdup(hns->valuestring) : NULL, + lmk ? ogs_strdup(lmk->valuestring) : NULL, + loc ? ogs_strdup(loc->valuestring) : NULL, + nam ? ogs_strdup(nam->valuestring) : NULL, + pc ? ogs_strdup(pc->valuestring) : NULL, + bld ? ogs_strdup(bld->valuestring) : NULL, + unit ? ogs_strdup(unit->valuestring) : NULL, + flr ? ogs_strdup(flr->valuestring) : NULL, + room ? ogs_strdup(room->valuestring) : NULL, + plc ? ogs_strdup(plc->valuestring) : NULL, + pcn ? ogs_strdup(pcn->valuestring) : NULL, + pobox ? ogs_strdup(pobox->valuestring) : NULL, + addcode ? ogs_strdup(addcode->valuestring) : NULL, + seat ? ogs_strdup(seat->valuestring) : NULL, + rd ? ogs_strdup(rd->valuestring) : NULL, + rdsec ? ogs_strdup(rdsec->valuestring) : NULL, + rdbr ? ogs_strdup(rdbr->valuestring) : NULL, + rdsubbr ? ogs_strdup(rdsubbr->valuestring) : NULL, + prm ? ogs_strdup(prm->valuestring) : NULL, + pom ? ogs_strdup(pom->valuestring) : NULL, + usage_rules ? ogs_strdup(usage_rules->valuestring) : NULL, + method ? ogs_strdup(method->valuestring) : NULL, + provided_by ? ogs_strdup(provided_by->valuestring) : NULL ); return civic_address_local_var; diff --git a/lib/sbi/openapi/model/cm_info.c b/lib/sbi/openapi/model/cm_info.c index c452afc20..651dcd62a 100644 --- a/lib/sbi/openapi/model/cm_info.c +++ b/lib/sbi/openapi/model/cm_info.c @@ -9,10 +9,9 @@ OpenAPI_cm_info_t *OpenAPI_cm_info_create( OpenAPI_access_type_e access_type ) { - OpenAPI_cm_info_t *cm_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_cm_info_t)); - if (!cm_info_local_var) { - return NULL; - } + OpenAPI_cm_info_t *cm_info_local_var = ogs_malloc(sizeof(OpenAPI_cm_info_t)); + ogs_assert(cm_info_local_var); + cm_info_local_var->cm_state = cm_state; cm_info_local_var->access_type = access_type; diff --git a/lib/sbi/openapi/model/cm_state.c b/lib/sbi/openapi/model/cm_state.c index 75c6060d6..7f8ea7f0c 100644 --- a/lib/sbi/openapi/model/cm_state.c +++ b/lib/sbi/openapi/model/cm_state.c @@ -7,10 +7,9 @@ OpenAPI_cm_state_t *OpenAPI_cm_state_create( ) { - OpenAPI_cm_state_t *cm_state_local_var = OpenAPI_malloc(sizeof(OpenAPI_cm_state_t)); - if (!cm_state_local_var) { - return NULL; - } + OpenAPI_cm_state_t *cm_state_local_var = ogs_malloc(sizeof(OpenAPI_cm_state_t)); + ogs_assert(cm_state_local_var); + return cm_state_local_var; } diff --git a/lib/sbi/openapi/model/cn_assisted_ran_para.c b/lib/sbi/openapi/model/cn_assisted_ran_para.c index 6d6035f5a..05bfedff0 100644 --- a/lib/sbi/openapi/model/cn_assisted_ran_para.c +++ b/lib/sbi/openapi/model/cn_assisted_ran_para.c @@ -16,10 +16,9 @@ OpenAPI_cn_assisted_ran_para_t *OpenAPI_cn_assisted_ran_para_create( OpenAPI_battery_indication_t *battery_indication ) { - OpenAPI_cn_assisted_ran_para_t *cn_assisted_ran_para_local_var = OpenAPI_malloc(sizeof(OpenAPI_cn_assisted_ran_para_t)); - if (!cn_assisted_ran_para_local_var) { - return NULL; - } + OpenAPI_cn_assisted_ran_para_t *cn_assisted_ran_para_local_var = ogs_malloc(sizeof(OpenAPI_cn_assisted_ran_para_t)); + ogs_assert(cn_assisted_ran_para_local_var); + cn_assisted_ran_para_local_var->stationary_indication = stationary_indication; cn_assisted_ran_para_local_var->is_communication_duration_time = is_communication_duration_time; cn_assisted_ran_para_local_var->communication_duration_time = communication_duration_time; diff --git a/lib/sbi/openapi/model/cnf.c b/lib/sbi/openapi/model/cnf.c index e43eb25db..263bed4c5 100644 --- a/lib/sbi/openapi/model/cnf.c +++ b/lib/sbi/openapi/model/cnf.c @@ -8,10 +8,9 @@ OpenAPI_cnf_t *OpenAPI_cnf_create( OpenAPI_list_t *cnf_units ) { - OpenAPI_cnf_t *cnf_local_var = OpenAPI_malloc(sizeof(OpenAPI_cnf_t)); - if (!cnf_local_var) { - return NULL; - } + OpenAPI_cnf_t *cnf_local_var = ogs_malloc(sizeof(OpenAPI_cnf_t)); + ogs_assert(cnf_local_var); + cnf_local_var->cnf_units = cnf_units; return cnf_local_var; diff --git a/lib/sbi/openapi/model/cnf_unit.c b/lib/sbi/openapi/model/cnf_unit.c index 31ce35b79..236e4648f 100644 --- a/lib/sbi/openapi/model/cnf_unit.c +++ b/lib/sbi/openapi/model/cnf_unit.c @@ -8,10 +8,9 @@ OpenAPI_cnf_unit_t *OpenAPI_cnf_unit_create( OpenAPI_list_t *cnf_unit ) { - OpenAPI_cnf_unit_t *cnf_unit_local_var = OpenAPI_malloc(sizeof(OpenAPI_cnf_unit_t)); - if (!cnf_unit_local_var) { - return NULL; - } + OpenAPI_cnf_unit_t *cnf_unit_local_var = ogs_malloc(sizeof(OpenAPI_cnf_unit_t)); + ogs_assert(cnf_unit_local_var); + cnf_unit_local_var->cnf_unit = cnf_unit; return cnf_unit_local_var; diff --git a/lib/sbi/openapi/model/communication_characteristics.c b/lib/sbi/openapi/model/communication_characteristics.c index e9f7d09e3..704a46da9 100644 --- a/lib/sbi/openapi/model/communication_characteristics.c +++ b/lib/sbi/openapi/model/communication_characteristics.c @@ -14,10 +14,9 @@ OpenAPI_communication_characteristics_t *OpenAPI_communication_characteristics_c OpenAPI_pp_maximum_latency_t *pp_maximum_latency ) { - OpenAPI_communication_characteristics_t *communication_characteristics_local_var = OpenAPI_malloc(sizeof(OpenAPI_communication_characteristics_t)); - if (!communication_characteristics_local_var) { - return NULL; - } + OpenAPI_communication_characteristics_t *communication_characteristics_local_var = ogs_malloc(sizeof(OpenAPI_communication_characteristics_t)); + ogs_assert(communication_characteristics_local_var); + communication_characteristics_local_var->pp_subs_reg_timer = pp_subs_reg_timer; communication_characteristics_local_var->pp_active_time = pp_active_time; communication_characteristics_local_var->is_pp_dl_packet_count = is_pp_dl_packet_count; diff --git a/lib/sbi/openapi/model/complex_query.c b/lib/sbi/openapi/model/complex_query.c index efe461357..b13854639 100644 --- a/lib/sbi/openapi/model/complex_query.c +++ b/lib/sbi/openapi/model/complex_query.c @@ -9,10 +9,9 @@ OpenAPI_complex_query_t *OpenAPI_complex_query_create( OpenAPI_list_t *dnf_units ) { - OpenAPI_complex_query_t *complex_query_local_var = OpenAPI_malloc(sizeof(OpenAPI_complex_query_t)); - if (!complex_query_local_var) { - return NULL; - } + OpenAPI_complex_query_t *complex_query_local_var = ogs_malloc(sizeof(OpenAPI_complex_query_t)); + ogs_assert(complex_query_local_var); + complex_query_local_var->cnf_units = cnf_units; complex_query_local_var->dnf_units = dnf_units; diff --git a/lib/sbi/openapi/model/condition_data.c b/lib/sbi/openapi/model/condition_data.c index 44d9dc108..cb5887042 100644 --- a/lib/sbi/openapi/model/condition_data.c +++ b/lib/sbi/openapi/model/condition_data.c @@ -12,10 +12,9 @@ OpenAPI_condition_data_t *OpenAPI_condition_data_create( OpenAPI_rat_type_e rat_type ) { - OpenAPI_condition_data_t *condition_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_condition_data_t)); - if (!condition_data_local_var) { - return NULL; - } + OpenAPI_condition_data_t *condition_data_local_var = ogs_malloc(sizeof(OpenAPI_condition_data_t)); + ogs_assert(condition_data_local_var); + condition_data_local_var->cond_id = cond_id; condition_data_local_var->activation_time = activation_time; condition_data_local_var->deactivation_time = deactivation_time; @@ -139,9 +138,9 @@ OpenAPI_condition_data_t *OpenAPI_condition_data_parseFromJSON(cJSON *condition_ } condition_data_local_var = OpenAPI_condition_data_create ( - ogs_strdup_or_assert(cond_id->valuestring), - activation_time ? ogs_strdup_or_assert(activation_time->valuestring) : NULL, - deactivation_time ? ogs_strdup_or_assert(deactivation_time->valuestring) : NULL, + ogs_strdup(cond_id->valuestring), + activation_time ? ogs_strdup(activation_time->valuestring) : NULL, + deactivation_time ? ogs_strdup(deactivation_time->valuestring) : NULL, access_type ? access_typeVariable : 0, rat_type ? rat_typeVariable : 0 ); diff --git a/lib/sbi/openapi/model/configured_snssai.c b/lib/sbi/openapi/model/configured_snssai.c index d2a6999b6..4db5f2df0 100644 --- a/lib/sbi/openapi/model/configured_snssai.c +++ b/lib/sbi/openapi/model/configured_snssai.c @@ -9,10 +9,9 @@ OpenAPI_configured_snssai_t *OpenAPI_configured_snssai_create( OpenAPI_snssai_t *mapped_home_snssai ) { - OpenAPI_configured_snssai_t *configured_snssai_local_var = OpenAPI_malloc(sizeof(OpenAPI_configured_snssai_t)); - if (!configured_snssai_local_var) { - return NULL; - } + OpenAPI_configured_snssai_t *configured_snssai_local_var = ogs_malloc(sizeof(OpenAPI_configured_snssai_t)); + ogs_assert(configured_snssai_local_var); + configured_snssai_local_var->configured_snssai = configured_snssai; configured_snssai_local_var->mapped_home_snssai = mapped_home_snssai; diff --git a/lib/sbi/openapi/model/confirmation_data.c b/lib/sbi/openapi/model/confirmation_data.c index aadad4020..ee0845e86 100644 --- a/lib/sbi/openapi/model/confirmation_data.c +++ b/lib/sbi/openapi/model/confirmation_data.c @@ -9,10 +9,9 @@ OpenAPI_confirmation_data_t *OpenAPI_confirmation_data_create( char *supported_features ) { - OpenAPI_confirmation_data_t *confirmation_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_confirmation_data_t)); - if (!confirmation_data_local_var) { - return NULL; - } + OpenAPI_confirmation_data_t *confirmation_data_local_var = ogs_malloc(sizeof(OpenAPI_confirmation_data_t)); + ogs_assert(confirmation_data_local_var); + confirmation_data_local_var->res_star = res_star; confirmation_data_local_var->supported_features = supported_features; @@ -80,8 +79,8 @@ OpenAPI_confirmation_data_t *OpenAPI_confirmation_data_parseFromJSON(cJSON *conf } confirmation_data_local_var = OpenAPI_confirmation_data_create ( - ogs_strdup_or_assert(res_star->valuestring), - supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL + ogs_strdup(res_star->valuestring), + supported_features ? ogs_strdup(supported_features->valuestring) : NULL ); return confirmation_data_local_var; diff --git a/lib/sbi/openapi/model/confirmation_data_response.c b/lib/sbi/openapi/model/confirmation_data_response.c index b785161e3..214e29f9a 100644 --- a/lib/sbi/openapi/model/confirmation_data_response.c +++ b/lib/sbi/openapi/model/confirmation_data_response.c @@ -10,10 +10,9 @@ OpenAPI_confirmation_data_response_t *OpenAPI_confirmation_data_response_create( char *kseaf ) { - OpenAPI_confirmation_data_response_t *confirmation_data_response_local_var = OpenAPI_malloc(sizeof(OpenAPI_confirmation_data_response_t)); - if (!confirmation_data_response_local_var) { - return NULL; - } + OpenAPI_confirmation_data_response_t *confirmation_data_response_local_var = ogs_malloc(sizeof(OpenAPI_confirmation_data_response_t)); + ogs_assert(confirmation_data_response_local_var); + confirmation_data_response_local_var->auth_result = auth_result; confirmation_data_response_local_var->supi = supi; confirmation_data_response_local_var->kseaf = kseaf; @@ -101,8 +100,8 @@ OpenAPI_confirmation_data_response_t *OpenAPI_confirmation_data_response_parseFr confirmation_data_response_local_var = OpenAPI_confirmation_data_response_create ( auth_resultVariable, - supi ? ogs_strdup_or_assert(supi->valuestring) : NULL, - kseaf ? ogs_strdup_or_assert(kseaf->valuestring) : NULL + supi ? ogs_strdup(supi->valuestring) : NULL, + kseaf ? ogs_strdup(kseaf->valuestring) : NULL ); return confirmation_data_response_local_var; diff --git a/lib/sbi/openapi/model/context_data_sets.c b/lib/sbi/openapi/model/context_data_sets.c index ddd2788e0..09572c4a5 100644 --- a/lib/sbi/openapi/model/context_data_sets.c +++ b/lib/sbi/openapi/model/context_data_sets.c @@ -16,10 +16,9 @@ OpenAPI_context_data_sets_t *OpenAPI_context_data_sets_create( OpenAPI_ip_sm_gw_registration_t *ip_sm_gw ) { - OpenAPI_context_data_sets_t *context_data_sets_local_var = OpenAPI_malloc(sizeof(OpenAPI_context_data_sets_t)); - if (!context_data_sets_local_var) { - return NULL; - } + OpenAPI_context_data_sets_t *context_data_sets_local_var = ogs_malloc(sizeof(OpenAPI_context_data_sets_t)); + ogs_assert(context_data_sets_local_var); + context_data_sets_local_var->amf3_gpp = amf3_gpp; context_data_sets_local_var->amf_non3_gpp = amf_non3_gpp; context_data_sets_local_var->sdm_subscriptions = sdm_subscriptions; diff --git a/lib/sbi/openapi/model/context_info.c b/lib/sbi/openapi/model/context_info.c index 19178546a..df98943b3 100644 --- a/lib/sbi/openapi/model/context_info.c +++ b/lib/sbi/openapi/model/context_info.c @@ -8,10 +8,9 @@ OpenAPI_context_info_t *OpenAPI_context_info_create( OpenAPI_list_t *orig_headers ) { - OpenAPI_context_info_t *context_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_context_info_t)); - if (!context_info_local_var) { - return NULL; - } + OpenAPI_context_info_t *context_info_local_var = ogs_malloc(sizeof(OpenAPI_context_info_t)); + ogs_assert(context_info_local_var); + context_info_local_var->orig_headers = orig_headers; return context_info_local_var; @@ -79,7 +78,7 @@ OpenAPI_context_info_t *OpenAPI_context_info_parseFromJSON(cJSON *context_infoJS ogs_error("OpenAPI_context_info_parseFromJSON() failed [orig_headers]"); goto end; } - OpenAPI_list_add(orig_headersList , ogs_strdup_or_assert(orig_headers_local->valuestring)); + OpenAPI_list_add(orig_headersList , ogs_strdup(orig_headers_local->valuestring)); } } diff --git a/lib/sbi/openapi/model/data_change_notify.c b/lib/sbi/openapi/model/data_change_notify.c index f8454d8fc..f52f5180a 100644 --- a/lib/sbi/openapi/model/data_change_notify.c +++ b/lib/sbi/openapi/model/data_change_notify.c @@ -13,10 +13,9 @@ OpenAPI_data_change_notify_t *OpenAPI_data_change_notify_create( OpenAPI_list_t *subscription_data_subscriptions ) { - OpenAPI_data_change_notify_t *data_change_notify_local_var = OpenAPI_malloc(sizeof(OpenAPI_data_change_notify_t)); - if (!data_change_notify_local_var) { - return NULL; - } + OpenAPI_data_change_notify_t *data_change_notify_local_var = ogs_malloc(sizeof(OpenAPI_data_change_notify_t)); + ogs_assert(data_change_notify_local_var); + data_change_notify_local_var->original_callback_reference = original_callback_reference; data_change_notify_local_var->ue_id = ue_id; data_change_notify_local_var->notify_items = notify_items; @@ -183,7 +182,7 @@ OpenAPI_data_change_notify_t *OpenAPI_data_change_notify_parseFromJSON(cJSON *da ogs_error("OpenAPI_data_change_notify_parseFromJSON() failed [original_callback_reference]"); goto end; } - OpenAPI_list_add(original_callback_referenceList , ogs_strdup_or_assert(original_callback_reference_local->valuestring)); + OpenAPI_list_add(original_callback_referenceList , ogs_strdup(original_callback_reference_local->valuestring)); } } @@ -274,7 +273,7 @@ OpenAPI_data_change_notify_t *OpenAPI_data_change_notify_parseFromJSON(cJSON *da data_change_notify_local_var = OpenAPI_data_change_notify_create ( original_callback_reference ? original_callback_referenceList : NULL, - ue_id ? ogs_strdup_or_assert(ue_id->valuestring) : NULL, + ue_id ? ogs_strdup(ue_id->valuestring) : NULL, notify_items ? notify_itemsList : NULL, sdm_subscription ? sdm_subscription_local_nonprim : NULL, additional_sdm_subscriptions ? additional_sdm_subscriptionsList : NULL, diff --git a/lib/sbi/openapi/model/data_filter.c b/lib/sbi/openapi/model/data_filter.c index 1d3347ac6..f054e0ab6 100644 --- a/lib/sbi/openapi/model/data_filter.c +++ b/lib/sbi/openapi/model/data_filter.c @@ -16,10 +16,9 @@ OpenAPI_data_filter_t *OpenAPI_data_filter_create( OpenAPI_list_t *ue_macs ) { - OpenAPI_data_filter_t *data_filter_local_var = OpenAPI_malloc(sizeof(OpenAPI_data_filter_t)); - if (!data_filter_local_var) { - return NULL; - } + OpenAPI_data_filter_t *data_filter_local_var = ogs_malloc(sizeof(OpenAPI_data_filter_t)); + ogs_assert(data_filter_local_var); + data_filter_local_var->data_ind = data_ind; data_filter_local_var->dnns = dnns; data_filter_local_var->snssais = snssais; @@ -260,7 +259,7 @@ OpenAPI_data_filter_t *OpenAPI_data_filter_parseFromJSON(cJSON *data_filterJSON) ogs_error("OpenAPI_data_filter_parseFromJSON() failed [dnns]"); goto end; } - OpenAPI_list_add(dnnsList , ogs_strdup_or_assert(dnns_local->valuestring)); + OpenAPI_list_add(dnnsList , ogs_strdup(dnns_local->valuestring)); } } @@ -303,7 +302,7 @@ OpenAPI_data_filter_t *OpenAPI_data_filter_parseFromJSON(cJSON *data_filterJSON) ogs_error("OpenAPI_data_filter_parseFromJSON() failed [internal_group_ids]"); goto end; } - OpenAPI_list_add(internal_group_idsList , ogs_strdup_or_assert(internal_group_ids_local->valuestring)); + OpenAPI_list_add(internal_group_idsList , ogs_strdup(internal_group_ids_local->valuestring)); } } @@ -323,7 +322,7 @@ OpenAPI_data_filter_t *OpenAPI_data_filter_parseFromJSON(cJSON *data_filterJSON) ogs_error("OpenAPI_data_filter_parseFromJSON() failed [supis]"); goto end; } - OpenAPI_list_add(supisList , ogs_strdup_or_assert(supis_local->valuestring)); + OpenAPI_list_add(supisList , ogs_strdup(supis_local->valuestring)); } } @@ -343,7 +342,7 @@ OpenAPI_data_filter_t *OpenAPI_data_filter_parseFromJSON(cJSON *data_filterJSON) ogs_error("OpenAPI_data_filter_parseFromJSON() failed [app_ids]"); goto end; } - OpenAPI_list_add(app_idsList , ogs_strdup_or_assert(app_ids_local->valuestring)); + OpenAPI_list_add(app_idsList , ogs_strdup(app_ids_local->valuestring)); } } @@ -363,7 +362,7 @@ OpenAPI_data_filter_t *OpenAPI_data_filter_parseFromJSON(cJSON *data_filterJSON) ogs_error("OpenAPI_data_filter_parseFromJSON() failed [ue_ipv4s]"); goto end; } - OpenAPI_list_add(ue_ipv4sList , ogs_strdup_or_assert(ue_ipv4s_local->valuestring)); + OpenAPI_list_add(ue_ipv4sList , ogs_strdup(ue_ipv4s_local->valuestring)); } } @@ -383,7 +382,7 @@ OpenAPI_data_filter_t *OpenAPI_data_filter_parseFromJSON(cJSON *data_filterJSON) ogs_error("OpenAPI_data_filter_parseFromJSON() failed [ue_ipv6s]"); goto end; } - OpenAPI_list_add(ue_ipv6sList , ogs_strdup_or_assert(ue_ipv6s_local->valuestring)); + OpenAPI_list_add(ue_ipv6sList , ogs_strdup(ue_ipv6s_local->valuestring)); } } @@ -403,7 +402,7 @@ OpenAPI_data_filter_t *OpenAPI_data_filter_parseFromJSON(cJSON *data_filterJSON) ogs_error("OpenAPI_data_filter_parseFromJSON() failed [ue_macs]"); goto end; } - OpenAPI_list_add(ue_macsList , ogs_strdup_or_assert(ue_macs_local->valuestring)); + OpenAPI_list_add(ue_macsList , ogs_strdup(ue_macs_local->valuestring)); } } diff --git a/lib/sbi/openapi/model/data_ind.c b/lib/sbi/openapi/model/data_ind.c index 58c9e0476..d71c0898c 100644 --- a/lib/sbi/openapi/model/data_ind.c +++ b/lib/sbi/openapi/model/data_ind.c @@ -7,10 +7,9 @@ OpenAPI_data_ind_t *OpenAPI_data_ind_create( ) { - OpenAPI_data_ind_t *data_ind_local_var = OpenAPI_malloc(sizeof(OpenAPI_data_ind_t)); - if (!data_ind_local_var) { - return NULL; - } + OpenAPI_data_ind_t *data_ind_local_var = ogs_malloc(sizeof(OpenAPI_data_ind_t)); + ogs_assert(data_ind_local_var); + return data_ind_local_var; } diff --git a/lib/sbi/openapi/model/datalink_reporting_configuration.c b/lib/sbi/openapi/model/datalink_reporting_configuration.c index 1fbecc728..2af34d5f2 100644 --- a/lib/sbi/openapi/model/datalink_reporting_configuration.c +++ b/lib/sbi/openapi/model/datalink_reporting_configuration.c @@ -11,10 +11,9 @@ OpenAPI_datalink_reporting_configuration_t *OpenAPI_datalink_reporting_configura OpenAPI_list_t *ddd_status_list ) { - OpenAPI_datalink_reporting_configuration_t *datalink_reporting_configuration_local_var = OpenAPI_malloc(sizeof(OpenAPI_datalink_reporting_configuration_t)); - if (!datalink_reporting_configuration_local_var) { - return NULL; - } + OpenAPI_datalink_reporting_configuration_t *datalink_reporting_configuration_local_var = ogs_malloc(sizeof(OpenAPI_datalink_reporting_configuration_t)); + ogs_assert(datalink_reporting_configuration_local_var); + datalink_reporting_configuration_local_var->ddd_traffic_des = ddd_traffic_des; datalink_reporting_configuration_local_var->dnn = dnn; datalink_reporting_configuration_local_var->slice = slice; @@ -174,7 +173,7 @@ OpenAPI_datalink_reporting_configuration_t *OpenAPI_datalink_reporting_configura datalink_reporting_configuration_local_var = OpenAPI_datalink_reporting_configuration_create ( ddd_traffic_des ? ddd_traffic_desList : NULL, - dnn ? ogs_strdup_or_assert(dnn->valuestring) : NULL, + dnn ? ogs_strdup(dnn->valuestring) : NULL, slice ? slice_local_nonprim : NULL, ddd_status_list ? ddd_status_listList : NULL ); diff --git a/lib/sbi/openapi/model/ddd_traffic_descriptor.c b/lib/sbi/openapi/model/ddd_traffic_descriptor.c index 511c6b139..0761969e7 100644 --- a/lib/sbi/openapi/model/ddd_traffic_descriptor.c +++ b/lib/sbi/openapi/model/ddd_traffic_descriptor.c @@ -12,10 +12,9 @@ OpenAPI_ddd_traffic_descriptor_t *OpenAPI_ddd_traffic_descriptor_create( char *mac_addr ) { - OpenAPI_ddd_traffic_descriptor_t *ddd_traffic_descriptor_local_var = OpenAPI_malloc(sizeof(OpenAPI_ddd_traffic_descriptor_t)); - if (!ddd_traffic_descriptor_local_var) { - return NULL; - } + OpenAPI_ddd_traffic_descriptor_t *ddd_traffic_descriptor_local_var = ogs_malloc(sizeof(OpenAPI_ddd_traffic_descriptor_t)); + ogs_assert(ddd_traffic_descriptor_local_var); + ddd_traffic_descriptor_local_var->ipv4_addr = ipv4_addr; ddd_traffic_descriptor_local_var->ipv6_addr = ipv6_addr; ddd_traffic_descriptor_local_var->is_port_number = is_port_number; @@ -119,11 +118,11 @@ OpenAPI_ddd_traffic_descriptor_t *OpenAPI_ddd_traffic_descriptor_parseFromJSON(c } ddd_traffic_descriptor_local_var = OpenAPI_ddd_traffic_descriptor_create ( - ipv4_addr ? ogs_strdup_or_assert(ipv4_addr->valuestring) : NULL, - ipv6_addr ? ogs_strdup_or_assert(ipv6_addr->valuestring) : NULL, + ipv4_addr ? ogs_strdup(ipv4_addr->valuestring) : NULL, + ipv6_addr ? ogs_strdup(ipv6_addr->valuestring) : NULL, port_number ? true : false, port_number ? port_number->valuedouble : 0, - mac_addr ? ogs_strdup_or_assert(mac_addr->valuestring) : NULL + mac_addr ? ogs_strdup(mac_addr->valuestring) : NULL ); return ddd_traffic_descriptor_local_var; diff --git a/lib/sbi/openapi/model/ddn_failure_sub_info.c b/lib/sbi/openapi/model/ddn_failure_sub_info.c index 90cbdeacb..8ca9fbef2 100644 --- a/lib/sbi/openapi/model/ddn_failure_sub_info.c +++ b/lib/sbi/openapi/model/ddn_failure_sub_info.c @@ -9,10 +9,9 @@ OpenAPI_ddn_failure_sub_info_t *OpenAPI_ddn_failure_sub_info_create( OpenAPI_list_t *ddd_traffic_descriptor_list ) { - OpenAPI_ddn_failure_sub_info_t *ddn_failure_sub_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_ddn_failure_sub_info_t)); - if (!ddn_failure_sub_info_local_var) { - return NULL; - } + OpenAPI_ddn_failure_sub_info_t *ddn_failure_sub_info_local_var = ogs_malloc(sizeof(OpenAPI_ddn_failure_sub_info_t)); + ogs_assert(ddn_failure_sub_info_local_var); + ddn_failure_sub_info_local_var->notify_correlation_id = notify_correlation_id; ddn_failure_sub_info_local_var->ddd_traffic_descriptor_list = ddd_traffic_descriptor_list; @@ -110,7 +109,7 @@ OpenAPI_ddn_failure_sub_info_t *OpenAPI_ddn_failure_sub_info_parseFromJSON(cJSON } ddn_failure_sub_info_local_var = OpenAPI_ddn_failure_sub_info_create ( - ogs_strdup_or_assert(notify_correlation_id->valuestring), + ogs_strdup(notify_correlation_id->valuestring), ddd_traffic_descriptor_list ? ddd_traffic_descriptor_listList : NULL ); diff --git a/lib/sbi/openapi/model/ddn_failure_subs.c b/lib/sbi/openapi/model/ddn_failure_subs.c index 3e5bc38fb..90e36bb32 100644 --- a/lib/sbi/openapi/model/ddn_failure_subs.c +++ b/lib/sbi/openapi/model/ddn_failure_subs.c @@ -10,10 +10,9 @@ OpenAPI_ddn_failure_subs_t *OpenAPI_ddn_failure_subs_create( OpenAPI_list_t *ddn_failure_subs_info_list ) { - OpenAPI_ddn_failure_subs_t *ddn_failure_subs_local_var = OpenAPI_malloc(sizeof(OpenAPI_ddn_failure_subs_t)); - if (!ddn_failure_subs_local_var) { - return NULL; - } + OpenAPI_ddn_failure_subs_t *ddn_failure_subs_local_var = ogs_malloc(sizeof(OpenAPI_ddn_failure_subs_t)); + ogs_assert(ddn_failure_subs_local_var); + ddn_failure_subs_local_var->is_ddn_failure_subs_ind = is_ddn_failure_subs_ind; ddn_failure_subs_local_var->ddn_failure_subs_ind = ddn_failure_subs_ind; ddn_failure_subs_local_var->ddn_failure_subs_info_list = ddn_failure_subs_info_list; diff --git a/lib/sbi/openapi/model/default_notification_subscription.c b/lib/sbi/openapi/model/default_notification_subscription.c index 0517601aa..8350b79b0 100644 --- a/lib/sbi/openapi/model/default_notification_subscription.c +++ b/lib/sbi/openapi/model/default_notification_subscription.c @@ -13,10 +13,9 @@ OpenAPI_default_notification_subscription_t *OpenAPI_default_notification_subscr char *binding ) { - OpenAPI_default_notification_subscription_t *default_notification_subscription_local_var = OpenAPI_malloc(sizeof(OpenAPI_default_notification_subscription_t)); - if (!default_notification_subscription_local_var) { - return NULL; - } + OpenAPI_default_notification_subscription_t *default_notification_subscription_local_var = ogs_malloc(sizeof(OpenAPI_default_notification_subscription_t)); + ogs_assert(default_notification_subscription_local_var); + default_notification_subscription_local_var->notification_type = notification_type; default_notification_subscription_local_var->callback_uri = callback_uri; default_notification_subscription_local_var->n1_message_class = n1_message_class; @@ -168,7 +167,7 @@ OpenAPI_default_notification_subscription_t *OpenAPI_default_notification_subscr ogs_error("OpenAPI_default_notification_subscription_parseFromJSON() failed [versions]"); goto end; } - OpenAPI_list_add(versionsList , ogs_strdup_or_assert(versions_local->valuestring)); + OpenAPI_list_add(versionsList , ogs_strdup(versions_local->valuestring)); } } @@ -183,11 +182,11 @@ OpenAPI_default_notification_subscription_t *OpenAPI_default_notification_subscr default_notification_subscription_local_var = OpenAPI_default_notification_subscription_create ( notification_typeVariable, - ogs_strdup_or_assert(callback_uri->valuestring), + ogs_strdup(callback_uri->valuestring), n1_message_class ? n1_message_classVariable : 0, n2_information_class ? n2_information_classVariable : 0, versions ? versionsList : NULL, - binding ? ogs_strdup_or_assert(binding->valuestring) : NULL + binding ? ogs_strdup(binding->valuestring) : NULL ); return default_notification_subscription_local_var; diff --git a/lib/sbi/openapi/model/default_unrelated_class.c b/lib/sbi/openapi/model/default_unrelated_class.c index 3f0ac9e7d..8076e7fdc 100644 --- a/lib/sbi/openapi/model/default_unrelated_class.c +++ b/lib/sbi/openapi/model/default_unrelated_class.c @@ -12,10 +12,9 @@ OpenAPI_default_unrelated_class_t *OpenAPI_default_unrelated_class_create( OpenAPI_list_t *code_word_list ) { - OpenAPI_default_unrelated_class_t *default_unrelated_class_local_var = OpenAPI_malloc(sizeof(OpenAPI_default_unrelated_class_t)); - if (!default_unrelated_class_local_var) { - return NULL; - } + OpenAPI_default_unrelated_class_t *default_unrelated_class_local_var = ogs_malloc(sizeof(OpenAPI_default_unrelated_class_t)); + ogs_assert(default_unrelated_class_local_var); + default_unrelated_class_local_var->allowed_geographic_area = allowed_geographic_area; default_unrelated_class_local_var->privacy_check_related_action = privacy_check_related_action; default_unrelated_class_local_var->code_word_ind = code_word_ind; @@ -191,7 +190,7 @@ OpenAPI_default_unrelated_class_t *OpenAPI_default_unrelated_class_parseFromJSON ogs_error("OpenAPI_default_unrelated_class_parseFromJSON() failed [code_word_list]"); goto end; } - OpenAPI_list_add(code_word_listList , ogs_strdup_or_assert(code_word_list_local->valuestring)); + OpenAPI_list_add(code_word_listList , ogs_strdup(code_word_list_local->valuestring)); } } diff --git a/lib/sbi/openapi/model/default_unrelated_class_1.c b/lib/sbi/openapi/model/default_unrelated_class_1.c index d7be5a3a6..a81624ab5 100644 --- a/lib/sbi/openapi/model/default_unrelated_class_1.c +++ b/lib/sbi/openapi/model/default_unrelated_class_1.c @@ -12,10 +12,9 @@ OpenAPI_default_unrelated_class_1_t *OpenAPI_default_unrelated_class_1_create( OpenAPI_list_t *code_word_list ) { - OpenAPI_default_unrelated_class_1_t *default_unrelated_class_1_local_var = OpenAPI_malloc(sizeof(OpenAPI_default_unrelated_class_1_t)); - if (!default_unrelated_class_1_local_var) { - return NULL; - } + OpenAPI_default_unrelated_class_1_t *default_unrelated_class_1_local_var = ogs_malloc(sizeof(OpenAPI_default_unrelated_class_1_t)); + ogs_assert(default_unrelated_class_1_local_var); + default_unrelated_class_1_local_var->allowed_geographic_area = allowed_geographic_area; default_unrelated_class_1_local_var->privacy_check_related_action = privacy_check_related_action; default_unrelated_class_1_local_var->code_word_ind = code_word_ind; @@ -191,7 +190,7 @@ OpenAPI_default_unrelated_class_1_t *OpenAPI_default_unrelated_class_1_parseFrom ogs_error("OpenAPI_default_unrelated_class_1_parseFromJSON() failed [code_word_list]"); goto end; } - OpenAPI_list_add(code_word_listList , ogs_strdup_or_assert(code_word_list_local->valuestring)); + OpenAPI_list_add(code_word_listList , ogs_strdup(code_word_list_local->valuestring)); } } diff --git a/lib/sbi/openapi/model/deregistration_data.c b/lib/sbi/openapi/model/deregistration_data.c index e90f30270..1fafa9d12 100644 --- a/lib/sbi/openapi/model/deregistration_data.c +++ b/lib/sbi/openapi/model/deregistration_data.c @@ -12,10 +12,9 @@ OpenAPI_deregistration_data_t *OpenAPI_deregistration_data_create( char *new_smf_instance_id ) { - OpenAPI_deregistration_data_t *deregistration_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_deregistration_data_t)); - if (!deregistration_data_local_var) { - return NULL; - } + OpenAPI_deregistration_data_t *deregistration_data_local_var = ogs_malloc(sizeof(OpenAPI_deregistration_data_t)); + ogs_assert(deregistration_data_local_var); + deregistration_data_local_var->dereg_reason = dereg_reason; deregistration_data_local_var->access_type = access_type; deregistration_data_local_var->is_pdu_session_id = is_pdu_session_id; @@ -125,7 +124,7 @@ OpenAPI_deregistration_data_t *OpenAPI_deregistration_data_parseFromJSON(cJSON * access_type ? access_typeVariable : 0, pdu_session_id ? true : false, pdu_session_id ? pdu_session_id->valuedouble : 0, - new_smf_instance_id ? ogs_strdup_or_assert(new_smf_instance_id->valuestring) : NULL + new_smf_instance_id ? ogs_strdup(new_smf_instance_id->valuestring) : NULL ); return deregistration_data_local_var; diff --git a/lib/sbi/openapi/model/deregistration_info.c b/lib/sbi/openapi/model/deregistration_info.c index c027fb604..2c3ff123b 100644 --- a/lib/sbi/openapi/model/deregistration_info.c +++ b/lib/sbi/openapi/model/deregistration_info.c @@ -9,10 +9,9 @@ OpenAPI_deregistration_info_t *OpenAPI_deregistration_info_create( char *supported_features ) { - OpenAPI_deregistration_info_t *deregistration_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_deregistration_info_t)); - if (!deregistration_info_local_var) { - return NULL; - } + OpenAPI_deregistration_info_t *deregistration_info_local_var = ogs_malloc(sizeof(OpenAPI_deregistration_info_t)); + ogs_assert(deregistration_info_local_var); + deregistration_info_local_var->supi = supi; deregistration_info_local_var->supported_features = supported_features; @@ -80,8 +79,8 @@ OpenAPI_deregistration_info_t *OpenAPI_deregistration_info_parseFromJSON(cJSON * } deregistration_info_local_var = OpenAPI_deregistration_info_create ( - ogs_strdup_or_assert(supi->valuestring), - supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL + ogs_strdup(supi->valuestring), + supported_features ? ogs_strdup(supported_features->valuestring) : NULL ); return deregistration_info_local_var; diff --git a/lib/sbi/openapi/model/dnai_information.c b/lib/sbi/openapi/model/dnai_information.c index 024acc8b1..0a2c9308d 100644 --- a/lib/sbi/openapi/model/dnai_information.c +++ b/lib/sbi/openapi/model/dnai_information.c @@ -12,10 +12,9 @@ OpenAPI_dnai_information_t *OpenAPI_dnai_information_create( int no_local_psa_change_ind ) { - OpenAPI_dnai_information_t *dnai_information_local_var = OpenAPI_malloc(sizeof(OpenAPI_dnai_information_t)); - if (!dnai_information_local_var) { - return NULL; - } + OpenAPI_dnai_information_t *dnai_information_local_var = ogs_malloc(sizeof(OpenAPI_dnai_information_t)); + ogs_assert(dnai_information_local_var); + dnai_information_local_var->dnai = dnai; dnai_information_local_var->is_no_dnai_change_ind = is_no_dnai_change_ind; dnai_information_local_var->no_dnai_change_ind = no_dnai_change_ind; @@ -101,7 +100,7 @@ OpenAPI_dnai_information_t *OpenAPI_dnai_information_parseFromJSON(cJSON *dnai_i } dnai_information_local_var = OpenAPI_dnai_information_create ( - ogs_strdup_or_assert(dnai->valuestring), + ogs_strdup(dnai->valuestring), no_dnai_change_ind ? true : false, no_dnai_change_ind ? no_dnai_change_ind->valueint : 0, no_local_psa_change_ind ? true : false, diff --git a/lib/sbi/openapi/model/dnf.c b/lib/sbi/openapi/model/dnf.c index eb6539a5a..c80fe022b 100644 --- a/lib/sbi/openapi/model/dnf.c +++ b/lib/sbi/openapi/model/dnf.c @@ -8,10 +8,9 @@ OpenAPI_dnf_t *OpenAPI_dnf_create( OpenAPI_list_t *dnf_units ) { - OpenAPI_dnf_t *dnf_local_var = OpenAPI_malloc(sizeof(OpenAPI_dnf_t)); - if (!dnf_local_var) { - return NULL; - } + OpenAPI_dnf_t *dnf_local_var = ogs_malloc(sizeof(OpenAPI_dnf_t)); + ogs_assert(dnf_local_var); + dnf_local_var->dnf_units = dnf_units; return dnf_local_var; diff --git a/lib/sbi/openapi/model/dnf_unit.c b/lib/sbi/openapi/model/dnf_unit.c index 8fe97be00..23fd8d077 100644 --- a/lib/sbi/openapi/model/dnf_unit.c +++ b/lib/sbi/openapi/model/dnf_unit.c @@ -8,10 +8,9 @@ OpenAPI_dnf_unit_t *OpenAPI_dnf_unit_create( OpenAPI_list_t *dnf_unit ) { - OpenAPI_dnf_unit_t *dnf_unit_local_var = OpenAPI_malloc(sizeof(OpenAPI_dnf_unit_t)); - if (!dnf_unit_local_var) { - return NULL; - } + OpenAPI_dnf_unit_t *dnf_unit_local_var = ogs_malloc(sizeof(OpenAPI_dnf_unit_t)); + ogs_assert(dnf_unit_local_var); + dnf_unit_local_var->dnf_unit = dnf_unit; return dnf_unit_local_var; diff --git a/lib/sbi/openapi/model/dnn_configuration.c b/lib/sbi/openapi/model/dnn_configuration.c index ae3482f26..9cebfb1de 100644 --- a/lib/sbi/openapi/model/dnn_configuration.c +++ b/lib/sbi/openapi/model/dnn_configuration.c @@ -32,10 +32,9 @@ OpenAPI_dnn_configuration_t *OpenAPI_dnn_configuration_create( char *iptv_acc_ctrl_info ) { - OpenAPI_dnn_configuration_t *dnn_configuration_local_var = OpenAPI_malloc(sizeof(OpenAPI_dnn_configuration_t)); - if (!dnn_configuration_local_var) { - return NULL; - } + OpenAPI_dnn_configuration_t *dnn_configuration_local_var = ogs_malloc(sizeof(OpenAPI_dnn_configuration_t)); + ogs_assert(dnn_configuration_local_var); + dnn_configuration_local_var->pdu_session_types = pdu_session_types; dnn_configuration_local_var->ssc_modes = ssc_modes; dnn_configuration_local_var->is_iwk_eps_ind = is_iwk_eps_ind; @@ -556,11 +555,11 @@ OpenAPI_dnn_configuration_t *OpenAPI_dnn_configuration_parseFromJSON(cJSON *dnn_ iwk_eps_ind ? iwk_eps_ind->valueint : 0, _5g_qos_profile ? _5g_qos_profile_local_nonprim : NULL, session_ambr ? session_ambr_local_nonprim : NULL, - _3gpp_charging_characteristics ? ogs_strdup_or_assert(_3gpp_charging_characteristics->valuestring) : NULL, + _3gpp_charging_characteristics ? ogs_strdup(_3gpp_charging_characteristics->valuestring) : NULL, static_ip_address ? static_ip_addressList : NULL, up_security ? up_security_local_nonprim : NULL, pdu_session_continuity_ind ? pdu_session_continuity_indVariable : 0, - nidd_nef_id ? ogs_strdup_or_assert(nidd_nef_id->valuestring) : NULL, + nidd_nef_id ? ogs_strdup(nidd_nef_id->valuestring) : NULL, nidd_info ? nidd_info_local_nonprim : NULL, redundant_session_allowed ? true : false, redundant_session_allowed ? redundant_session_allowed->valueint : 0, @@ -574,7 +573,7 @@ OpenAPI_dnn_configuration_t *OpenAPI_dnn_configuration_parseFromJSON(cJSON *dnn_ dn_aaa_ip_address_allocation ? true : false, dn_aaa_ip_address_allocation ? dn_aaa_ip_address_allocation->valueint : 0, dn_aaa_address ? dn_aaa_address_local_nonprim : NULL, - iptv_acc_ctrl_info ? ogs_strdup_or_assert(iptv_acc_ctrl_info->valuestring) : NULL + iptv_acc_ctrl_info ? ogs_strdup(iptv_acc_ctrl_info->valuestring) : NULL ); return dnn_configuration_local_var; diff --git a/lib/sbi/openapi/model/dnn_configuration_1.c b/lib/sbi/openapi/model/dnn_configuration_1.c index 5a3092c1f..2d31b692a 100644 --- a/lib/sbi/openapi/model/dnn_configuration_1.c +++ b/lib/sbi/openapi/model/dnn_configuration_1.c @@ -32,10 +32,9 @@ OpenAPI_dnn_configuration_1_t *OpenAPI_dnn_configuration_1_create( char *iptv_acc_ctrl_info ) { - OpenAPI_dnn_configuration_1_t *dnn_configuration_1_local_var = OpenAPI_malloc(sizeof(OpenAPI_dnn_configuration_1_t)); - if (!dnn_configuration_1_local_var) { - return NULL; - } + OpenAPI_dnn_configuration_1_t *dnn_configuration_1_local_var = ogs_malloc(sizeof(OpenAPI_dnn_configuration_1_t)); + ogs_assert(dnn_configuration_1_local_var); + dnn_configuration_1_local_var->pdu_session_types = pdu_session_types; dnn_configuration_1_local_var->ssc_modes = ssc_modes; dnn_configuration_1_local_var->is_iwk_eps_ind = is_iwk_eps_ind; @@ -556,11 +555,11 @@ OpenAPI_dnn_configuration_1_t *OpenAPI_dnn_configuration_1_parseFromJSON(cJSON * iwk_eps_ind ? iwk_eps_ind->valueint : 0, _5g_qos_profile ? _5g_qos_profile_local_nonprim : NULL, session_ambr ? session_ambr_local_nonprim : NULL, - _3gpp_charging_characteristics ? ogs_strdup_or_assert(_3gpp_charging_characteristics->valuestring) : NULL, + _3gpp_charging_characteristics ? ogs_strdup(_3gpp_charging_characteristics->valuestring) : NULL, static_ip_address ? static_ip_addressList : NULL, up_security ? up_security_local_nonprim : NULL, pdu_session_continuity_ind ? pdu_session_continuity_indVariable : 0, - nidd_nef_id ? ogs_strdup_or_assert(nidd_nef_id->valuestring) : NULL, + nidd_nef_id ? ogs_strdup(nidd_nef_id->valuestring) : NULL, nidd_info ? nidd_info_local_nonprim : NULL, redundant_session_allowed ? true : false, redundant_session_allowed ? redundant_session_allowed->valueint : 0, @@ -574,7 +573,7 @@ OpenAPI_dnn_configuration_1_t *OpenAPI_dnn_configuration_1_parseFromJSON(cJSON * dn_aaa_ip_address_allocation ? true : false, dn_aaa_ip_address_allocation ? dn_aaa_ip_address_allocation->valueint : 0, dn_aaa_address ? dn_aaa_address_local_nonprim : NULL, - iptv_acc_ctrl_info ? ogs_strdup_or_assert(iptv_acc_ctrl_info->valuestring) : NULL + iptv_acc_ctrl_info ? ogs_strdup(iptv_acc_ctrl_info->valuestring) : NULL ); return dnn_configuration_1_local_var; diff --git a/lib/sbi/openapi/model/dnn_info.c b/lib/sbi/openapi/model/dnn_info.c index aa513fdb5..723915154 100644 --- a/lib/sbi/openapi/model/dnn_info.c +++ b/lib/sbi/openapi/model/dnn_info.c @@ -21,10 +21,9 @@ OpenAPI_dnn_info_t *OpenAPI_dnn_info_create( int same_smf_ind ) { - OpenAPI_dnn_info_t *dnn_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_dnn_info_t)); - if (!dnn_info_local_var) { - return NULL; - } + OpenAPI_dnn_info_t *dnn_info_local_var = ogs_malloc(sizeof(OpenAPI_dnn_info_t)); + ogs_assert(dnn_info_local_var); + dnn_info_local_var->dnn = dnn; dnn_info_local_var->is_default_dnn_indicator = is_default_dnn_indicator; dnn_info_local_var->default_dnn_indicator = default_dnn_indicator; @@ -209,7 +208,7 @@ OpenAPI_dnn_info_t *OpenAPI_dnn_info_parseFromJSON(cJSON *dnn_infoJSON) ogs_error("OpenAPI_dnn_info_parseFromJSON() failed [smf_list]"); goto end; } - OpenAPI_list_add(smf_listList , ogs_strdup_or_assert(smf_list_local->valuestring)); + OpenAPI_list_add(smf_listList , ogs_strdup(smf_list_local->valuestring)); } } @@ -223,7 +222,7 @@ OpenAPI_dnn_info_t *OpenAPI_dnn_info_parseFromJSON(cJSON *dnn_infoJSON) } dnn_info_local_var = OpenAPI_dnn_info_create ( - ogs_strdup_or_assert(dnn->valuestring), + ogs_strdup(dnn->valuestring), default_dnn_indicator ? true : false, default_dnn_indicator ? default_dnn_indicator->valueint : 0, lbo_roaming_allowed ? true : false, diff --git a/lib/sbi/openapi/model/dnn_route_selection_descriptor.c b/lib/sbi/openapi/model/dnn_route_selection_descriptor.c index 38aaf6726..bb2676511 100644 --- a/lib/sbi/openapi/model/dnn_route_selection_descriptor.c +++ b/lib/sbi/openapi/model/dnn_route_selection_descriptor.c @@ -12,10 +12,9 @@ OpenAPI_dnn_route_selection_descriptor_t *OpenAPI_dnn_route_selection_descriptor int atsss_info ) { - OpenAPI_dnn_route_selection_descriptor_t *dnn_route_selection_descriptor_local_var = OpenAPI_malloc(sizeof(OpenAPI_dnn_route_selection_descriptor_t)); - if (!dnn_route_selection_descriptor_local_var) { - return NULL; - } + OpenAPI_dnn_route_selection_descriptor_t *dnn_route_selection_descriptor_local_var = ogs_malloc(sizeof(OpenAPI_dnn_route_selection_descriptor_t)); + ogs_assert(dnn_route_selection_descriptor_local_var); + dnn_route_selection_descriptor_local_var->dnn = dnn; dnn_route_selection_descriptor_local_var->ssc_modes = ssc_modes; dnn_route_selection_descriptor_local_var->pdu_sess_types = pdu_sess_types; @@ -161,7 +160,7 @@ OpenAPI_dnn_route_selection_descriptor_t *OpenAPI_dnn_route_selection_descriptor } dnn_route_selection_descriptor_local_var = OpenAPI_dnn_route_selection_descriptor_create ( - ogs_strdup_or_assert(dnn->valuestring), + ogs_strdup(dnn->valuestring), ssc_modes ? ssc_modesList : NULL, pdu_sess_types ? pdu_sess_typesList : NULL, atsss_info ? true : false, diff --git a/lib/sbi/openapi/model/dnn_smf_info_item.c b/lib/sbi/openapi/model/dnn_smf_info_item.c index 17f11fc4a..a7ca35868 100644 --- a/lib/sbi/openapi/model/dnn_smf_info_item.c +++ b/lib/sbi/openapi/model/dnn_smf_info_item.c @@ -8,10 +8,9 @@ OpenAPI_dnn_smf_info_item_t *OpenAPI_dnn_smf_info_item_create( char *dnn ) { - OpenAPI_dnn_smf_info_item_t *dnn_smf_info_item_local_var = OpenAPI_malloc(sizeof(OpenAPI_dnn_smf_info_item_t)); - if (!dnn_smf_info_item_local_var) { - return NULL; - } + OpenAPI_dnn_smf_info_item_t *dnn_smf_info_item_local_var = ogs_malloc(sizeof(OpenAPI_dnn_smf_info_item_t)); + ogs_assert(dnn_smf_info_item_local_var); + dnn_smf_info_item_local_var->dnn = dnn; return dnn_smf_info_item_local_var; @@ -61,7 +60,7 @@ OpenAPI_dnn_smf_info_item_t *OpenAPI_dnn_smf_info_item_parseFromJSON(cJSON *dnn_ } dnn_smf_info_item_local_var = OpenAPI_dnn_smf_info_item_create ( - ogs_strdup_or_assert(dnn->valuestring) + ogs_strdup(dnn->valuestring) ); return dnn_smf_info_item_local_var; diff --git a/lib/sbi/openapi/model/dnn_upf_info_item.c b/lib/sbi/openapi/model/dnn_upf_info_item.c index 6efdd8033..c2cbcfdde 100644 --- a/lib/sbi/openapi/model/dnn_upf_info_item.c +++ b/lib/sbi/openapi/model/dnn_upf_info_item.c @@ -13,10 +13,9 @@ OpenAPI_dnn_upf_info_item_t *OpenAPI_dnn_upf_info_item_create( OpenAPI_list_t* dnai_nw_instance_list ) { - OpenAPI_dnn_upf_info_item_t *dnn_upf_info_item_local_var = OpenAPI_malloc(sizeof(OpenAPI_dnn_upf_info_item_t)); - if (!dnn_upf_info_item_local_var) { - return NULL; - } + OpenAPI_dnn_upf_info_item_t *dnn_upf_info_item_local_var = ogs_malloc(sizeof(OpenAPI_dnn_upf_info_item_t)); + ogs_assert(dnn_upf_info_item_local_var); + dnn_upf_info_item_local_var->dnn = dnn; dnn_upf_info_item_local_var->dnai_list = dnai_list; dnn_upf_info_item_local_var->pdu_session_types = pdu_session_types; @@ -49,6 +48,7 @@ void OpenAPI_dnn_upf_info_item_free(OpenAPI_dnn_upf_info_item_t *dnn_upf_info_it OpenAPI_list_free(dnn_upf_info_item->ipv6_prefix_ranges); OpenAPI_list_for_each(dnn_upf_info_item->dnai_nw_instance_list, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); ogs_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -191,7 +191,7 @@ OpenAPI_dnn_upf_info_item_t *OpenAPI_dnn_upf_info_item_parseFromJSON(cJSON *dnn_ ogs_error("OpenAPI_dnn_upf_info_item_parseFromJSON() failed [dnai_list]"); goto end; } - OpenAPI_list_add(dnai_listList , ogs_strdup_or_assert(dnai_list_local->valuestring)); + OpenAPI_list_add(dnai_listList , ogs_strdup(dnai_list_local->valuestring)); } } @@ -281,7 +281,7 @@ OpenAPI_dnn_upf_info_item_t *OpenAPI_dnn_upf_info_item_parseFromJSON(cJSON *dnn_ } dnn_upf_info_item_local_var = OpenAPI_dnn_upf_info_item_create ( - ogs_strdup_or_assert(dnn->valuestring), + ogs_strdup(dnn->valuestring), dnai_list ? dnai_listList : NULL, pdu_session_types ? pdu_session_typesList : NULL, ipv4_address_ranges ? ipv4_address_rangesList : NULL, diff --git a/lib/sbi/openapi/model/domain_name_protocol.c b/lib/sbi/openapi/model/domain_name_protocol.c index 9897d605d..7939b48f6 100644 --- a/lib/sbi/openapi/model/domain_name_protocol.c +++ b/lib/sbi/openapi/model/domain_name_protocol.c @@ -7,10 +7,9 @@ OpenAPI_domain_name_protocol_t *OpenAPI_domain_name_protocol_create( ) { - OpenAPI_domain_name_protocol_t *domain_name_protocol_local_var = OpenAPI_malloc(sizeof(OpenAPI_domain_name_protocol_t)); - if (!domain_name_protocol_local_var) { - return NULL; - } + OpenAPI_domain_name_protocol_t *domain_name_protocol_local_var = ogs_malloc(sizeof(OpenAPI_domain_name_protocol_t)); + ogs_assert(domain_name_protocol_local_var); + return domain_name_protocol_local_var; } diff --git a/lib/sbi/openapi/model/downlink_data_notification_control.c b/lib/sbi/openapi/model/downlink_data_notification_control.c index c9f1a01ab..8c13a5147 100644 --- a/lib/sbi/openapi/model/downlink_data_notification_control.c +++ b/lib/sbi/openapi/model/downlink_data_notification_control.c @@ -9,10 +9,9 @@ OpenAPI_downlink_data_notification_control_t *OpenAPI_downlink_data_notification OpenAPI_list_t *types_of_notif ) { - OpenAPI_downlink_data_notification_control_t *downlink_data_notification_control_local_var = OpenAPI_malloc(sizeof(OpenAPI_downlink_data_notification_control_t)); - if (!downlink_data_notification_control_local_var) { - return NULL; - } + OpenAPI_downlink_data_notification_control_t *downlink_data_notification_control_local_var = ogs_malloc(sizeof(OpenAPI_downlink_data_notification_control_t)); + ogs_assert(downlink_data_notification_control_local_var); + downlink_data_notification_control_local_var->notif_ctrl_inds = notif_ctrl_inds; downlink_data_notification_control_local_var->types_of_notif = types_of_notif; diff --git a/lib/sbi/openapi/model/downlink_data_notification_control_rm.c b/lib/sbi/openapi/model/downlink_data_notification_control_rm.c index 0541b609d..1b2ee2100 100644 --- a/lib/sbi/openapi/model/downlink_data_notification_control_rm.c +++ b/lib/sbi/openapi/model/downlink_data_notification_control_rm.c @@ -9,10 +9,9 @@ OpenAPI_downlink_data_notification_control_rm_t *OpenAPI_downlink_data_notificat OpenAPI_list_t *types_of_notif ) { - OpenAPI_downlink_data_notification_control_rm_t *downlink_data_notification_control_rm_local_var = OpenAPI_malloc(sizeof(OpenAPI_downlink_data_notification_control_rm_t)); - if (!downlink_data_notification_control_rm_local_var) { - return NULL; - } + OpenAPI_downlink_data_notification_control_rm_t *downlink_data_notification_control_rm_local_var = ogs_malloc(sizeof(OpenAPI_downlink_data_notification_control_rm_t)); + ogs_assert(downlink_data_notification_control_rm_local_var); + downlink_data_notification_control_rm_local_var->notif_ctrl_inds = notif_ctrl_inds; downlink_data_notification_control_rm_local_var->types_of_notif = types_of_notif; diff --git a/lib/sbi/openapi/model/dynamic5_qi.c b/lib/sbi/openapi/model/dynamic5_qi.c index 26bf6cabb..864f189b6 100644 --- a/lib/sbi/openapi/model/dynamic5_qi.c +++ b/lib/sbi/openapi/model/dynamic5_qi.c @@ -23,10 +23,9 @@ OpenAPI_dynamic5_qi_t *OpenAPI_dynamic5_qi_create( int cn_packet_delay_budget_ul ) { - OpenAPI_dynamic5_qi_t *dynamic5_qi_local_var = OpenAPI_malloc(sizeof(OpenAPI_dynamic5_qi_t)); - if (!dynamic5_qi_local_var) { - return NULL; - } + OpenAPI_dynamic5_qi_t *dynamic5_qi_local_var = ogs_malloc(sizeof(OpenAPI_dynamic5_qi_t)); + ogs_assert(dynamic5_qi_local_var); + dynamic5_qi_local_var->resource_type = resource_type; dynamic5_qi_local_var->priority_level = priority_level; dynamic5_qi_local_var->packet_delay_budget = packet_delay_budget; @@ -242,7 +241,7 @@ OpenAPI_dynamic5_qi_t *OpenAPI_dynamic5_qi_parseFromJSON(cJSON *dynamic5_qiJSON) priority_level->valuedouble, packet_delay_budget->valuedouble, - ogs_strdup_or_assert(packet_err_rate->valuestring), + ogs_strdup(packet_err_rate->valuestring), aver_window ? true : false, aver_window ? aver_window->valuedouble : 0, max_data_burst_vol ? true : false, diff --git a/lib/sbi/openapi/model/eap_session.c b/lib/sbi/openapi/model/eap_session.c index a42c61351..7fe9484e7 100644 --- a/lib/sbi/openapi/model/eap_session.c +++ b/lib/sbi/openapi/model/eap_session.c @@ -13,10 +13,9 @@ OpenAPI_eap_session_t *OpenAPI_eap_session_create( char *supported_features ) { - OpenAPI_eap_session_t *eap_session_local_var = OpenAPI_malloc(sizeof(OpenAPI_eap_session_t)); - if (!eap_session_local_var) { - return NULL; - } + OpenAPI_eap_session_t *eap_session_local_var = ogs_malloc(sizeof(OpenAPI_eap_session_t)); + ogs_assert(eap_session_local_var); + eap_session_local_var->eap_payload = eap_payload; eap_session_local_var->k_seaf = k_seaf; eap_session_local_var->_links = _links; @@ -37,6 +36,7 @@ void OpenAPI_eap_session_free(OpenAPI_eap_session_t *eap_session) ogs_free(eap_session->k_seaf); OpenAPI_list_for_each(eap_session->_links, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_links_value_schema_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -154,9 +154,9 @@ OpenAPI_eap_session_t *OpenAPI_eap_session_parseFromJSON(cJSON *eap_sessionJSON) cJSON *localMapObject = _links_local_map; if (cJSON_IsObject(_links_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_links_value_schema_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_links_value_schema_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(_links_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_eap_session_parseFromJSON() failed [_links]"); goto end; @@ -195,12 +195,12 @@ OpenAPI_eap_session_t *OpenAPI_eap_session_parseFromJSON(cJSON *eap_sessionJSON) } eap_session_local_var = OpenAPI_eap_session_create ( - ogs_strdup_or_assert(eap_payload->valuestring), - k_seaf ? ogs_strdup_or_assert(k_seaf->valuestring) : NULL, + ogs_strdup(eap_payload->valuestring), + k_seaf ? ogs_strdup(k_seaf->valuestring) : NULL, _links ? _linksList : NULL, auth_result ? auth_resultVariable : 0, - supi ? ogs_strdup_or_assert(supi->valuestring) : NULL, - supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL + supi ? ogs_strdup(supi->valuestring) : NULL, + supported_features ? ogs_strdup(supported_features->valuestring) : NULL ); return eap_session_local_var; diff --git a/lib/sbi/openapi/model/ebi_arp_mapping.c b/lib/sbi/openapi/model/ebi_arp_mapping.c index fedc3dc97..97dc7dc28 100644 --- a/lib/sbi/openapi/model/ebi_arp_mapping.c +++ b/lib/sbi/openapi/model/ebi_arp_mapping.c @@ -9,10 +9,9 @@ OpenAPI_ebi_arp_mapping_t *OpenAPI_ebi_arp_mapping_create( OpenAPI_arp_t *arp ) { - OpenAPI_ebi_arp_mapping_t *ebi_arp_mapping_local_var = OpenAPI_malloc(sizeof(OpenAPI_ebi_arp_mapping_t)); - if (!ebi_arp_mapping_local_var) { - return NULL; - } + OpenAPI_ebi_arp_mapping_t *ebi_arp_mapping_local_var = ogs_malloc(sizeof(OpenAPI_ebi_arp_mapping_t)); + ogs_assert(ebi_arp_mapping_local_var); + ebi_arp_mapping_local_var->eps_bearer_id = eps_bearer_id; ebi_arp_mapping_local_var->arp = arp; diff --git a/lib/sbi/openapi/model/ec_restriction.c b/lib/sbi/openapi/model/ec_restriction.c index ef40bbf2c..e9ca05112 100644 --- a/lib/sbi/openapi/model/ec_restriction.c +++ b/lib/sbi/openapi/model/ec_restriction.c @@ -11,10 +11,9 @@ OpenAPI_ec_restriction_t *OpenAPI_ec_restriction_create( char *mtc_provider_information ) { - OpenAPI_ec_restriction_t *ec_restriction_local_var = OpenAPI_malloc(sizeof(OpenAPI_ec_restriction_t)); - if (!ec_restriction_local_var) { - return NULL; - } + OpenAPI_ec_restriction_t *ec_restriction_local_var = ogs_malloc(sizeof(OpenAPI_ec_restriction_t)); + ogs_assert(ec_restriction_local_var); + ec_restriction_local_var->af_instance_id = af_instance_id; ec_restriction_local_var->reference_id = reference_id; ec_restriction_local_var->plmn_ec_infos = plmn_ec_infos; @@ -147,11 +146,11 @@ OpenAPI_ec_restriction_t *OpenAPI_ec_restriction_parseFromJSON(cJSON *ec_restric } ec_restriction_local_var = OpenAPI_ec_restriction_create ( - ogs_strdup_or_assert(af_instance_id->valuestring), + ogs_strdup(af_instance_id->valuestring), reference_id->valuedouble, plmn_ec_infos ? plmn_ec_infosList : NULL, - mtc_provider_information ? ogs_strdup_or_assert(mtc_provider_information->valuestring) : NULL + mtc_provider_information ? ogs_strdup(mtc_provider_information->valuestring) : NULL ); return ec_restriction_local_var; diff --git a/lib/sbi/openapi/model/ec_restriction_data_wb.c b/lib/sbi/openapi/model/ec_restriction_data_wb.c index ed1ae9f7a..9df321426 100644 --- a/lib/sbi/openapi/model/ec_restriction_data_wb.c +++ b/lib/sbi/openapi/model/ec_restriction_data_wb.c @@ -10,10 +10,9 @@ OpenAPI_ec_restriction_data_wb_t *OpenAPI_ec_restriction_data_wb_create( int ec_mode_b_restricted ) { - OpenAPI_ec_restriction_data_wb_t *ec_restriction_data_wb_local_var = OpenAPI_malloc(sizeof(OpenAPI_ec_restriction_data_wb_t)); - if (!ec_restriction_data_wb_local_var) { - return NULL; - } + OpenAPI_ec_restriction_data_wb_t *ec_restriction_data_wb_local_var = ogs_malloc(sizeof(OpenAPI_ec_restriction_data_wb_t)); + ogs_assert(ec_restriction_data_wb_local_var); + ec_restriction_data_wb_local_var->is_ec_mode_a_restricted = is_ec_mode_a_restricted; ec_restriction_data_wb_local_var->ec_mode_a_restricted = ec_mode_a_restricted; ec_restriction_data_wb_local_var->ec_mode_b_restricted = ec_mode_b_restricted; diff --git a/lib/sbi/openapi/model/ecgi.c b/lib/sbi/openapi/model/ecgi.c index a8e23089f..7bfd3294d 100644 --- a/lib/sbi/openapi/model/ecgi.c +++ b/lib/sbi/openapi/model/ecgi.c @@ -10,10 +10,9 @@ OpenAPI_ecgi_t *OpenAPI_ecgi_create( char *nid ) { - OpenAPI_ecgi_t *ecgi_local_var = OpenAPI_malloc(sizeof(OpenAPI_ecgi_t)); - if (!ecgi_local_var) { - return NULL; - } + OpenAPI_ecgi_t *ecgi_local_var = ogs_malloc(sizeof(OpenAPI_ecgi_t)); + ogs_assert(ecgi_local_var); + ecgi_local_var->plmn_id = plmn_id; ecgi_local_var->eutra_cell_id = eutra_cell_id; ecgi_local_var->nid = nid; @@ -104,8 +103,8 @@ OpenAPI_ecgi_t *OpenAPI_ecgi_parseFromJSON(cJSON *ecgiJSON) ecgi_local_var = OpenAPI_ecgi_create ( plmn_id_local_nonprim, - ogs_strdup_or_assert(eutra_cell_id->valuestring), - nid ? ogs_strdup_or_assert(nid->valuestring) : NULL + ogs_strdup(eutra_cell_id->valuestring), + nid ? ogs_strdup(nid->valuestring) : NULL ); return ecgi_local_var; diff --git a/lib/sbi/openapi/model/ecgi_1.c b/lib/sbi/openapi/model/ecgi_1.c index 569002dee..ec5420123 100644 --- a/lib/sbi/openapi/model/ecgi_1.c +++ b/lib/sbi/openapi/model/ecgi_1.c @@ -10,10 +10,9 @@ OpenAPI_ecgi_1_t *OpenAPI_ecgi_1_create( char *nid ) { - OpenAPI_ecgi_1_t *ecgi_1_local_var = OpenAPI_malloc(sizeof(OpenAPI_ecgi_1_t)); - if (!ecgi_1_local_var) { - return NULL; - } + OpenAPI_ecgi_1_t *ecgi_1_local_var = ogs_malloc(sizeof(OpenAPI_ecgi_1_t)); + ogs_assert(ecgi_1_local_var); + ecgi_1_local_var->plmn_id = plmn_id; ecgi_1_local_var->eutra_cell_id = eutra_cell_id; ecgi_1_local_var->nid = nid; @@ -104,8 +103,8 @@ OpenAPI_ecgi_1_t *OpenAPI_ecgi_1_parseFromJSON(cJSON *ecgi_1JSON) ecgi_1_local_var = OpenAPI_ecgi_1_create ( plmn_id_local_nonprim, - ogs_strdup_or_assert(eutra_cell_id->valuestring), - nid ? ogs_strdup_or_assert(nid->valuestring) : NULL + ogs_strdup(eutra_cell_id->valuestring), + nid ? ogs_strdup(nid->valuestring) : NULL ); return ecgi_1_local_var; diff --git a/lib/sbi/openapi/model/edrx_parameters.c b/lib/sbi/openapi/model/edrx_parameters.c index e3e3a1df0..9a3ad5a0e 100644 --- a/lib/sbi/openapi/model/edrx_parameters.c +++ b/lib/sbi/openapi/model/edrx_parameters.c @@ -9,10 +9,9 @@ OpenAPI_edrx_parameters_t *OpenAPI_edrx_parameters_create( char *edrx_value ) { - OpenAPI_edrx_parameters_t *edrx_parameters_local_var = OpenAPI_malloc(sizeof(OpenAPI_edrx_parameters_t)); - if (!edrx_parameters_local_var) { - return NULL; - } + OpenAPI_edrx_parameters_t *edrx_parameters_local_var = ogs_malloc(sizeof(OpenAPI_edrx_parameters_t)); + ogs_assert(edrx_parameters_local_var); + edrx_parameters_local_var->rat_type = rat_type; edrx_parameters_local_var->edrx_value = edrx_value; @@ -82,7 +81,7 @@ OpenAPI_edrx_parameters_t *OpenAPI_edrx_parameters_parseFromJSON(cJSON *edrx_par edrx_parameters_local_var = OpenAPI_edrx_parameters_create ( rat_typeVariable, - ogs_strdup_or_assert(edrx_value->valuestring) + ogs_strdup(edrx_value->valuestring) ); return edrx_parameters_local_var; diff --git a/lib/sbi/openapi/model/edrx_parameters_1.c b/lib/sbi/openapi/model/edrx_parameters_1.c index 23549733b..16105142c 100644 --- a/lib/sbi/openapi/model/edrx_parameters_1.c +++ b/lib/sbi/openapi/model/edrx_parameters_1.c @@ -9,10 +9,9 @@ OpenAPI_edrx_parameters_1_t *OpenAPI_edrx_parameters_1_create( char *edrx_value ) { - OpenAPI_edrx_parameters_1_t *edrx_parameters_1_local_var = OpenAPI_malloc(sizeof(OpenAPI_edrx_parameters_1_t)); - if (!edrx_parameters_1_local_var) { - return NULL; - } + OpenAPI_edrx_parameters_1_t *edrx_parameters_1_local_var = ogs_malloc(sizeof(OpenAPI_edrx_parameters_1_t)); + ogs_assert(edrx_parameters_1_local_var); + edrx_parameters_1_local_var->rat_type = rat_type; edrx_parameters_1_local_var->edrx_value = edrx_value; @@ -82,7 +81,7 @@ OpenAPI_edrx_parameters_1_t *OpenAPI_edrx_parameters_1_parseFromJSON(cJSON *edrx edrx_parameters_1_local_var = OpenAPI_edrx_parameters_1_create ( rat_typeVariable, - ogs_strdup_or_assert(edrx_value->valuestring) + ogs_strdup(edrx_value->valuestring) ); return edrx_parameters_1_local_var; diff --git a/lib/sbi/openapi/model/ee_group_profile_data.c b/lib/sbi/openapi/model/ee_group_profile_data.c index fd7beb05f..1100801dd 100644 --- a/lib/sbi/openapi/model/ee_group_profile_data.c +++ b/lib/sbi/openapi/model/ee_group_profile_data.c @@ -10,10 +10,9 @@ OpenAPI_ee_group_profile_data_t *OpenAPI_ee_group_profile_data_create( char *supported_features ) { - OpenAPI_ee_group_profile_data_t *ee_group_profile_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_ee_group_profile_data_t)); - if (!ee_group_profile_data_local_var) { - return NULL; - } + OpenAPI_ee_group_profile_data_t *ee_group_profile_data_local_var = ogs_malloc(sizeof(OpenAPI_ee_group_profile_data_t)); + ogs_assert(ee_group_profile_data_local_var); + ee_group_profile_data_local_var->restricted_event_types = restricted_event_types; ee_group_profile_data_local_var->allowed_mtc_provider = allowed_mtc_provider; ee_group_profile_data_local_var->supported_features = supported_features; @@ -33,6 +32,7 @@ void OpenAPI_ee_group_profile_data_free(OpenAPI_ee_group_profile_data_t *ee_grou OpenAPI_list_free(ee_group_profile_data->restricted_event_types); OpenAPI_list_for_each(ee_group_profile_data->allowed_mtc_provider, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); ogs_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -152,7 +152,7 @@ OpenAPI_ee_group_profile_data_t *OpenAPI_ee_group_profile_data_parseFromJSON(cJS ee_group_profile_data_local_var = OpenAPI_ee_group_profile_data_create ( restricted_event_types ? restricted_event_typesList : NULL, allowed_mtc_provider ? allowed_mtc_providerList : NULL, - supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL + supported_features ? ogs_strdup(supported_features->valuestring) : NULL ); return ee_group_profile_data_local_var; diff --git a/lib/sbi/openapi/model/ee_profile_data.c b/lib/sbi/openapi/model/ee_profile_data.c index 00d85fb38..7655b8469 100644 --- a/lib/sbi/openapi/model/ee_profile_data.c +++ b/lib/sbi/openapi/model/ee_profile_data.c @@ -10,10 +10,9 @@ OpenAPI_ee_profile_data_t *OpenAPI_ee_profile_data_create( OpenAPI_list_t* allowed_mtc_provider ) { - OpenAPI_ee_profile_data_t *ee_profile_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_ee_profile_data_t)); - if (!ee_profile_data_local_var) { - return NULL; - } + OpenAPI_ee_profile_data_t *ee_profile_data_local_var = ogs_malloc(sizeof(OpenAPI_ee_profile_data_t)); + ogs_assert(ee_profile_data_local_var); + ee_profile_data_local_var->restricted_event_types = restricted_event_types; ee_profile_data_local_var->supported_features = supported_features; ee_profile_data_local_var->allowed_mtc_provider = allowed_mtc_provider; @@ -34,6 +33,7 @@ void OpenAPI_ee_profile_data_free(OpenAPI_ee_profile_data_t *ee_profile_data) ogs_free(ee_profile_data->supported_features); OpenAPI_list_for_each(ee_profile_data->allowed_mtc_provider, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); ogs_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -151,7 +151,7 @@ OpenAPI_ee_profile_data_t *OpenAPI_ee_profile_data_parseFromJSON(cJSON *ee_profi ee_profile_data_local_var = OpenAPI_ee_profile_data_create ( restricted_event_types ? restricted_event_typesList : NULL, - supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, + supported_features ? ogs_strdup(supported_features->valuestring) : NULL, allowed_mtc_provider ? allowed_mtc_providerList : NULL ); diff --git a/lib/sbi/openapi/model/ee_subscription.c b/lib/sbi/openapi/model/ee_subscription.c index 4025886c8..67a4d8db8 100644 --- a/lib/sbi/openapi/model/ee_subscription.c +++ b/lib/sbi/openapi/model/ee_subscription.c @@ -18,10 +18,9 @@ OpenAPI_ee_subscription_t *OpenAPI_ee_subscription_create( char *notify_correlation_id ) { - OpenAPI_ee_subscription_t *ee_subscription_local_var = OpenAPI_malloc(sizeof(OpenAPI_ee_subscription_t)); - if (!ee_subscription_local_var) { - return NULL; - } + OpenAPI_ee_subscription_t *ee_subscription_local_var = ogs_malloc(sizeof(OpenAPI_ee_subscription_t)); + ogs_assert(ee_subscription_local_var); + ee_subscription_local_var->callback_reference = callback_reference; ee_subscription_local_var->monitoring_configurations = monitoring_configurations; ee_subscription_local_var->reporting_options = reporting_options; @@ -46,6 +45,7 @@ void OpenAPI_ee_subscription_free(OpenAPI_ee_subscription_t *ee_subscription) ogs_free(ee_subscription->callback_reference); OpenAPI_list_for_each(ee_subscription->monitoring_configurations, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_monitoring_configuration_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -200,9 +200,9 @@ OpenAPI_ee_subscription_t *OpenAPI_ee_subscription_parseFromJSON(cJSON *ee_subsc cJSON *localMapObject = monitoring_configurations_local_map; if (cJSON_IsObject(monitoring_configurations_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_monitoring_configuration_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_monitoring_configuration_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(monitoring_configurations_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_ee_subscription_parseFromJSON() failed [monitoring_configurations]"); goto end; @@ -279,17 +279,17 @@ OpenAPI_ee_subscription_t *OpenAPI_ee_subscription_parseFromJSON(cJSON *ee_subsc } ee_subscription_local_var = OpenAPI_ee_subscription_create ( - ogs_strdup_or_assert(callback_reference->valuestring), + ogs_strdup(callback_reference->valuestring), monitoring_configurationsList, reporting_options ? reporting_options_local_nonprim : NULL, - supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, - subscription_id ? ogs_strdup_or_assert(subscription_id->valuestring) : NULL, + supported_features ? ogs_strdup(supported_features->valuestring) : NULL, + subscription_id ? ogs_strdup(subscription_id->valuestring) : NULL, context_info ? context_info_local_nonprim : NULL, epc_applied_ind ? true : false, epc_applied_ind ? epc_applied_ind->valueint : 0, - scef_diam_host ? ogs_strdup_or_assert(scef_diam_host->valuestring) : NULL, - scef_diam_realm ? ogs_strdup_or_assert(scef_diam_realm->valuestring) : NULL, - notify_correlation_id ? ogs_strdup_or_assert(notify_correlation_id->valuestring) : NULL + scef_diam_host ? ogs_strdup(scef_diam_host->valuestring) : NULL, + scef_diam_realm ? ogs_strdup(scef_diam_realm->valuestring) : NULL, + notify_correlation_id ? ogs_strdup(notify_correlation_id->valuestring) : NULL ); return ee_subscription_local_var; diff --git a/lib/sbi/openapi/model/ellipsoid_arc.c b/lib/sbi/openapi/model/ellipsoid_arc.c index a951d8df8..88d650bf2 100644 --- a/lib/sbi/openapi/model/ellipsoid_arc.c +++ b/lib/sbi/openapi/model/ellipsoid_arc.c @@ -14,10 +14,9 @@ OpenAPI_ellipsoid_arc_t *OpenAPI_ellipsoid_arc_create( int confidence ) { - OpenAPI_ellipsoid_arc_t *ellipsoid_arc_local_var = OpenAPI_malloc(sizeof(OpenAPI_ellipsoid_arc_t)); - if (!ellipsoid_arc_local_var) { - return NULL; - } + OpenAPI_ellipsoid_arc_t *ellipsoid_arc_local_var = ogs_malloc(sizeof(OpenAPI_ellipsoid_arc_t)); + ogs_assert(ellipsoid_arc_local_var); + ellipsoid_arc_local_var->shape = shape; ellipsoid_arc_local_var->point = point; ellipsoid_arc_local_var->inner_radius = inner_radius; diff --git a/lib/sbi/openapi/model/ellipsoid_arc_all_of.c b/lib/sbi/openapi/model/ellipsoid_arc_all_of.c index a0bc2b18b..c884a6983 100644 --- a/lib/sbi/openapi/model/ellipsoid_arc_all_of.c +++ b/lib/sbi/openapi/model/ellipsoid_arc_all_of.c @@ -13,10 +13,9 @@ OpenAPI_ellipsoid_arc_all_of_t *OpenAPI_ellipsoid_arc_all_of_create( int confidence ) { - OpenAPI_ellipsoid_arc_all_of_t *ellipsoid_arc_all_of_local_var = OpenAPI_malloc(sizeof(OpenAPI_ellipsoid_arc_all_of_t)); - if (!ellipsoid_arc_all_of_local_var) { - return NULL; - } + OpenAPI_ellipsoid_arc_all_of_t *ellipsoid_arc_all_of_local_var = ogs_malloc(sizeof(OpenAPI_ellipsoid_arc_all_of_t)); + ogs_assert(ellipsoid_arc_all_of_local_var); + ellipsoid_arc_all_of_local_var->point = point; ellipsoid_arc_all_of_local_var->inner_radius = inner_radius; ellipsoid_arc_all_of_local_var->uncertainty_radius = uncertainty_radius; diff --git a/lib/sbi/openapi/model/emergency_info.c b/lib/sbi/openapi/model/emergency_info.c index 9c7072e82..10801b88b 100644 --- a/lib/sbi/openapi/model/emergency_info.c +++ b/lib/sbi/openapi/model/emergency_info.c @@ -12,10 +12,9 @@ OpenAPI_emergency_info_t *OpenAPI_emergency_info_create( int epdg_ind ) { - OpenAPI_emergency_info_t *emergency_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_emergency_info_t)); - if (!emergency_info_local_var) { - return NULL; - } + OpenAPI_emergency_info_t *emergency_info_local_var = ogs_malloc(sizeof(OpenAPI_emergency_info_t)); + ogs_assert(emergency_info_local_var); + emergency_info_local_var->pgw_fqdn = pgw_fqdn; emergency_info_local_var->pgw_ip_address = pgw_ip_address; emergency_info_local_var->smf_instance_id = smf_instance_id; @@ -123,9 +122,9 @@ OpenAPI_emergency_info_t *OpenAPI_emergency_info_parseFromJSON(cJSON *emergency_ } emergency_info_local_var = OpenAPI_emergency_info_create ( - pgw_fqdn ? ogs_strdup_or_assert(pgw_fqdn->valuestring) : NULL, + pgw_fqdn ? ogs_strdup(pgw_fqdn->valuestring) : NULL, pgw_ip_address ? pgw_ip_address_local_nonprim : NULL, - smf_instance_id ? ogs_strdup_or_assert(smf_instance_id->valuestring) : NULL, + smf_instance_id ? ogs_strdup(smf_instance_id->valuestring) : NULL, epdg_ind ? true : false, epdg_ind ? epdg_ind->valueint : 0 ); diff --git a/lib/sbi/openapi/model/emergency_info_1.c b/lib/sbi/openapi/model/emergency_info_1.c index 47163e4d2..77c5c74f8 100644 --- a/lib/sbi/openapi/model/emergency_info_1.c +++ b/lib/sbi/openapi/model/emergency_info_1.c @@ -12,10 +12,9 @@ OpenAPI_emergency_info_1_t *OpenAPI_emergency_info_1_create( int epdg_ind ) { - OpenAPI_emergency_info_1_t *emergency_info_1_local_var = OpenAPI_malloc(sizeof(OpenAPI_emergency_info_1_t)); - if (!emergency_info_1_local_var) { - return NULL; - } + OpenAPI_emergency_info_1_t *emergency_info_1_local_var = ogs_malloc(sizeof(OpenAPI_emergency_info_1_t)); + ogs_assert(emergency_info_1_local_var); + emergency_info_1_local_var->pgw_fqdn = pgw_fqdn; emergency_info_1_local_var->pgw_ip_address = pgw_ip_address; emergency_info_1_local_var->smf_instance_id = smf_instance_id; @@ -123,9 +122,9 @@ OpenAPI_emergency_info_1_t *OpenAPI_emergency_info_1_parseFromJSON(cJSON *emerge } emergency_info_1_local_var = OpenAPI_emergency_info_1_create ( - pgw_fqdn ? ogs_strdup_or_assert(pgw_fqdn->valuestring) : NULL, + pgw_fqdn ? ogs_strdup(pgw_fqdn->valuestring) : NULL, pgw_ip_address ? pgw_ip_address_local_nonprim : NULL, - smf_instance_id ? ogs_strdup_or_assert(smf_instance_id->valuestring) : NULL, + smf_instance_id ? ogs_strdup(smf_instance_id->valuestring) : NULL, epdg_ind ? true : false, epdg_ind ? epdg_ind->valueint : 0 ); diff --git a/lib/sbi/openapi/model/enhanced_coverage_restriction_data.c b/lib/sbi/openapi/model/enhanced_coverage_restriction_data.c index aff4108ac..a1152e9f0 100644 --- a/lib/sbi/openapi/model/enhanced_coverage_restriction_data.c +++ b/lib/sbi/openapi/model/enhanced_coverage_restriction_data.c @@ -8,10 +8,9 @@ OpenAPI_enhanced_coverage_restriction_data_t *OpenAPI_enhanced_coverage_restrict OpenAPI_list_t *plmn_ec_info_list ) { - OpenAPI_enhanced_coverage_restriction_data_t *enhanced_coverage_restriction_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_enhanced_coverage_restriction_data_t)); - if (!enhanced_coverage_restriction_data_local_var) { - return NULL; - } + OpenAPI_enhanced_coverage_restriction_data_t *enhanced_coverage_restriction_data_local_var = ogs_malloc(sizeof(OpenAPI_enhanced_coverage_restriction_data_t)); + ogs_assert(enhanced_coverage_restriction_data_local_var); + enhanced_coverage_restriction_data_local_var->plmn_ec_info_list = plmn_ec_info_list; return enhanced_coverage_restriction_data_local_var; diff --git a/lib/sbi/openapi/model/eps_bearer_info.c b/lib/sbi/openapi/model/eps_bearer_info.c index c1df51bde..81e9d3c5d 100644 --- a/lib/sbi/openapi/model/eps_bearer_info.c +++ b/lib/sbi/openapi/model/eps_bearer_info.c @@ -10,10 +10,9 @@ OpenAPI_eps_bearer_info_t *OpenAPI_eps_bearer_info_create( char bearer_level_qo_s ) { - OpenAPI_eps_bearer_info_t *eps_bearer_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_eps_bearer_info_t)); - if (!eps_bearer_info_local_var) { - return NULL; - } + OpenAPI_eps_bearer_info_t *eps_bearer_info_local_var = ogs_malloc(sizeof(OpenAPI_eps_bearer_info_t)); + ogs_assert(eps_bearer_info_local_var); + eps_bearer_info_local_var->ebi = ebi; eps_bearer_info_local_var->pgw_s8u_fteid = pgw_s8u_fteid; eps_bearer_info_local_var->bearer_level_qo_s = bearer_level_qo_s; diff --git a/lib/sbi/openapi/model/eps_interworking_info.c b/lib/sbi/openapi/model/eps_interworking_info.c index 3e2803e7f..110992eb1 100644 --- a/lib/sbi/openapi/model/eps_interworking_info.c +++ b/lib/sbi/openapi/model/eps_interworking_info.c @@ -8,10 +8,9 @@ OpenAPI_eps_interworking_info_t *OpenAPI_eps_interworking_info_create( OpenAPI_list_t* eps_iwk_pgws ) { - OpenAPI_eps_interworking_info_t *eps_interworking_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_eps_interworking_info_t)); - if (!eps_interworking_info_local_var) { - return NULL; - } + OpenAPI_eps_interworking_info_t *eps_interworking_info_local_var = ogs_malloc(sizeof(OpenAPI_eps_interworking_info_t)); + ogs_assert(eps_interworking_info_local_var); + eps_interworking_info_local_var->eps_iwk_pgws = eps_iwk_pgws; return eps_interworking_info_local_var; @@ -25,6 +24,7 @@ void OpenAPI_eps_interworking_info_free(OpenAPI_eps_interworking_info_t *eps_int OpenAPI_lnode_t *node; OpenAPI_list_for_each(eps_interworking_info->eps_iwk_pgws, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_eps_iwk_pgw_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -87,9 +87,9 @@ OpenAPI_eps_interworking_info_t *OpenAPI_eps_interworking_info_parseFromJSON(cJS cJSON *localMapObject = eps_iwk_pgws_local_map; if (cJSON_IsObject(eps_iwk_pgws_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_eps_iwk_pgw_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_eps_iwk_pgw_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(eps_iwk_pgws_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_eps_interworking_info_parseFromJSON() failed [eps_iwk_pgws]"); goto end; diff --git a/lib/sbi/openapi/model/eps_iwk_pgw.c b/lib/sbi/openapi/model/eps_iwk_pgw.c index fac2e632d..a5fbe4fcd 100644 --- a/lib/sbi/openapi/model/eps_iwk_pgw.c +++ b/lib/sbi/openapi/model/eps_iwk_pgw.c @@ -9,10 +9,9 @@ OpenAPI_eps_iwk_pgw_t *OpenAPI_eps_iwk_pgw_create( char *smf_instance_id ) { - OpenAPI_eps_iwk_pgw_t *eps_iwk_pgw_local_var = OpenAPI_malloc(sizeof(OpenAPI_eps_iwk_pgw_t)); - if (!eps_iwk_pgw_local_var) { - return NULL; - } + OpenAPI_eps_iwk_pgw_t *eps_iwk_pgw_local_var = ogs_malloc(sizeof(OpenAPI_eps_iwk_pgw_t)); + ogs_assert(eps_iwk_pgw_local_var); + eps_iwk_pgw_local_var->pgw_fqdn = pgw_fqdn; eps_iwk_pgw_local_var->smf_instance_id = smf_instance_id; @@ -80,8 +79,8 @@ OpenAPI_eps_iwk_pgw_t *OpenAPI_eps_iwk_pgw_parseFromJSON(cJSON *eps_iwk_pgwJSON) } eps_iwk_pgw_local_var = OpenAPI_eps_iwk_pgw_create ( - ogs_strdup_or_assert(pgw_fqdn->valuestring), - ogs_strdup_or_assert(smf_instance_id->valuestring) + ogs_strdup(pgw_fqdn->valuestring), + ogs_strdup(smf_instance_id->valuestring) ); return eps_iwk_pgw_local_var; diff --git a/lib/sbi/openapi/model/eps_nas_security_mode.c b/lib/sbi/openapi/model/eps_nas_security_mode.c index 75c95b429..58fd2fc17 100644 --- a/lib/sbi/openapi/model/eps_nas_security_mode.c +++ b/lib/sbi/openapi/model/eps_nas_security_mode.c @@ -9,10 +9,9 @@ OpenAPI_eps_nas_security_mode_t *OpenAPI_eps_nas_security_mode_create( OpenAPI_eps_nas_ciphering_algorithm_e ciphering_algorithm ) { - OpenAPI_eps_nas_security_mode_t *eps_nas_security_mode_local_var = OpenAPI_malloc(sizeof(OpenAPI_eps_nas_security_mode_t)); - if (!eps_nas_security_mode_local_var) { - return NULL; - } + OpenAPI_eps_nas_security_mode_t *eps_nas_security_mode_local_var = ogs_malloc(sizeof(OpenAPI_eps_nas_security_mode_t)); + ogs_assert(eps_nas_security_mode_local_var); + eps_nas_security_mode_local_var->integrity_algorithm = integrity_algorithm; eps_nas_security_mode_local_var->ciphering_algorithm = ciphering_algorithm; diff --git a/lib/sbi/openapi/model/eps_pdn_cnx_info.c b/lib/sbi/openapi/model/eps_pdn_cnx_info.c index cdb02114c..7363686ad 100644 --- a/lib/sbi/openapi/model/eps_pdn_cnx_info.c +++ b/lib/sbi/openapi/model/eps_pdn_cnx_info.c @@ -11,10 +11,9 @@ OpenAPI_eps_pdn_cnx_info_t *OpenAPI_eps_pdn_cnx_info_create( int linked_bearer_id ) { - OpenAPI_eps_pdn_cnx_info_t *eps_pdn_cnx_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_eps_pdn_cnx_info_t)); - if (!eps_pdn_cnx_info_local_var) { - return NULL; - } + OpenAPI_eps_pdn_cnx_info_t *eps_pdn_cnx_info_local_var = ogs_malloc(sizeof(OpenAPI_eps_pdn_cnx_info_t)); + ogs_assert(eps_pdn_cnx_info_local_var); + eps_pdn_cnx_info_local_var->pgw_s8c_fteid = pgw_s8c_fteid; eps_pdn_cnx_info_local_var->pgw_node_name = pgw_node_name; eps_pdn_cnx_info_local_var->is_linked_bearer_id = is_linked_bearer_id; diff --git a/lib/sbi/openapi/model/error_report.c b/lib/sbi/openapi/model/error_report.c index ad7ab33ba..59450cbc5 100644 --- a/lib/sbi/openapi/model/error_report.c +++ b/lib/sbi/openapi/model/error_report.c @@ -12,10 +12,9 @@ OpenAPI_error_report_t *OpenAPI_error_report_create( char *alt_qos_param_id ) { - OpenAPI_error_report_t *error_report_local_var = OpenAPI_malloc(sizeof(OpenAPI_error_report_t)); - if (!error_report_local_var) { - return NULL; - } + OpenAPI_error_report_t *error_report_local_var = ogs_malloc(sizeof(OpenAPI_error_report_t)); + ogs_assert(error_report_local_var); + error_report_local_var->error = error; error_report_local_var->rule_reports = rule_reports; error_report_local_var->sess_rule_reports = sess_rule_reports; @@ -226,7 +225,7 @@ OpenAPI_error_report_t *OpenAPI_error_report_parseFromJSON(cJSON *error_reportJS rule_reports ? rule_reportsList : NULL, sess_rule_reports ? sess_rule_reportsList : NULL, pol_dec_failure_reports ? pol_dec_failure_reportsList : NULL, - alt_qos_param_id ? ogs_strdup_or_assert(alt_qos_param_id->valuestring) : NULL + alt_qos_param_id ? ogs_strdup(alt_qos_param_id->valuestring) : NULL ); return error_report_local_var; diff --git a/lib/sbi/openapi/model/eth_flow_description.c b/lib/sbi/openapi/model/eth_flow_description.c index e73805ec7..331a7a935 100644 --- a/lib/sbi/openapi/model/eth_flow_description.c +++ b/lib/sbi/openapi/model/eth_flow_description.c @@ -15,10 +15,9 @@ OpenAPI_eth_flow_description_t *OpenAPI_eth_flow_description_create( char *dest_mac_addr_end ) { - OpenAPI_eth_flow_description_t *eth_flow_description_local_var = OpenAPI_malloc(sizeof(OpenAPI_eth_flow_description_t)); - if (!eth_flow_description_local_var) { - return NULL; - } + OpenAPI_eth_flow_description_t *eth_flow_description_local_var = ogs_malloc(sizeof(OpenAPI_eth_flow_description_t)); + ogs_assert(eth_flow_description_local_var); + eth_flow_description_local_var->dest_mac_addr = dest_mac_addr; eth_flow_description_local_var->eth_type = eth_type; eth_flow_description_local_var->f_desc = f_desc; @@ -195,7 +194,7 @@ OpenAPI_eth_flow_description_t *OpenAPI_eth_flow_description_parseFromJSON(cJSON ogs_error("OpenAPI_eth_flow_description_parseFromJSON() failed [vlan_tags]"); goto end; } - OpenAPI_list_add(vlan_tagsList , ogs_strdup_or_assert(vlan_tags_local->valuestring)); + OpenAPI_list_add(vlan_tagsList , ogs_strdup(vlan_tags_local->valuestring)); } } @@ -218,14 +217,14 @@ OpenAPI_eth_flow_description_t *OpenAPI_eth_flow_description_parseFromJSON(cJSON } eth_flow_description_local_var = OpenAPI_eth_flow_description_create ( - dest_mac_addr ? ogs_strdup_or_assert(dest_mac_addr->valuestring) : NULL, - ogs_strdup_or_assert(eth_type->valuestring), - f_desc ? ogs_strdup_or_assert(f_desc->valuestring) : NULL, + dest_mac_addr ? ogs_strdup(dest_mac_addr->valuestring) : NULL, + ogs_strdup(eth_type->valuestring), + f_desc ? ogs_strdup(f_desc->valuestring) : NULL, f_dir ? f_dirVariable : 0, - source_mac_addr ? ogs_strdup_or_assert(source_mac_addr->valuestring) : NULL, + source_mac_addr ? ogs_strdup(source_mac_addr->valuestring) : NULL, vlan_tags ? vlan_tagsList : NULL, - src_mac_addr_end ? ogs_strdup_or_assert(src_mac_addr_end->valuestring) : NULL, - dest_mac_addr_end ? ogs_strdup_or_assert(dest_mac_addr_end->valuestring) : NULL + src_mac_addr_end ? ogs_strdup(src_mac_addr_end->valuestring) : NULL, + dest_mac_addr_end ? ogs_strdup(dest_mac_addr_end->valuestring) : NULL ); return eth_flow_description_local_var; diff --git a/lib/sbi/openapi/model/eutra_location.c b/lib/sbi/openapi/model/eutra_location.c index cf4302e84..e6f8ea51a 100644 --- a/lib/sbi/openapi/model/eutra_location.c +++ b/lib/sbi/openapi/model/eutra_location.c @@ -20,10 +20,9 @@ OpenAPI_eutra_location_t *OpenAPI_eutra_location_create( OpenAPI_global_ran_node_id_t *global_enb_id ) { - OpenAPI_eutra_location_t *eutra_location_local_var = OpenAPI_malloc(sizeof(OpenAPI_eutra_location_t)); - if (!eutra_location_local_var) { - return NULL; - } + OpenAPI_eutra_location_t *eutra_location_local_var = ogs_malloc(sizeof(OpenAPI_eutra_location_t)); + ogs_assert(eutra_location_local_var); + eutra_location_local_var->tai = tai; eutra_location_local_var->is_ignore_tai = is_ignore_tai; eutra_location_local_var->ignore_tai = ignore_tai; @@ -259,9 +258,9 @@ OpenAPI_eutra_location_t *OpenAPI_eutra_location_parseFromJSON(cJSON *eutra_loca ignore_ecgi ? ignore_ecgi->valueint : 0, age_of_location_information ? true : false, age_of_location_information ? age_of_location_information->valuedouble : 0, - ue_location_timestamp ? ogs_strdup_or_assert(ue_location_timestamp->valuestring) : NULL, - geographical_information ? ogs_strdup_or_assert(geographical_information->valuestring) : NULL, - geodetic_information ? ogs_strdup_or_assert(geodetic_information->valuestring) : NULL, + ue_location_timestamp ? ogs_strdup(ue_location_timestamp->valuestring) : NULL, + geographical_information ? ogs_strdup(geographical_information->valuestring) : NULL, + geodetic_information ? ogs_strdup(geodetic_information->valuestring) : NULL, global_ngenb_id ? global_ngenb_id_local_nonprim : NULL, global_enb_id ? global_enb_id_local_nonprim : NULL ); diff --git a/lib/sbi/openapi/model/event_id.c b/lib/sbi/openapi/model/event_id.c index 247f27bdf..aedbb88ed 100644 --- a/lib/sbi/openapi/model/event_id.c +++ b/lib/sbi/openapi/model/event_id.c @@ -7,10 +7,9 @@ OpenAPI_event_id_t *OpenAPI_event_id_create( ) { - OpenAPI_event_id_t *event_id_local_var = OpenAPI_malloc(sizeof(OpenAPI_event_id_t)); - if (!event_id_local_var) { - return NULL; - } + OpenAPI_event_id_t *event_id_local_var = ogs_malloc(sizeof(OpenAPI_event_id_t)); + ogs_assert(event_id_local_var); + return event_id_local_var; } diff --git a/lib/sbi/openapi/model/event_report_mode.c b/lib/sbi/openapi/model/event_report_mode.c index 27f42cc86..aba0809f3 100644 --- a/lib/sbi/openapi/model/event_report_mode.c +++ b/lib/sbi/openapi/model/event_report_mode.c @@ -7,10 +7,9 @@ OpenAPI_event_report_mode_t *OpenAPI_event_report_mode_create( ) { - OpenAPI_event_report_mode_t *event_report_mode_local_var = OpenAPI_malloc(sizeof(OpenAPI_event_report_mode_t)); - if (!event_report_mode_local_var) { - return NULL; - } + OpenAPI_event_report_mode_t *event_report_mode_local_var = ogs_malloc(sizeof(OpenAPI_event_report_mode_t)); + ogs_assert(event_report_mode_local_var); + return event_report_mode_local_var; } diff --git a/lib/sbi/openapi/model/event_type.c b/lib/sbi/openapi/model/event_type.c index 497a9e764..38e8130c5 100644 --- a/lib/sbi/openapi/model/event_type.c +++ b/lib/sbi/openapi/model/event_type.c @@ -7,10 +7,9 @@ OpenAPI_event_type_t *OpenAPI_event_type_create( ) { - OpenAPI_event_type_t *event_type_local_var = OpenAPI_malloc(sizeof(OpenAPI_event_type_t)); - if (!event_type_local_var) { - return NULL; - } + OpenAPI_event_type_t *event_type_local_var = ogs_malloc(sizeof(OpenAPI_event_type_t)); + ogs_assert(event_type_local_var); + return event_type_local_var; } diff --git a/lib/sbi/openapi/model/events_notification.c b/lib/sbi/openapi/model/events_notification.c index 7fc63b30e..2d7998d10 100644 --- a/lib/sbi/openapi/model/events_notification.c +++ b/lib/sbi/openapi/model/events_notification.c @@ -30,10 +30,9 @@ OpenAPI_events_notification_t *OpenAPI_events_notification_create( OpenAPI_list_t *tsn_port_man_cont_nwtts ) { - OpenAPI_events_notification_t *events_notification_local_var = OpenAPI_malloc(sizeof(OpenAPI_events_notification_t)); - if (!events_notification_local_var) { - return NULL; - } + OpenAPI_events_notification_t *events_notification_local_var = ogs_malloc(sizeof(OpenAPI_events_notification_t)); + ogs_assert(events_notification_local_var); + events_notification_local_var->access_type = access_type; events_notification_local_var->add_access_info = add_access_info; events_notification_local_var->rel_access_info = rel_access_info; @@ -794,7 +793,7 @@ OpenAPI_events_notification_t *OpenAPI_events_notification_parseFromJSON(cJSON * an_charg_addr ? an_charg_addr_local_nonprim : NULL, an_charg_ids ? an_charg_idsList : NULL, an_gw_addr ? an_gw_addr_local_nonprim : NULL, - ogs_strdup_or_assert(ev_subs_uri->valuestring), + ogs_strdup(ev_subs_uri->valuestring), ev_notifsList, failed_resourc_alloc_reports ? failed_resourc_alloc_reportsList : NULL, succ_resourc_alloc_reports ? succ_resourc_alloc_reportsList : NULL, @@ -806,7 +805,7 @@ OpenAPI_events_notification_t *OpenAPI_events_notification_parseFromJSON(cJSON * ran_nas_rel_causes ? ran_nas_rel_causesList : NULL, rat_type ? rat_typeVariable : 0, ue_loc ? ue_loc_local_nonprim : NULL, - ue_time_zone ? ogs_strdup_or_assert(ue_time_zone->valuestring) : NULL, + ue_time_zone ? ogs_strdup(ue_time_zone->valuestring) : NULL, usg_rep ? usg_rep_local_nonprim : NULL, tsn_bridge_man_cont ? tsn_bridge_man_cont_local_nonprim : NULL, tsn_port_man_cont_dstt ? tsn_port_man_cont_dstt_local_nonprim : NULL, diff --git a/lib/sbi/openapi/model/events_subsc_put_data.c b/lib/sbi/openapi/model/events_subsc_put_data.c index 1ee26112a..ac23b567e 100644 --- a/lib/sbi/openapi/model/events_subsc_put_data.c +++ b/lib/sbi/openapi/model/events_subsc_put_data.c @@ -37,10 +37,9 @@ OpenAPI_events_subsc_put_data_t *OpenAPI_events_subsc_put_data_create( OpenAPI_list_t *tsn_port_man_cont_nwtts ) { - OpenAPI_events_subsc_put_data_t *events_subsc_put_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_events_subsc_put_data_t)); - if (!events_subsc_put_data_local_var) { - return NULL; - } + OpenAPI_events_subsc_put_data_t *events_subsc_put_data_local_var = ogs_malloc(sizeof(OpenAPI_events_subsc_put_data_t)); + ogs_assert(events_subsc_put_data_local_var); + events_subsc_put_data_local_var->events = events; events_subsc_put_data_local_var->notif_uri = notif_uri; events_subsc_put_data_local_var->req_qos_mon_params = req_qos_mon_params; @@ -1002,19 +1001,19 @@ OpenAPI_events_subsc_put_data_t *OpenAPI_events_subsc_put_data_parseFromJSON(cJS events_subsc_put_data_local_var = OpenAPI_events_subsc_put_data_create ( eventsList, - notif_uri ? ogs_strdup_or_assert(notif_uri->valuestring) : NULL, + notif_uri ? ogs_strdup(notif_uri->valuestring) : NULL, req_qos_mon_params ? req_qos_mon_paramsList : NULL, qos_mon ? qos_mon_local_nonprim : NULL, req_anis ? req_anisList : NULL, usg_thres ? usg_thres_local_nonprim : NULL, - notif_corre_id ? ogs_strdup_or_assert(notif_corre_id->valuestring) : NULL, + notif_corre_id ? ogs_strdup(notif_corre_id->valuestring) : NULL, access_type ? access_typeVariable : 0, add_access_info ? add_access_info_local_nonprim : NULL, rel_access_info ? rel_access_info_local_nonprim : NULL, an_charg_addr ? an_charg_addr_local_nonprim : NULL, an_charg_ids ? an_charg_idsList : NULL, an_gw_addr ? an_gw_addr_local_nonprim : NULL, - ogs_strdup_or_assert(ev_subs_uri->valuestring), + ogs_strdup(ev_subs_uri->valuestring), ev_notifsList, failed_resourc_alloc_reports ? failed_resourc_alloc_reportsList : NULL, succ_resourc_alloc_reports ? succ_resourc_alloc_reportsList : NULL, @@ -1026,7 +1025,7 @@ OpenAPI_events_subsc_put_data_t *OpenAPI_events_subsc_put_data_parseFromJSON(cJS ran_nas_rel_causes ? ran_nas_rel_causesList : NULL, rat_type ? rat_typeVariable : 0, ue_loc ? ue_loc_local_nonprim : NULL, - ue_time_zone ? ogs_strdup_or_assert(ue_time_zone->valuestring) : NULL, + ue_time_zone ? ogs_strdup(ue_time_zone->valuestring) : NULL, usg_rep ? usg_rep_local_nonprim : NULL, tsn_bridge_man_cont ? tsn_bridge_man_cont_local_nonprim : NULL, tsn_port_man_cont_dstt ? tsn_port_man_cont_dstt_local_nonprim : NULL, diff --git a/lib/sbi/openapi/model/events_subsc_req_data.c b/lib/sbi/openapi/model/events_subsc_req_data.c index 5770a47ed..af280e3fb 100644 --- a/lib/sbi/openapi/model/events_subsc_req_data.c +++ b/lib/sbi/openapi/model/events_subsc_req_data.c @@ -14,10 +14,9 @@ OpenAPI_events_subsc_req_data_t *OpenAPI_events_subsc_req_data_create( char *notif_corre_id ) { - OpenAPI_events_subsc_req_data_t *events_subsc_req_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_events_subsc_req_data_t)); - if (!events_subsc_req_data_local_var) { - return NULL; - } + OpenAPI_events_subsc_req_data_t *events_subsc_req_data_local_var = ogs_malloc(sizeof(OpenAPI_events_subsc_req_data_t)); + ogs_assert(events_subsc_req_data_local_var); + events_subsc_req_data_local_var->events = events; events_subsc_req_data_local_var->notif_uri = notif_uri; events_subsc_req_data_local_var->req_qos_mon_params = req_qos_mon_params; @@ -256,12 +255,12 @@ OpenAPI_events_subsc_req_data_t *OpenAPI_events_subsc_req_data_parseFromJSON(cJS events_subsc_req_data_local_var = OpenAPI_events_subsc_req_data_create ( eventsList, - notif_uri ? ogs_strdup_or_assert(notif_uri->valuestring) : NULL, + notif_uri ? ogs_strdup(notif_uri->valuestring) : NULL, req_qos_mon_params ? req_qos_mon_paramsList : NULL, qos_mon ? qos_mon_local_nonprim : NULL, req_anis ? req_anisList : NULL, usg_thres ? usg_thres_local_nonprim : NULL, - notif_corre_id ? ogs_strdup_or_assert(notif_corre_id->valuestring) : NULL + notif_corre_id ? ogs_strdup(notif_corre_id->valuestring) : NULL ); return events_subsc_req_data_local_var; diff --git a/lib/sbi/openapi/model/events_subsc_req_data_rm.c b/lib/sbi/openapi/model/events_subsc_req_data_rm.c index ef06b5987..b085a12b5 100644 --- a/lib/sbi/openapi/model/events_subsc_req_data_rm.c +++ b/lib/sbi/openapi/model/events_subsc_req_data_rm.c @@ -14,10 +14,9 @@ OpenAPI_events_subsc_req_data_rm_t *OpenAPI_events_subsc_req_data_rm_create( char *notif_corre_id ) { - OpenAPI_events_subsc_req_data_rm_t *events_subsc_req_data_rm_local_var = OpenAPI_malloc(sizeof(OpenAPI_events_subsc_req_data_rm_t)); - if (!events_subsc_req_data_rm_local_var) { - return NULL; - } + OpenAPI_events_subsc_req_data_rm_t *events_subsc_req_data_rm_local_var = ogs_malloc(sizeof(OpenAPI_events_subsc_req_data_rm_t)); + ogs_assert(events_subsc_req_data_rm_local_var); + events_subsc_req_data_rm_local_var->events = events; events_subsc_req_data_rm_local_var->notif_uri = notif_uri; events_subsc_req_data_rm_local_var->req_qos_mon_params = req_qos_mon_params; @@ -256,12 +255,12 @@ OpenAPI_events_subsc_req_data_rm_t *OpenAPI_events_subsc_req_data_rm_parseFromJS events_subsc_req_data_rm_local_var = OpenAPI_events_subsc_req_data_rm_create ( eventsList, - notif_uri ? ogs_strdup_or_assert(notif_uri->valuestring) : NULL, + notif_uri ? ogs_strdup(notif_uri->valuestring) : NULL, req_qos_mon_params ? req_qos_mon_paramsList : NULL, qos_mon ? qos_mon_local_nonprim : NULL, req_anis ? req_anisList : NULL, usg_thres ? usg_thres_local_nonprim : NULL, - notif_corre_id ? ogs_strdup_or_assert(notif_corre_id->valuestring) : NULL + notif_corre_id ? ogs_strdup(notif_corre_id->valuestring) : NULL ); return events_subsc_req_data_rm_local_var; diff --git a/lib/sbi/openapi/model/exemption_ind.c b/lib/sbi/openapi/model/exemption_ind.c index a0c335ed1..d068fddd3 100644 --- a/lib/sbi/openapi/model/exemption_ind.c +++ b/lib/sbi/openapi/model/exemption_ind.c @@ -13,10 +13,9 @@ OpenAPI_exemption_ind_t *OpenAPI_exemption_ind_create( int snssai_dnn_congestion ) { - OpenAPI_exemption_ind_t *exemption_ind_local_var = OpenAPI_malloc(sizeof(OpenAPI_exemption_ind_t)); - if (!exemption_ind_local_var) { - return NULL; - } + OpenAPI_exemption_ind_t *exemption_ind_local_var = ogs_malloc(sizeof(OpenAPI_exemption_ind_t)); + ogs_assert(exemption_ind_local_var); + exemption_ind_local_var->is_dnn_congestion = is_dnn_congestion; exemption_ind_local_var->dnn_congestion = dnn_congestion; exemption_ind_local_var->is_snssai_only_congestion = is_snssai_only_congestion; diff --git a/lib/sbi/openapi/model/expected_ue_behavior.c b/lib/sbi/openapi/model/expected_ue_behavior.c index 9d7b68472..64c27e9b7 100644 --- a/lib/sbi/openapi/model/expected_ue_behavior.c +++ b/lib/sbi/openapi/model/expected_ue_behavior.c @@ -9,10 +9,9 @@ OpenAPI_expected_ue_behavior_t *OpenAPI_expected_ue_behavior_create( char *validity_time ) { - OpenAPI_expected_ue_behavior_t *expected_ue_behavior_local_var = OpenAPI_malloc(sizeof(OpenAPI_expected_ue_behavior_t)); - if (!expected_ue_behavior_local_var) { - return NULL; - } + OpenAPI_expected_ue_behavior_t *expected_ue_behavior_local_var = ogs_malloc(sizeof(OpenAPI_expected_ue_behavior_t)); + ogs_assert(expected_ue_behavior_local_var); + expected_ue_behavior_local_var->exp_move_trajectory = exp_move_trajectory; expected_ue_behavior_local_var->validity_time = validity_time; @@ -111,7 +110,7 @@ OpenAPI_expected_ue_behavior_t *OpenAPI_expected_ue_behavior_parseFromJSON(cJSON expected_ue_behavior_local_var = OpenAPI_expected_ue_behavior_create ( exp_move_trajectoryList, - ogs_strdup_or_assert(validity_time->valuestring) + ogs_strdup(validity_time->valuestring) ); return expected_ue_behavior_local_var; diff --git a/lib/sbi/openapi/model/expected_ue_behaviour.c b/lib/sbi/openapi/model/expected_ue_behaviour.c index 75457cad5..db02a542e 100644 --- a/lib/sbi/openapi/model/expected_ue_behaviour.c +++ b/lib/sbi/openapi/model/expected_ue_behaviour.c @@ -21,10 +21,9 @@ OpenAPI_expected_ue_behaviour_t *OpenAPI_expected_ue_behaviour_create( char *mtc_provider_information ) { - OpenAPI_expected_ue_behaviour_t *expected_ue_behaviour_local_var = OpenAPI_malloc(sizeof(OpenAPI_expected_ue_behaviour_t)); - if (!expected_ue_behaviour_local_var) { - return NULL; - } + OpenAPI_expected_ue_behaviour_t *expected_ue_behaviour_local_var = ogs_malloc(sizeof(OpenAPI_expected_ue_behaviour_t)); + ogs_assert(expected_ue_behaviour_local_var); + expected_ue_behaviour_local_var->af_instance_id = af_instance_id; expected_ue_behaviour_local_var->reference_id = reference_id; expected_ue_behaviour_local_var->stationary_indication = stationary_indication; @@ -321,7 +320,7 @@ OpenAPI_expected_ue_behaviour_t *OpenAPI_expected_ue_behaviour_parseFromJSON(cJS } expected_ue_behaviour_local_var = OpenAPI_expected_ue_behaviour_create ( - ogs_strdup_or_assert(af_instance_id->valuestring), + ogs_strdup(af_instance_id->valuestring), reference_id->valuedouble, stationary_indication ? stationary_indication_local_nonprim : NULL, @@ -334,8 +333,8 @@ OpenAPI_expected_ue_behaviour_t *OpenAPI_expected_ue_behaviour_parseFromJSON(cJS expected_umts ? expected_umtsList : NULL, traffic_profile ? traffic_profile_local_nonprim : NULL, battery_indication ? battery_indication_local_nonprim : NULL, - validity_time ? ogs_strdup_or_assert(validity_time->valuestring) : NULL, - mtc_provider_information ? ogs_strdup_or_assert(mtc_provider_information->valuestring) : NULL + validity_time ? ogs_strdup(validity_time->valuestring) : NULL, + mtc_provider_information ? ogs_strdup(mtc_provider_information->valuestring) : NULL ); return expected_ue_behaviour_local_var; diff --git a/lib/sbi/openapi/model/expected_ue_behaviour_data.c b/lib/sbi/openapi/model/expected_ue_behaviour_data.c index 2af7ad58e..8e93d0e38 100644 --- a/lib/sbi/openapi/model/expected_ue_behaviour_data.c +++ b/lib/sbi/openapi/model/expected_ue_behaviour_data.c @@ -18,10 +18,9 @@ OpenAPI_expected_ue_behaviour_data_t *OpenAPI_expected_ue_behaviour_data_create( char *validity_time ) { - OpenAPI_expected_ue_behaviour_data_t *expected_ue_behaviour_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_expected_ue_behaviour_data_t)); - if (!expected_ue_behaviour_data_local_var) { - return NULL; - } + OpenAPI_expected_ue_behaviour_data_t *expected_ue_behaviour_data_local_var = ogs_malloc(sizeof(OpenAPI_expected_ue_behaviour_data_t)); + ogs_assert(expected_ue_behaviour_data_local_var); + expected_ue_behaviour_data_local_var->stationary_indication = stationary_indication; expected_ue_behaviour_data_local_var->is_communication_duration_time = is_communication_duration_time; expected_ue_behaviour_data_local_var->communication_duration_time = communication_duration_time; @@ -266,7 +265,7 @@ OpenAPI_expected_ue_behaviour_data_t *OpenAPI_expected_ue_behaviour_data_parseFr expected_umts ? expected_umtsList : NULL, traffic_profile ? traffic_profileVariable : 0, battery_indication ? battery_indication_local_nonprim : NULL, - validity_time ? ogs_strdup_or_assert(validity_time->valuestring) : NULL + validity_time ? ogs_strdup(validity_time->valuestring) : NULL ); return expected_ue_behaviour_data_local_var; diff --git a/lib/sbi/openapi/model/expected_ue_behaviour_data_1.c b/lib/sbi/openapi/model/expected_ue_behaviour_data_1.c index 7fb47fdcc..b38f01c39 100644 --- a/lib/sbi/openapi/model/expected_ue_behaviour_data_1.c +++ b/lib/sbi/openapi/model/expected_ue_behaviour_data_1.c @@ -18,10 +18,9 @@ OpenAPI_expected_ue_behaviour_data_1_t *OpenAPI_expected_ue_behaviour_data_1_cre char *validity_time ) { - OpenAPI_expected_ue_behaviour_data_1_t *expected_ue_behaviour_data_1_local_var = OpenAPI_malloc(sizeof(OpenAPI_expected_ue_behaviour_data_1_t)); - if (!expected_ue_behaviour_data_1_local_var) { - return NULL; - } + OpenAPI_expected_ue_behaviour_data_1_t *expected_ue_behaviour_data_1_local_var = ogs_malloc(sizeof(OpenAPI_expected_ue_behaviour_data_1_t)); + ogs_assert(expected_ue_behaviour_data_1_local_var); + expected_ue_behaviour_data_1_local_var->stationary_indication = stationary_indication; expected_ue_behaviour_data_1_local_var->is_communication_duration_time = is_communication_duration_time; expected_ue_behaviour_data_1_local_var->communication_duration_time = communication_duration_time; @@ -266,7 +265,7 @@ OpenAPI_expected_ue_behaviour_data_1_t *OpenAPI_expected_ue_behaviour_data_1_par expected_umts ? expected_umtsList : NULL, traffic_profile ? traffic_profileVariable : 0, battery_indication ? battery_indication_local_nonprim : NULL, - validity_time ? ogs_strdup_or_assert(validity_time->valuestring) : NULL + validity_time ? ogs_strdup(validity_time->valuestring) : NULL ); return expected_ue_behaviour_data_1_local_var; diff --git a/lib/sbi/openapi/model/exposure_data_change_notification.c b/lib/sbi/openapi/model/exposure_data_change_notification.c index 3b3f08f92..5003767a0 100644 --- a/lib/sbi/openapi/model/exposure_data_change_notification.c +++ b/lib/sbi/openapi/model/exposure_data_change_notification.c @@ -11,10 +11,9 @@ OpenAPI_exposure_data_change_notification_t *OpenAPI_exposure_data_change_notifi OpenAPI_list_t *del_resources ) { - OpenAPI_exposure_data_change_notification_t *exposure_data_change_notification_local_var = OpenAPI_malloc(sizeof(OpenAPI_exposure_data_change_notification_t)); - if (!exposure_data_change_notification_local_var) { - return NULL; - } + OpenAPI_exposure_data_change_notification_t *exposure_data_change_notification_local_var = ogs_malloc(sizeof(OpenAPI_exposure_data_change_notification_t)); + ogs_assert(exposure_data_change_notification_local_var); + exposure_data_change_notification_local_var->ue_id = ue_id; exposure_data_change_notification_local_var->access_and_mobility_data = access_and_mobility_data; exposure_data_change_notification_local_var->pdu_session_management_data = pdu_session_management_data; @@ -170,12 +169,12 @@ OpenAPI_exposure_data_change_notification_t *OpenAPI_exposure_data_change_notifi ogs_error("OpenAPI_exposure_data_change_notification_parseFromJSON() failed [del_resources]"); goto end; } - OpenAPI_list_add(del_resourcesList , ogs_strdup_or_assert(del_resources_local->valuestring)); + OpenAPI_list_add(del_resourcesList , ogs_strdup(del_resources_local->valuestring)); } } exposure_data_change_notification_local_var = OpenAPI_exposure_data_change_notification_create ( - ue_id ? ogs_strdup_or_assert(ue_id->valuestring) : NULL, + ue_id ? ogs_strdup(ue_id->valuestring) : NULL, access_and_mobility_data ? access_and_mobility_data_local_nonprim : NULL, pdu_session_management_data ? pdu_session_management_dataList : NULL, del_resources ? del_resourcesList : NULL diff --git a/lib/sbi/openapi/model/exposure_data_subscription.c b/lib/sbi/openapi/model/exposure_data_subscription.c index ab302e35c..ee4243932 100644 --- a/lib/sbi/openapi/model/exposure_data_subscription.c +++ b/lib/sbi/openapi/model/exposure_data_subscription.c @@ -11,10 +11,9 @@ OpenAPI_exposure_data_subscription_t *OpenAPI_exposure_data_subscription_create( char *supported_features ) { - OpenAPI_exposure_data_subscription_t *exposure_data_subscription_local_var = OpenAPI_malloc(sizeof(OpenAPI_exposure_data_subscription_t)); - if (!exposure_data_subscription_local_var) { - return NULL; - } + OpenAPI_exposure_data_subscription_t *exposure_data_subscription_local_var = ogs_malloc(sizeof(OpenAPI_exposure_data_subscription_t)); + ogs_assert(exposure_data_subscription_local_var); + exposure_data_subscription_local_var->notification_uri = notification_uri; exposure_data_subscription_local_var->monitored_resource_uris = monitored_resource_uris; exposure_data_subscription_local_var->expiry = expiry; @@ -119,7 +118,7 @@ OpenAPI_exposure_data_subscription_t *OpenAPI_exposure_data_subscription_parseFr ogs_error("OpenAPI_exposure_data_subscription_parseFromJSON() failed [monitored_resource_uris]"); goto end; } - OpenAPI_list_add(monitored_resource_urisList , ogs_strdup_or_assert(monitored_resource_uris_local->valuestring)); + OpenAPI_list_add(monitored_resource_urisList , ogs_strdup(monitored_resource_uris_local->valuestring)); } cJSON *expiry = cJSON_GetObjectItemCaseSensitive(exposure_data_subscriptionJSON, "expiry"); @@ -141,10 +140,10 @@ OpenAPI_exposure_data_subscription_t *OpenAPI_exposure_data_subscription_parseFr } exposure_data_subscription_local_var = OpenAPI_exposure_data_subscription_create ( - ogs_strdup_or_assert(notification_uri->valuestring), + ogs_strdup(notification_uri->valuestring), monitored_resource_urisList, - expiry ? ogs_strdup_or_assert(expiry->valuestring) : NULL, - supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL + expiry ? ogs_strdup(expiry->valuestring) : NULL, + supported_features ? ogs_strdup(supported_features->valuestring) : NULL ); return exposure_data_subscription_local_var; diff --git a/lib/sbi/openapi/model/ext_amf_event_subscription.c b/lib/sbi/openapi/model/ext_amf_event_subscription.c index 3ae4cf61b..fd4300091 100644 --- a/lib/sbi/openapi/model/ext_amf_event_subscription.c +++ b/lib/sbi/openapi/model/ext_amf_event_subscription.c @@ -23,10 +23,9 @@ OpenAPI_ext_amf_event_subscription_t *OpenAPI_ext_amf_event_subscription_create( OpenAPI_nf_type_e subscribing_nf_type ) { - OpenAPI_ext_amf_event_subscription_t *ext_amf_event_subscription_local_var = OpenAPI_malloc(sizeof(OpenAPI_ext_amf_event_subscription_t)); - if (!ext_amf_event_subscription_local_var) { - return NULL; - } + OpenAPI_ext_amf_event_subscription_t *ext_amf_event_subscription_local_var = ogs_malloc(sizeof(OpenAPI_ext_amf_event_subscription_t)); + ogs_assert(ext_amf_event_subscription_local_var); + ext_amf_event_subscription_local_var->event_list = event_list; ext_amf_event_subscription_local_var->event_notify_uri = event_notify_uri; ext_amf_event_subscription_local_var->notify_correlation_id = notify_correlation_id; @@ -371,7 +370,7 @@ OpenAPI_ext_amf_event_subscription_t *OpenAPI_ext_amf_event_subscription_parseFr ogs_error("OpenAPI_ext_amf_event_subscription_parseFromJSON() failed [binding_info]"); goto end; } - OpenAPI_list_add(binding_infoList , ogs_strdup_or_assert(binding_info_local->valuestring)); + OpenAPI_list_add(binding_infoList , ogs_strdup(binding_info_local->valuestring)); } } @@ -388,15 +387,15 @@ OpenAPI_ext_amf_event_subscription_t *OpenAPI_ext_amf_event_subscription_parseFr ext_amf_event_subscription_local_var = OpenAPI_ext_amf_event_subscription_create ( event_listList, - ogs_strdup_or_assert(event_notify_uri->valuestring), - ogs_strdup_or_assert(notify_correlation_id->valuestring), - ogs_strdup_or_assert(nf_id->valuestring), - subs_change_notify_uri ? ogs_strdup_or_assert(subs_change_notify_uri->valuestring) : NULL, - subs_change_notify_correlation_id ? ogs_strdup_or_assert(subs_change_notify_correlation_id->valuestring) : NULL, - supi ? ogs_strdup_or_assert(supi->valuestring) : NULL, - group_id ? ogs_strdup_or_assert(group_id->valuestring) : NULL, - gpsi ? ogs_strdup_or_assert(gpsi->valuestring) : NULL, - pei ? ogs_strdup_or_assert(pei->valuestring) : NULL, + ogs_strdup(event_notify_uri->valuestring), + ogs_strdup(notify_correlation_id->valuestring), + ogs_strdup(nf_id->valuestring), + subs_change_notify_uri ? ogs_strdup(subs_change_notify_uri->valuestring) : NULL, + subs_change_notify_correlation_id ? ogs_strdup(subs_change_notify_correlation_id->valuestring) : NULL, + supi ? ogs_strdup(supi->valuestring) : NULL, + group_id ? ogs_strdup(group_id->valuestring) : NULL, + gpsi ? ogs_strdup(gpsi->valuestring) : NULL, + pei ? ogs_strdup(pei->valuestring) : NULL, any_ue ? true : false, any_ue ? any_ue->valueint : 0, options ? options_local_nonprim : NULL, diff --git a/lib/sbi/openapi/model/ext_problem_details.c b/lib/sbi/openapi/model/ext_problem_details.c index a81c466db..4a657c61d 100644 --- a/lib/sbi/openapi/model/ext_problem_details.c +++ b/lib/sbi/openapi/model/ext_problem_details.c @@ -21,10 +21,9 @@ OpenAPI_ext_problem_details_t *OpenAPI_ext_problem_details_create( int remote_error ) { - OpenAPI_ext_problem_details_t *ext_problem_details_local_var = OpenAPI_malloc(sizeof(OpenAPI_ext_problem_details_t)); - if (!ext_problem_details_local_var) { - return NULL; - } + OpenAPI_ext_problem_details_t *ext_problem_details_local_var = ogs_malloc(sizeof(OpenAPI_ext_problem_details_t)); + ogs_assert(ext_problem_details_local_var); + ext_problem_details_local_var->type = type; ext_problem_details_local_var->title = title; ext_problem_details_local_var->is_status = is_status; @@ -310,18 +309,18 @@ OpenAPI_ext_problem_details_t *OpenAPI_ext_problem_details_parseFromJSON(cJSON * } ext_problem_details_local_var = OpenAPI_ext_problem_details_create ( - type ? ogs_strdup_or_assert(type->valuestring) : NULL, - title ? ogs_strdup_or_assert(title->valuestring) : NULL, + type ? ogs_strdup(type->valuestring) : NULL, + title ? ogs_strdup(title->valuestring) : NULL, status ? true : false, status ? status->valuedouble : 0, - detail ? ogs_strdup_or_assert(detail->valuestring) : NULL, - instance ? ogs_strdup_or_assert(instance->valuestring) : NULL, - cause ? ogs_strdup_or_assert(cause->valuestring) : NULL, + detail ? ogs_strdup(detail->valuestring) : NULL, + instance ? ogs_strdup(instance->valuestring) : NULL, + cause ? ogs_strdup(cause->valuestring) : NULL, invalid_params ? invalid_paramsList : NULL, - supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, + supported_features ? ogs_strdup(supported_features->valuestring) : NULL, access_token_error ? access_token_error_local_nonprim : NULL, access_token_request ? access_token_request_local_nonprim : NULL, - nrf_id ? ogs_strdup_or_assert(nrf_id->valuestring) : NULL, + nrf_id ? ogs_strdup(nrf_id->valuestring) : NULL, remote_error ? true : false, remote_error ? remote_error->valueint : 0 ); diff --git a/lib/sbi/openapi/model/ext_snssai.c b/lib/sbi/openapi/model/ext_snssai.c index f0c3af135..1664543e3 100644 --- a/lib/sbi/openapi/model/ext_snssai.c +++ b/lib/sbi/openapi/model/ext_snssai.c @@ -12,10 +12,9 @@ OpenAPI_ext_snssai_t *OpenAPI_ext_snssai_create( int wildcard_sd ) { - OpenAPI_ext_snssai_t *ext_snssai_local_var = OpenAPI_malloc(sizeof(OpenAPI_ext_snssai_t)); - if (!ext_snssai_local_var) { - return NULL; - } + OpenAPI_ext_snssai_t *ext_snssai_local_var = ogs_malloc(sizeof(OpenAPI_ext_snssai_t)); + ogs_assert(ext_snssai_local_var); + ext_snssai_local_var->sst = sst; ext_snssai_local_var->sd = sd; ext_snssai_local_var->sd_ranges = sd_ranges; @@ -150,7 +149,7 @@ OpenAPI_ext_snssai_t *OpenAPI_ext_snssai_parseFromJSON(cJSON *ext_snssaiJSON) ext_snssai_local_var = OpenAPI_ext_snssai_create ( sst->valuedouble, - sd ? ogs_strdup_or_assert(sd->valuestring) : NULL, + sd ? ogs_strdup(sd->valuestring) : NULL, sd_ranges ? sd_rangesList : NULL, wildcard_sd ? true : false, wildcard_sd ? wildcard_sd->valueint : 0 diff --git a/lib/sbi/openapi/model/extended_problem_details.c b/lib/sbi/openapi/model/extended_problem_details.c index a7d4c5942..daf902a7e 100644 --- a/lib/sbi/openapi/model/extended_problem_details.c +++ b/lib/sbi/openapi/model/extended_problem_details.c @@ -20,10 +20,9 @@ OpenAPI_extended_problem_details_t *OpenAPI_extended_problem_details_create( OpenAPI_acceptable_service_info_t *acceptable_serv_info ) { - OpenAPI_extended_problem_details_t *extended_problem_details_local_var = OpenAPI_malloc(sizeof(OpenAPI_extended_problem_details_t)); - if (!extended_problem_details_local_var) { - return NULL; - } + OpenAPI_extended_problem_details_t *extended_problem_details_local_var = ogs_malloc(sizeof(OpenAPI_extended_problem_details_t)); + ogs_assert(extended_problem_details_local_var); + extended_problem_details_local_var->type = type; extended_problem_details_local_var->title = title; extended_problem_details_local_var->is_status = is_status; @@ -313,18 +312,18 @@ OpenAPI_extended_problem_details_t *OpenAPI_extended_problem_details_parseFromJS } extended_problem_details_local_var = OpenAPI_extended_problem_details_create ( - type ? ogs_strdup_or_assert(type->valuestring) : NULL, - title ? ogs_strdup_or_assert(title->valuestring) : NULL, + type ? ogs_strdup(type->valuestring) : NULL, + title ? ogs_strdup(title->valuestring) : NULL, status ? true : false, status ? status->valuedouble : 0, - detail ? ogs_strdup_or_assert(detail->valuestring) : NULL, - instance ? ogs_strdup_or_assert(instance->valuestring) : NULL, - cause ? ogs_strdup_or_assert(cause->valuestring) : NULL, + detail ? ogs_strdup(detail->valuestring) : NULL, + instance ? ogs_strdup(instance->valuestring) : NULL, + cause ? ogs_strdup(cause->valuestring) : NULL, invalid_params ? invalid_paramsList : NULL, - supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, + supported_features ? ogs_strdup(supported_features->valuestring) : NULL, access_token_error ? access_token_error_local_nonprim : NULL, access_token_request ? access_token_request_local_nonprim : NULL, - nrf_id ? ogs_strdup_or_assert(nrf_id->valuestring) : NULL, + nrf_id ? ogs_strdup(nrf_id->valuestring) : NULL, acceptable_serv_info ? acceptable_serv_info_local_nonprim : NULL ); diff --git a/lib/sbi/openapi/model/extended_problem_details_all_of.c b/lib/sbi/openapi/model/extended_problem_details_all_of.c index dafe28724..7442ed25b 100644 --- a/lib/sbi/openapi/model/extended_problem_details_all_of.c +++ b/lib/sbi/openapi/model/extended_problem_details_all_of.c @@ -8,10 +8,9 @@ OpenAPI_extended_problem_details_all_of_t *OpenAPI_extended_problem_details_all_ OpenAPI_acceptable_service_info_t *acceptable_serv_info ) { - OpenAPI_extended_problem_details_all_of_t *extended_problem_details_all_of_local_var = OpenAPI_malloc(sizeof(OpenAPI_extended_problem_details_all_of_t)); - if (!extended_problem_details_all_of_local_var) { - return NULL; - } + OpenAPI_extended_problem_details_all_of_t *extended_problem_details_all_of_local_var = ogs_malloc(sizeof(OpenAPI_extended_problem_details_all_of_t)); + ogs_assert(extended_problem_details_all_of_local_var); + extended_problem_details_all_of_local_var->acceptable_serv_info = acceptable_serv_info; return extended_problem_details_all_of_local_var; diff --git a/lib/sbi/openapi/model/external_client_type.c b/lib/sbi/openapi/model/external_client_type.c index b4733ad95..fec084248 100644 --- a/lib/sbi/openapi/model/external_client_type.c +++ b/lib/sbi/openapi/model/external_client_type.c @@ -7,10 +7,9 @@ OpenAPI_external_client_type_t *OpenAPI_external_client_type_create( ) { - OpenAPI_external_client_type_t *external_client_type_local_var = OpenAPI_malloc(sizeof(OpenAPI_external_client_type_t)); - if (!external_client_type_local_var) { - return NULL; - } + OpenAPI_external_client_type_t *external_client_type_local_var = ogs_malloc(sizeof(OpenAPI_external_client_type_t)); + ogs_assert(external_client_type_local_var); + return external_client_type_local_var; } diff --git a/lib/sbi/openapi/model/external_unrelated_class.c b/lib/sbi/openapi/model/external_unrelated_class.c index adbcbfe69..a92c256fa 100644 --- a/lib/sbi/openapi/model/external_unrelated_class.c +++ b/lib/sbi/openapi/model/external_unrelated_class.c @@ -10,10 +10,9 @@ OpenAPI_external_unrelated_class_t *OpenAPI_external_unrelated_class_create( OpenAPI_list_t *lcs_client_group_externals ) { - OpenAPI_external_unrelated_class_t *external_unrelated_class_local_var = OpenAPI_malloc(sizeof(OpenAPI_external_unrelated_class_t)); - if (!external_unrelated_class_local_var) { - return NULL; - } + OpenAPI_external_unrelated_class_t *external_unrelated_class_local_var = ogs_malloc(sizeof(OpenAPI_external_unrelated_class_t)); + ogs_assert(external_unrelated_class_local_var); + external_unrelated_class_local_var->lcs_client_externals = lcs_client_externals; external_unrelated_class_local_var->af_externals = af_externals; external_unrelated_class_local_var->lcs_client_group_externals = lcs_client_group_externals; diff --git a/lib/sbi/openapi/model/final_unit_action.c b/lib/sbi/openapi/model/final_unit_action.c index 74f8a0ae7..26c001601 100644 --- a/lib/sbi/openapi/model/final_unit_action.c +++ b/lib/sbi/openapi/model/final_unit_action.c @@ -7,10 +7,9 @@ OpenAPI_final_unit_action_t *OpenAPI_final_unit_action_create( ) { - OpenAPI_final_unit_action_t *final_unit_action_local_var = OpenAPI_malloc(sizeof(OpenAPI_final_unit_action_t)); - if (!final_unit_action_local_var) { - return NULL; - } + OpenAPI_final_unit_action_t *final_unit_action_local_var = ogs_malloc(sizeof(OpenAPI_final_unit_action_t)); + ogs_assert(final_unit_action_local_var); + return final_unit_action_local_var; } diff --git a/lib/sbi/openapi/model/flow_info.c b/lib/sbi/openapi/model/flow_info.c index 11fc9ecff..4686bd7ca 100644 --- a/lib/sbi/openapi/model/flow_info.c +++ b/lib/sbi/openapi/model/flow_info.c @@ -9,10 +9,9 @@ OpenAPI_flow_info_t *OpenAPI_flow_info_create( OpenAPI_list_t *flow_descriptions ) { - OpenAPI_flow_info_t *flow_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_flow_info_t)); - if (!flow_info_local_var) { - return NULL; - } + OpenAPI_flow_info_t *flow_info_local_var = ogs_malloc(sizeof(OpenAPI_flow_info_t)); + ogs_assert(flow_info_local_var); + flow_info_local_var->flow_id = flow_id; flow_info_local_var->flow_descriptions = flow_descriptions; @@ -97,7 +96,7 @@ OpenAPI_flow_info_t *OpenAPI_flow_info_parseFromJSON(cJSON *flow_infoJSON) ogs_error("OpenAPI_flow_info_parseFromJSON() failed [flow_descriptions]"); goto end; } - OpenAPI_list_add(flow_descriptionsList , ogs_strdup_or_assert(flow_descriptions_local->valuestring)); + OpenAPI_list_add(flow_descriptionsList , ogs_strdup(flow_descriptions_local->valuestring)); } } diff --git a/lib/sbi/openapi/model/flow_information.c b/lib/sbi/openapi/model/flow_information.c index 5055af686..9e07be934 100644 --- a/lib/sbi/openapi/model/flow_information.c +++ b/lib/sbi/openapi/model/flow_information.c @@ -16,10 +16,9 @@ OpenAPI_flow_information_t *OpenAPI_flow_information_create( OpenAPI_flow_direction_e flow_direction ) { - OpenAPI_flow_information_t *flow_information_local_var = OpenAPI_malloc(sizeof(OpenAPI_flow_information_t)); - if (!flow_information_local_var) { - return NULL; - } + OpenAPI_flow_information_t *flow_information_local_var = ogs_malloc(sizeof(OpenAPI_flow_information_t)); + ogs_assert(flow_information_local_var); + flow_information_local_var->flow_description = flow_description; flow_information_local_var->eth_flow_description = eth_flow_description; flow_information_local_var->pack_filt_id = pack_filt_id; @@ -200,14 +199,14 @@ OpenAPI_flow_information_t *OpenAPI_flow_information_parseFromJSON(cJSON *flow_i } flow_information_local_var = OpenAPI_flow_information_create ( - flow_description ? ogs_strdup_or_assert(flow_description->valuestring) : NULL, + flow_description ? ogs_strdup(flow_description->valuestring) : NULL, eth_flow_description ? eth_flow_description_local_nonprim : NULL, - pack_filt_id ? ogs_strdup_or_assert(pack_filt_id->valuestring) : NULL, + pack_filt_id ? ogs_strdup(pack_filt_id->valuestring) : NULL, packet_filter_usage ? true : false, packet_filter_usage ? packet_filter_usage->valueint : 0, - tos_traffic_class ? ogs_strdup_or_assert(tos_traffic_class->valuestring) : NULL, - spi ? ogs_strdup_or_assert(spi->valuestring) : NULL, - flow_label ? ogs_strdup_or_assert(flow_label->valuestring) : NULL, + tos_traffic_class ? ogs_strdup(tos_traffic_class->valuestring) : NULL, + spi ? ogs_strdup(spi->valuestring) : NULL, + flow_label ? ogs_strdup(flow_label->valuestring) : NULL, flow_direction ? flow_directionVariable : 0 ); diff --git a/lib/sbi/openapi/model/flows.c b/lib/sbi/openapi/model/flows.c index f81791382..29fd890e2 100644 --- a/lib/sbi/openapi/model/flows.c +++ b/lib/sbi/openapi/model/flows.c @@ -10,10 +10,9 @@ OpenAPI_flows_t *OpenAPI_flows_create( int med_comp_n ) { - OpenAPI_flows_t *flows_local_var = OpenAPI_malloc(sizeof(OpenAPI_flows_t)); - if (!flows_local_var) { - return NULL; - } + OpenAPI_flows_t *flows_local_var = ogs_malloc(sizeof(OpenAPI_flows_t)); + ogs_assert(flows_local_var); + flows_local_var->cont_vers = cont_vers; flows_local_var->f_nums = f_nums; flows_local_var->med_comp_n = med_comp_n; diff --git a/lib/sbi/openapi/model/frame_route_info.c b/lib/sbi/openapi/model/frame_route_info.c index cd8365d16..95e87af28 100644 --- a/lib/sbi/openapi/model/frame_route_info.c +++ b/lib/sbi/openapi/model/frame_route_info.c @@ -9,10 +9,9 @@ OpenAPI_frame_route_info_t *OpenAPI_frame_route_info_create( char *ipv6_prefix ) { - OpenAPI_frame_route_info_t *frame_route_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_frame_route_info_t)); - if (!frame_route_info_local_var) { - return NULL; - } + OpenAPI_frame_route_info_t *frame_route_info_local_var = ogs_malloc(sizeof(OpenAPI_frame_route_info_t)); + ogs_assert(frame_route_info_local_var); + frame_route_info_local_var->ipv4_mask = ipv4_mask; frame_route_info_local_var->ipv6_prefix = ipv6_prefix; @@ -80,8 +79,8 @@ OpenAPI_frame_route_info_t *OpenAPI_frame_route_info_parseFromJSON(cJSON *frame_ } frame_route_info_local_var = OpenAPI_frame_route_info_create ( - ipv4_mask ? ogs_strdup_or_assert(ipv4_mask->valuestring) : NULL, - ipv6_prefix ? ogs_strdup_or_assert(ipv6_prefix->valuestring) : NULL + ipv4_mask ? ogs_strdup(ipv4_mask->valuestring) : NULL, + ipv6_prefix ? ogs_strdup(ipv6_prefix->valuestring) : NULL ); return frame_route_info_local_var; diff --git a/lib/sbi/openapi/model/frame_route_info_1.c b/lib/sbi/openapi/model/frame_route_info_1.c index c371d1397..9ec2a814f 100644 --- a/lib/sbi/openapi/model/frame_route_info_1.c +++ b/lib/sbi/openapi/model/frame_route_info_1.c @@ -9,10 +9,9 @@ OpenAPI_frame_route_info_1_t *OpenAPI_frame_route_info_1_create( char *ipv6_prefix ) { - OpenAPI_frame_route_info_1_t *frame_route_info_1_local_var = OpenAPI_malloc(sizeof(OpenAPI_frame_route_info_1_t)); - if (!frame_route_info_1_local_var) { - return NULL; - } + OpenAPI_frame_route_info_1_t *frame_route_info_1_local_var = ogs_malloc(sizeof(OpenAPI_frame_route_info_1_t)); + ogs_assert(frame_route_info_1_local_var); + frame_route_info_1_local_var->ipv4_mask = ipv4_mask; frame_route_info_1_local_var->ipv6_prefix = ipv6_prefix; @@ -80,8 +79,8 @@ OpenAPI_frame_route_info_1_t *OpenAPI_frame_route_info_1_parseFromJSON(cJSON *fr } frame_route_info_1_local_var = OpenAPI_frame_route_info_1_create ( - ipv4_mask ? ogs_strdup_or_assert(ipv4_mask->valuestring) : NULL, - ipv6_prefix ? ogs_strdup_or_assert(ipv6_prefix->valuestring) : NULL + ipv4_mask ? ogs_strdup(ipv4_mask->valuestring) : NULL, + ipv6_prefix ? ogs_strdup(ipv6_prefix->valuestring) : NULL ); return frame_route_info_1_local_var; diff --git a/lib/sbi/openapi/model/gad_shape.c b/lib/sbi/openapi/model/gad_shape.c index 061213ad6..c963d0d3d 100644 --- a/lib/sbi/openapi/model/gad_shape.c +++ b/lib/sbi/openapi/model/gad_shape.c @@ -8,10 +8,9 @@ OpenAPI_gad_shape_t *OpenAPI_gad_shape_create( OpenAPI_supported_gad_shapes_t *shape ) { - OpenAPI_gad_shape_t *gad_shape_local_var = OpenAPI_malloc(sizeof(OpenAPI_gad_shape_t)); - if (!gad_shape_local_var) { - return NULL; - } + OpenAPI_gad_shape_t *gad_shape_local_var = ogs_malloc(sizeof(OpenAPI_gad_shape_t)); + ogs_assert(gad_shape_local_var); + gad_shape_local_var->shape = shape; return gad_shape_local_var; diff --git a/lib/sbi/openapi/model/gbr_qos_flow_information.c b/lib/sbi/openapi/model/gbr_qos_flow_information.c index eb54baa2c..542a17fce 100644 --- a/lib/sbi/openapi/model/gbr_qos_flow_information.c +++ b/lib/sbi/openapi/model/gbr_qos_flow_information.c @@ -17,10 +17,9 @@ OpenAPI_gbr_qos_flow_information_t *OpenAPI_gbr_qos_flow_information_create( OpenAPI_list_t *alternative_qos_profile_list ) { - OpenAPI_gbr_qos_flow_information_t *gbr_qos_flow_information_local_var = OpenAPI_malloc(sizeof(OpenAPI_gbr_qos_flow_information_t)); - if (!gbr_qos_flow_information_local_var) { - return NULL; - } + OpenAPI_gbr_qos_flow_information_t *gbr_qos_flow_information_local_var = ogs_malloc(sizeof(OpenAPI_gbr_qos_flow_information_t)); + ogs_assert(gbr_qos_flow_information_local_var); + gbr_qos_flow_information_local_var->max_fbr_dl = max_fbr_dl; gbr_qos_flow_information_local_var->max_fbr_ul = max_fbr_ul; gbr_qos_flow_information_local_var->gua_fbr_dl = gua_fbr_dl; @@ -227,10 +226,10 @@ OpenAPI_gbr_qos_flow_information_t *OpenAPI_gbr_qos_flow_information_parseFromJS } gbr_qos_flow_information_local_var = OpenAPI_gbr_qos_flow_information_create ( - ogs_strdup_or_assert(max_fbr_dl->valuestring), - ogs_strdup_or_assert(max_fbr_ul->valuestring), - ogs_strdup_or_assert(gua_fbr_dl->valuestring), - ogs_strdup_or_assert(gua_fbr_ul->valuestring), + ogs_strdup(max_fbr_dl->valuestring), + ogs_strdup(max_fbr_ul->valuestring), + ogs_strdup(gua_fbr_dl->valuestring), + ogs_strdup(gua_fbr_ul->valuestring), notif_control ? notif_controlVariable : 0, max_packet_loss_rate_dl ? true : false, max_packet_loss_rate_dl ? max_packet_loss_rate_dl->valuedouble : 0, diff --git a/lib/sbi/openapi/model/geographic_area.c b/lib/sbi/openapi/model/geographic_area.c index b6e8f8bac..47f0d9fdf 100644 --- a/lib/sbi/openapi/model/geographic_area.c +++ b/lib/sbi/openapi/model/geographic_area.c @@ -19,10 +19,9 @@ OpenAPI_geographic_area_t *OpenAPI_geographic_area_create( int included_angle ) { - OpenAPI_geographic_area_t *geographic_area_local_var = OpenAPI_malloc(sizeof(OpenAPI_geographic_area_t)); - if (!geographic_area_local_var) { - return NULL; - } + OpenAPI_geographic_area_t *geographic_area_local_var = ogs_malloc(sizeof(OpenAPI_geographic_area_t)); + ogs_assert(geographic_area_local_var); + geographic_area_local_var->shape = shape; geographic_area_local_var->point = point; geographic_area_local_var->uncertainty = uncertainty; diff --git a/lib/sbi/openapi/model/geographical_coordinates.c b/lib/sbi/openapi/model/geographical_coordinates.c index 2eeb26ebd..e8b948734 100644 --- a/lib/sbi/openapi/model/geographical_coordinates.c +++ b/lib/sbi/openapi/model/geographical_coordinates.c @@ -9,10 +9,9 @@ OpenAPI_geographical_coordinates_t *OpenAPI_geographical_coordinates_create( double lat ) { - OpenAPI_geographical_coordinates_t *geographical_coordinates_local_var = OpenAPI_malloc(sizeof(OpenAPI_geographical_coordinates_t)); - if (!geographical_coordinates_local_var) { - return NULL; - } + OpenAPI_geographical_coordinates_t *geographical_coordinates_local_var = ogs_malloc(sizeof(OpenAPI_geographical_coordinates_t)); + ogs_assert(geographical_coordinates_local_var); + geographical_coordinates_local_var->lon = lon; geographical_coordinates_local_var->lat = lat; diff --git a/lib/sbi/openapi/model/global_ran_node_id.c b/lib/sbi/openapi/model/global_ran_node_id.c index 7f707f254..c53e1d4f7 100644 --- a/lib/sbi/openapi/model/global_ran_node_id.c +++ b/lib/sbi/openapi/model/global_ran_node_id.c @@ -15,10 +15,9 @@ OpenAPI_global_ran_node_id_t *OpenAPI_global_ran_node_id_create( char *e_nb_id ) { - OpenAPI_global_ran_node_id_t *global_ran_node_id_local_var = OpenAPI_malloc(sizeof(OpenAPI_global_ran_node_id_t)); - if (!global_ran_node_id_local_var) { - return NULL; - } + OpenAPI_global_ran_node_id_t *global_ran_node_id_local_var = ogs_malloc(sizeof(OpenAPI_global_ran_node_id_t)); + ogs_assert(global_ran_node_id_local_var); + global_ran_node_id_local_var->plmn_id = plmn_id; global_ran_node_id_local_var->n3_iwf_id = n3_iwf_id; global_ran_node_id_local_var->g_nb_id = g_nb_id; @@ -203,13 +202,13 @@ OpenAPI_global_ran_node_id_t *OpenAPI_global_ran_node_id_parseFromJSON(cJSON *gl global_ran_node_id_local_var = OpenAPI_global_ran_node_id_create ( plmn_id_local_nonprim, - n3_iwf_id ? ogs_strdup_or_assert(n3_iwf_id->valuestring) : NULL, + n3_iwf_id ? ogs_strdup(n3_iwf_id->valuestring) : NULL, g_nb_id ? g_nb_id_local_nonprim : NULL, - nge_nb_id ? ogs_strdup_or_assert(nge_nb_id->valuestring) : NULL, - wagf_id ? ogs_strdup_or_assert(wagf_id->valuestring) : NULL, - tngf_id ? ogs_strdup_or_assert(tngf_id->valuestring) : NULL, - nid ? ogs_strdup_or_assert(nid->valuestring) : NULL, - e_nb_id ? ogs_strdup_or_assert(e_nb_id->valuestring) : NULL + nge_nb_id ? ogs_strdup(nge_nb_id->valuestring) : NULL, + wagf_id ? ogs_strdup(wagf_id->valuestring) : NULL, + tngf_id ? ogs_strdup(tngf_id->valuestring) : NULL, + nid ? ogs_strdup(nid->valuestring) : NULL, + e_nb_id ? ogs_strdup(e_nb_id->valuestring) : NULL ); return global_ran_node_id_local_var; diff --git a/lib/sbi/openapi/model/global_ran_node_id_1.c b/lib/sbi/openapi/model/global_ran_node_id_1.c index 4bd29218a..7f62a5047 100644 --- a/lib/sbi/openapi/model/global_ran_node_id_1.c +++ b/lib/sbi/openapi/model/global_ran_node_id_1.c @@ -15,10 +15,9 @@ OpenAPI_global_ran_node_id_1_t *OpenAPI_global_ran_node_id_1_create( char *e_nb_id ) { - OpenAPI_global_ran_node_id_1_t *global_ran_node_id_1_local_var = OpenAPI_malloc(sizeof(OpenAPI_global_ran_node_id_1_t)); - if (!global_ran_node_id_1_local_var) { - return NULL; - } + OpenAPI_global_ran_node_id_1_t *global_ran_node_id_1_local_var = ogs_malloc(sizeof(OpenAPI_global_ran_node_id_1_t)); + ogs_assert(global_ran_node_id_1_local_var); + global_ran_node_id_1_local_var->plmn_id = plmn_id; global_ran_node_id_1_local_var->n3_iwf_id = n3_iwf_id; global_ran_node_id_1_local_var->g_nb_id = g_nb_id; @@ -203,13 +202,13 @@ OpenAPI_global_ran_node_id_1_t *OpenAPI_global_ran_node_id_1_parseFromJSON(cJSON global_ran_node_id_1_local_var = OpenAPI_global_ran_node_id_1_create ( plmn_id_local_nonprim, - n3_iwf_id ? ogs_strdup_or_assert(n3_iwf_id->valuestring) : NULL, + n3_iwf_id ? ogs_strdup(n3_iwf_id->valuestring) : NULL, g_nb_id ? g_nb_id_local_nonprim : NULL, - nge_nb_id ? ogs_strdup_or_assert(nge_nb_id->valuestring) : NULL, - wagf_id ? ogs_strdup_or_assert(wagf_id->valuestring) : NULL, - tngf_id ? ogs_strdup_or_assert(tngf_id->valuestring) : NULL, - nid ? ogs_strdup_or_assert(nid->valuestring) : NULL, - e_nb_id ? ogs_strdup_or_assert(e_nb_id->valuestring) : NULL + nge_nb_id ? ogs_strdup(nge_nb_id->valuestring) : NULL, + wagf_id ? ogs_strdup(wagf_id->valuestring) : NULL, + tngf_id ? ogs_strdup(tngf_id->valuestring) : NULL, + nid ? ogs_strdup(nid->valuestring) : NULL, + e_nb_id ? ogs_strdup(e_nb_id->valuestring) : NULL ); return global_ran_node_id_1_local_var; diff --git a/lib/sbi/openapi/model/gmlc_info.c b/lib/sbi/openapi/model/gmlc_info.c index abafe4ab6..3e02ecd56 100644 --- a/lib/sbi/openapi/model/gmlc_info.c +++ b/lib/sbi/openapi/model/gmlc_info.c @@ -8,10 +8,9 @@ OpenAPI_gmlc_info_t *OpenAPI_gmlc_info_create( OpenAPI_list_t *serving_client_types ) { - OpenAPI_gmlc_info_t *gmlc_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_gmlc_info_t)); - if (!gmlc_info_local_var) { - return NULL; - } + OpenAPI_gmlc_info_t *gmlc_info_local_var = ogs_malloc(sizeof(OpenAPI_gmlc_info_t)); + ogs_assert(gmlc_info_local_var); + gmlc_info_local_var->serving_client_types = serving_client_types; return gmlc_info_local_var; diff --git a/lib/sbi/openapi/model/gnb_id.c b/lib/sbi/openapi/model/gnb_id.c index 41f11de36..b1c77cb59 100644 --- a/lib/sbi/openapi/model/gnb_id.c +++ b/lib/sbi/openapi/model/gnb_id.c @@ -9,10 +9,9 @@ OpenAPI_gnb_id_t *OpenAPI_gnb_id_create( char *g_nb_value ) { - OpenAPI_gnb_id_t *gnb_id_local_var = OpenAPI_malloc(sizeof(OpenAPI_gnb_id_t)); - if (!gnb_id_local_var) { - return NULL; - } + OpenAPI_gnb_id_t *gnb_id_local_var = ogs_malloc(sizeof(OpenAPI_gnb_id_t)); + ogs_assert(gnb_id_local_var); + gnb_id_local_var->bit_length = bit_length; gnb_id_local_var->g_nb_value = g_nb_value; @@ -81,7 +80,7 @@ OpenAPI_gnb_id_t *OpenAPI_gnb_id_parseFromJSON(cJSON *gnb_idJSON) gnb_id_local_var = OpenAPI_gnb_id_create ( bit_length->valuedouble, - ogs_strdup_or_assert(g_nb_value->valuestring) + ogs_strdup(g_nb_value->valuestring) ); return gnb_id_local_var; diff --git a/lib/sbi/openapi/model/group_identifiers.c b/lib/sbi/openapi/model/group_identifiers.c index d4edea1ce..02a3c2a8f 100644 --- a/lib/sbi/openapi/model/group_identifiers.c +++ b/lib/sbi/openapi/model/group_identifiers.c @@ -10,10 +10,9 @@ OpenAPI_group_identifiers_t *OpenAPI_group_identifiers_create( OpenAPI_list_t *ue_id_list ) { - OpenAPI_group_identifiers_t *group_identifiers_local_var = OpenAPI_malloc(sizeof(OpenAPI_group_identifiers_t)); - if (!group_identifiers_local_var) { - return NULL; - } + OpenAPI_group_identifiers_t *group_identifiers_local_var = ogs_malloc(sizeof(OpenAPI_group_identifiers_t)); + ogs_assert(group_identifiers_local_var); + group_identifiers_local_var->ext_group_id = ext_group_id; group_identifiers_local_var->int_group_id = int_group_id; group_identifiers_local_var->ue_id_list = ue_id_list; @@ -129,8 +128,8 @@ OpenAPI_group_identifiers_t *OpenAPI_group_identifiers_parseFromJSON(cJSON *grou } group_identifiers_local_var = OpenAPI_group_identifiers_create ( - ext_group_id ? ogs_strdup_or_assert(ext_group_id->valuestring) : NULL, - int_group_id ? ogs_strdup_or_assert(int_group_id->valuestring) : NULL, + ext_group_id ? ogs_strdup(ext_group_id->valuestring) : NULL, + int_group_id ? ogs_strdup(int_group_id->valuestring) : NULL, ue_id_list ? ue_id_listList : NULL ); diff --git a/lib/sbi/openapi/model/guami.c b/lib/sbi/openapi/model/guami.c index 590fd97e7..910e56e27 100644 --- a/lib/sbi/openapi/model/guami.c +++ b/lib/sbi/openapi/model/guami.c @@ -9,10 +9,9 @@ OpenAPI_guami_t *OpenAPI_guami_create( char *amf_id ) { - OpenAPI_guami_t *guami_local_var = OpenAPI_malloc(sizeof(OpenAPI_guami_t)); - if (!guami_local_var) { - return NULL; - } + OpenAPI_guami_t *guami_local_var = ogs_malloc(sizeof(OpenAPI_guami_t)); + ogs_assert(guami_local_var); + guami_local_var->plmn_id = plmn_id; guami_local_var->amf_id = amf_id; @@ -85,7 +84,7 @@ OpenAPI_guami_t *OpenAPI_guami_parseFromJSON(cJSON *guamiJSON) guami_local_var = OpenAPI_guami_create ( plmn_id_local_nonprim, - ogs_strdup_or_assert(amf_id->valuestring) + ogs_strdup(amf_id->valuestring) ); return guami_local_var; diff --git a/lib/sbi/openapi/model/guami_list_cond.c b/lib/sbi/openapi/model/guami_list_cond.c index 9d43afa46..17ca1ceee 100644 --- a/lib/sbi/openapi/model/guami_list_cond.c +++ b/lib/sbi/openapi/model/guami_list_cond.c @@ -8,10 +8,9 @@ OpenAPI_guami_list_cond_t *OpenAPI_guami_list_cond_create( OpenAPI_list_t *guami_list ) { - OpenAPI_guami_list_cond_t *guami_list_cond_local_var = OpenAPI_malloc(sizeof(OpenAPI_guami_list_cond_t)); - if (!guami_list_cond_local_var) { - return NULL; - } + OpenAPI_guami_list_cond_t *guami_list_cond_local_var = ogs_malloc(sizeof(OpenAPI_guami_list_cond_t)); + ogs_assert(guami_list_cond_local_var); + guami_list_cond_local_var->guami_list = guami_list; return guami_list_cond_local_var; diff --git a/lib/sbi/openapi/model/hfc_node_id.c b/lib/sbi/openapi/model/hfc_node_id.c index 2d38dd369..d08d5d6d7 100644 --- a/lib/sbi/openapi/model/hfc_node_id.c +++ b/lib/sbi/openapi/model/hfc_node_id.c @@ -8,10 +8,9 @@ OpenAPI_hfc_node_id_t *OpenAPI_hfc_node_id_create( char *hfc_nid ) { - OpenAPI_hfc_node_id_t *hfc_node_id_local_var = OpenAPI_malloc(sizeof(OpenAPI_hfc_node_id_t)); - if (!hfc_node_id_local_var) { - return NULL; - } + OpenAPI_hfc_node_id_t *hfc_node_id_local_var = ogs_malloc(sizeof(OpenAPI_hfc_node_id_t)); + ogs_assert(hfc_node_id_local_var); + hfc_node_id_local_var->hfc_nid = hfc_nid; return hfc_node_id_local_var; @@ -61,7 +60,7 @@ OpenAPI_hfc_node_id_t *OpenAPI_hfc_node_id_parseFromJSON(cJSON *hfc_node_idJSON) } hfc_node_id_local_var = OpenAPI_hfc_node_id_create ( - ogs_strdup_or_assert(hfc_nid->valuestring) + ogs_strdup(hfc_nid->valuestring) ); return hfc_node_id_local_var; diff --git a/lib/sbi/openapi/model/hsmf_update_data.c b/lib/sbi/openapi/model/hsmf_update_data.c index 9ded0656c..3e165a743 100644 --- a/lib/sbi/openapi/model/hsmf_update_data.c +++ b/lib/sbi/openapi/model/hsmf_update_data.c @@ -72,10 +72,9 @@ OpenAPI_hsmf_update_data_t *OpenAPI_hsmf_update_data_create( OpenAPI_guami_t *guami ) { - OpenAPI_hsmf_update_data_t *hsmf_update_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_hsmf_update_data_t)); - if (!hsmf_update_data_local_var) { - return NULL; - } + OpenAPI_hsmf_update_data_t *hsmf_update_data_local_var = ogs_malloc(sizeof(OpenAPI_hsmf_update_data_t)); + ogs_assert(hsmf_update_data_local_var); + hsmf_update_data_local_var->request_indication = request_indication; hsmf_update_data_local_var->pei = pei; hsmf_update_data_local_var->vcn_tunnel_info = vcn_tunnel_info; @@ -1384,7 +1383,7 @@ OpenAPI_hsmf_update_data_t *OpenAPI_hsmf_update_data_parseFromJSON(cJSON *hsmf_u ogs_error("OpenAPI_hsmf_update_data_parseFromJSON() failed [dnai_list]"); goto end; } - OpenAPI_list_add(dnai_listList , ogs_strdup_or_assert(dnai_list_local->valuestring)); + OpenAPI_list_add(dnai_listList , ogs_strdup(dnai_list_local->valuestring)); } } @@ -1450,7 +1449,7 @@ OpenAPI_hsmf_update_data_t *OpenAPI_hsmf_update_data_parseFromJSON(cJSON *hsmf_u hsmf_update_data_local_var = OpenAPI_hsmf_update_data_create ( request_indicationVariable, - pei ? ogs_strdup_or_assert(pei->valuestring) : NULL, + pei ? ogs_strdup(pei->valuestring) : NULL, vcn_tunnel_info ? vcn_tunnel_info_local_nonprim : NULL, icn_tunnel_info ? icn_tunnel_info_local_nonprim : NULL, additional_cn_tunnel_info ? additional_cn_tunnel_info_local_nonprim : NULL, @@ -1459,7 +1458,7 @@ OpenAPI_hsmf_update_data_t *OpenAPI_hsmf_update_data_parseFromJSON(cJSON *hsmf_u additional_an_type ? additional_an_typeVariable : 0, rat_type ? rat_typeVariable : 0, ue_location ? ue_location_local_nonprim : NULL, - ue_time_zone ? ogs_strdup_or_assert(ue_time_zone->valuestring) : NULL, + ue_time_zone ? ogs_strdup(ue_time_zone->valuestring) : NULL, add_ue_location ? add_ue_location_local_nonprim : NULL, pause_charging ? true : false, pause_charging ? pause_charging->valueint : 0, @@ -1497,22 +1496,22 @@ OpenAPI_hsmf_update_data_t *OpenAPI_hsmf_update_data_parseFromJSON(cJSON *hsmf_u n4_info_ext1 ? n4_info_ext1_local_nonprim : NULL, n4_info_ext2 ? n4_info_ext2_local_nonprim : NULL, presence_in_ladn ? presence_in_ladnVariable : 0, - vsmf_pdu_session_uri ? ogs_strdup_or_assert(vsmf_pdu_session_uri->valuestring) : NULL, - vsmf_id ? ogs_strdup_or_assert(vsmf_id->valuestring) : NULL, - v_smf_service_instance_id ? ogs_strdup_or_assert(v_smf_service_instance_id->valuestring) : NULL, - ismf_pdu_session_uri ? ogs_strdup_or_assert(ismf_pdu_session_uri->valuestring) : NULL, - ismf_id ? ogs_strdup_or_assert(ismf_id->valuestring) : NULL, - i_smf_service_instance_id ? ogs_strdup_or_assert(i_smf_service_instance_id->valuestring) : NULL, + vsmf_pdu_session_uri ? ogs_strdup(vsmf_pdu_session_uri->valuestring) : NULL, + vsmf_id ? ogs_strdup(vsmf_id->valuestring) : NULL, + v_smf_service_instance_id ? ogs_strdup(v_smf_service_instance_id->valuestring) : NULL, + ismf_pdu_session_uri ? ogs_strdup(ismf_pdu_session_uri->valuestring) : NULL, + ismf_id ? ogs_strdup(ismf_id->valuestring) : NULL, + i_smf_service_instance_id ? ogs_strdup(i_smf_service_instance_id->valuestring) : NULL, dl_serving_plmn_rate_ctl ? true : false, dl_serving_plmn_rate_ctl ? dl_serving_plmn_rate_ctl->valuedouble : 0, dnai_list ? dnai_listList : NULL, - supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, + supported_features ? ogs_strdup(supported_features->valuestring) : NULL, roaming_charging_profile ? roaming_charging_profile_local_nonprim : NULL, mo_exp_data_counter ? mo_exp_data_counter_local_nonprim : NULL, vplmn_qos ? vplmn_qos_local_nonprim : NULL, security_result ? security_result_local_nonprim : NULL, up_security_info ? up_security_info_local_nonprim : NULL, - amf_nf_id ? ogs_strdup_or_assert(amf_nf_id->valuestring) : NULL, + amf_nf_id ? ogs_strdup(amf_nf_id->valuestring) : NULL, guami ? guami_local_nonprim : NULL ); diff --git a/lib/sbi/openapi/model/hsmf_update_error.c b/lib/sbi/openapi/model/hsmf_update_error.c index 5a1f9c715..4c76caa51 100644 --- a/lib/sbi/openapi/model/hsmf_update_error.c +++ b/lib/sbi/openapi/model/hsmf_update_error.c @@ -15,10 +15,9 @@ OpenAPI_hsmf_update_error_t *OpenAPI_hsmf_update_error_create( char *recovery_time ) { - OpenAPI_hsmf_update_error_t *hsmf_update_error_local_var = OpenAPI_malloc(sizeof(OpenAPI_hsmf_update_error_t)); - if (!hsmf_update_error_local_var) { - return NULL; - } + OpenAPI_hsmf_update_error_t *hsmf_update_error_local_var = ogs_malloc(sizeof(OpenAPI_hsmf_update_error_t)); + ogs_assert(hsmf_update_error_local_var); + hsmf_update_error_local_var->error = error; hsmf_update_error_local_var->is_pti = is_pti; hsmf_update_error_local_var->pti = pti; @@ -169,11 +168,11 @@ OpenAPI_hsmf_update_error_t *OpenAPI_hsmf_update_error_parseFromJSON(cJSON *hsmf error_local_nonprim, pti ? true : false, pti ? pti->valuedouble : 0, - n1sm_cause ? ogs_strdup_or_assert(n1sm_cause->valuestring) : NULL, + n1sm_cause ? ogs_strdup(n1sm_cause->valuestring) : NULL, n1_sm_info_to_ue ? n1_sm_info_to_ue_local_nonprim : NULL, back_off_timer ? true : false, back_off_timer ? back_off_timer->valuedouble : 0, - recovery_time ? ogs_strdup_or_assert(recovery_time->valuestring) : NULL + recovery_time ? ogs_strdup(recovery_time->valuestring) : NULL ); return hsmf_update_error_local_var; diff --git a/lib/sbi/openapi/model/hsmf_updated_data.c b/lib/sbi/openapi/model/hsmf_updated_data.c index 5c0699ced..25396424b 100644 --- a/lib/sbi/openapi/model/hsmf_updated_data.c +++ b/lib/sbi/openapi/model/hsmf_updated_data.c @@ -25,10 +25,9 @@ OpenAPI_hsmf_updated_data_t *OpenAPI_hsmf_updated_data_create( int pti ) { - OpenAPI_hsmf_updated_data_t *hsmf_updated_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_hsmf_updated_data_t)); - if (!hsmf_updated_data_local_var) { - return NULL; - } + OpenAPI_hsmf_updated_data_t *hsmf_updated_data_local_var = ogs_malloc(sizeof(OpenAPI_hsmf_updated_data_t)); + ogs_assert(hsmf_updated_data_local_var); + hsmf_updated_data_local_var->n1_sm_info_to_ue = n1_sm_info_to_ue; hsmf_updated_data_local_var->n4_info = n4_info; hsmf_updated_data_local_var->n4_info_ext1 = n4_info_ext1; @@ -337,7 +336,7 @@ OpenAPI_hsmf_updated_data_t *OpenAPI_hsmf_updated_data_parseFromJSON(cJSON *hsmf ogs_error("OpenAPI_hsmf_updated_data_parseFromJSON() failed [dnai_list]"); goto end; } - OpenAPI_list_add(dnai_listList , ogs_strdup_or_assert(dnai_list_local->valuestring)); + OpenAPI_list_add(dnai_listList , ogs_strdup(dnai_list_local->valuestring)); } } @@ -470,7 +469,7 @@ OpenAPI_hsmf_updated_data_t *OpenAPI_hsmf_updated_data_parseFromJSON(cJSON *hsmf n4_info_ext1 ? n4_info_ext1_local_nonprim : NULL, n4_info_ext2 ? n4_info_ext2_local_nonprim : NULL, dnai_list ? dnai_listList : NULL, - supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, + supported_features ? ogs_strdup(supported_features->valuestring) : NULL, roaming_charging_profile ? roaming_charging_profile_local_nonprim : NULL, up_security ? up_security_local_nonprim : NULL, max_integrity_protected_data_rate_ul ? max_integrity_protected_data_rate_ulVariable : 0, diff --git a/lib/sbi/openapi/model/hss_authentication_info_request.c b/lib/sbi/openapi/model/hss_authentication_info_request.c index 52cec89d4..e49eddf01 100644 --- a/lib/sbi/openapi/model/hss_authentication_info_request.c +++ b/lib/sbi/openapi/model/hss_authentication_info_request.c @@ -14,10 +14,9 @@ OpenAPI_hss_authentication_info_request_t *OpenAPI_hss_authentication_info_reque OpenAPI_access_network_id_e an_id ) { - OpenAPI_hss_authentication_info_request_t *hss_authentication_info_request_local_var = OpenAPI_malloc(sizeof(OpenAPI_hss_authentication_info_request_t)); - if (!hss_authentication_info_request_local_var) { - return NULL; - } + OpenAPI_hss_authentication_info_request_t *hss_authentication_info_request_local_var = ogs_malloc(sizeof(OpenAPI_hss_authentication_info_request_t)); + ogs_assert(hss_authentication_info_request_local_var); + hss_authentication_info_request_local_var->supported_features = supported_features; hss_authentication_info_request_local_var->hss_auth_type = hss_auth_type; hss_authentication_info_request_local_var->num_of_requested_vectors = num_of_requested_vectors; @@ -185,7 +184,7 @@ OpenAPI_hss_authentication_info_request_t *OpenAPI_hss_authentication_info_reque } hss_authentication_info_request_local_var = OpenAPI_hss_authentication_info_request_create ( - supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, + supported_features ? ogs_strdup(supported_features->valuestring) : NULL, hss_auth_typeVariable, num_of_requested_vectors->valuedouble, diff --git a/lib/sbi/openapi/model/hss_authentication_info_result.c b/lib/sbi/openapi/model/hss_authentication_info_result.c index 6be2d998f..70fca9ffa 100644 --- a/lib/sbi/openapi/model/hss_authentication_info_result.c +++ b/lib/sbi/openapi/model/hss_authentication_info_result.c @@ -9,10 +9,9 @@ OpenAPI_hss_authentication_info_result_t *OpenAPI_hss_authentication_info_result OpenAPI_hss_authentication_vectors_t *hss_authentication_vectors ) { - OpenAPI_hss_authentication_info_result_t *hss_authentication_info_result_local_var = OpenAPI_malloc(sizeof(OpenAPI_hss_authentication_info_result_t)); - if (!hss_authentication_info_result_local_var) { - return NULL; - } + OpenAPI_hss_authentication_info_result_t *hss_authentication_info_result_local_var = ogs_malloc(sizeof(OpenAPI_hss_authentication_info_result_t)); + ogs_assert(hss_authentication_info_result_local_var); + hss_authentication_info_result_local_var->supported_features = supported_features; hss_authentication_info_result_local_var->hss_authentication_vectors = hss_authentication_vectors; @@ -84,7 +83,7 @@ OpenAPI_hss_authentication_info_result_t *OpenAPI_hss_authentication_info_result hss_authentication_vectors_local_nonprim = OpenAPI_hss_authentication_vectors_parseFromJSON(hss_authentication_vectors); hss_authentication_info_result_local_var = OpenAPI_hss_authentication_info_result_create ( - supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, + supported_features ? ogs_strdup(supported_features->valuestring) : NULL, hss_authentication_vectors_local_nonprim ); diff --git a/lib/sbi/openapi/model/hss_authentication_vectors.c b/lib/sbi/openapi/model/hss_authentication_vectors.c index 99ebf38da..c6ce0f122 100644 --- a/lib/sbi/openapi/model/hss_authentication_vectors.c +++ b/lib/sbi/openapi/model/hss_authentication_vectors.c @@ -7,10 +7,9 @@ OpenAPI_hss_authentication_vectors_t *OpenAPI_hss_authentication_vectors_create( ) { - OpenAPI_hss_authentication_vectors_t *hss_authentication_vectors_local_var = OpenAPI_malloc(sizeof(OpenAPI_hss_authentication_vectors_t)); - if (!hss_authentication_vectors_local_var) { - return NULL; - } + OpenAPI_hss_authentication_vectors_t *hss_authentication_vectors_local_var = ogs_malloc(sizeof(OpenAPI_hss_authentication_vectors_t)); + ogs_assert(hss_authentication_vectors_local_var); + return hss_authentication_vectors_local_var; } diff --git a/lib/sbi/openapi/model/hss_info.c b/lib/sbi/openapi/model/hss_info.c index db3c3d454..aec020b33 100644 --- a/lib/sbi/openapi/model/hss_info.c +++ b/lib/sbi/openapi/model/hss_info.c @@ -12,10 +12,9 @@ OpenAPI_hss_info_t *OpenAPI_hss_info_create( OpenAPI_list_t *msisdn_ranges ) { - OpenAPI_hss_info_t *hss_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_hss_info_t)); - if (!hss_info_local_var) { - return NULL; - } + OpenAPI_hss_info_t *hss_info_local_var = ogs_malloc(sizeof(OpenAPI_hss_info_t)); + ogs_assert(hss_info_local_var); + hss_info_local_var->group_id = group_id; hss_info_local_var->imsi_ranges = imsi_ranges; hss_info_local_var->ims_private_identity_ranges = ims_private_identity_ranges; @@ -257,7 +256,7 @@ OpenAPI_hss_info_t *OpenAPI_hss_info_parseFromJSON(cJSON *hss_infoJSON) } hss_info_local_var = OpenAPI_hss_info_create ( - group_id ? ogs_strdup_or_assert(group_id->valuestring) : NULL, + group_id ? ogs_strdup(group_id->valuestring) : NULL, imsi_ranges ? imsi_rangesList : NULL, ims_private_identity_ranges ? ims_private_identity_rangesList : NULL, ims_public_identity_ranges ? ims_public_identity_rangesList : NULL, diff --git a/lib/sbi/openapi/model/id_translation_result.c b/lib/sbi/openapi/model/id_translation_result.c index 904b01fcd..92764b3e0 100644 --- a/lib/sbi/openapi/model/id_translation_result.c +++ b/lib/sbi/openapi/model/id_translation_result.c @@ -10,10 +10,9 @@ OpenAPI_id_translation_result_t *OpenAPI_id_translation_result_create( char *gpsi ) { - OpenAPI_id_translation_result_t *id_translation_result_local_var = OpenAPI_malloc(sizeof(OpenAPI_id_translation_result_t)); - if (!id_translation_result_local_var) { - return NULL; - } + OpenAPI_id_translation_result_t *id_translation_result_local_var = ogs_malloc(sizeof(OpenAPI_id_translation_result_t)); + ogs_assert(id_translation_result_local_var); + id_translation_result_local_var->supported_features = supported_features; id_translation_result_local_var->supi = supi; id_translation_result_local_var->gpsi = gpsi; @@ -99,9 +98,9 @@ OpenAPI_id_translation_result_t *OpenAPI_id_translation_result_parseFromJSON(cJS } id_translation_result_local_var = OpenAPI_id_translation_result_create ( - supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, - ogs_strdup_or_assert(supi->valuestring), - gpsi ? ogs_strdup_or_assert(gpsi->valuestring) : NULL + supported_features ? ogs_strdup(supported_features->valuestring) : NULL, + ogs_strdup(supi->valuestring), + gpsi ? ogs_strdup(gpsi->valuestring) : NULL ); return id_translation_result_local_var; diff --git a/lib/sbi/openapi/model/identity_data.c b/lib/sbi/openapi/model/identity_data.c index f503fe539..211a85290 100644 --- a/lib/sbi/openapi/model/identity_data.c +++ b/lib/sbi/openapi/model/identity_data.c @@ -9,10 +9,9 @@ OpenAPI_identity_data_t *OpenAPI_identity_data_create( OpenAPI_list_t *gpsi_list ) { - OpenAPI_identity_data_t *identity_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_identity_data_t)); - if (!identity_data_local_var) { - return NULL; - } + OpenAPI_identity_data_t *identity_data_local_var = ogs_malloc(sizeof(OpenAPI_identity_data_t)); + ogs_assert(identity_data_local_var); + identity_data_local_var->supi_list = supi_list; identity_data_local_var->gpsi_list = gpsi_list; @@ -101,7 +100,7 @@ OpenAPI_identity_data_t *OpenAPI_identity_data_parseFromJSON(cJSON *identity_dat ogs_error("OpenAPI_identity_data_parseFromJSON() failed [supi_list]"); goto end; } - OpenAPI_list_add(supi_listList , ogs_strdup_or_assert(supi_list_local->valuestring)); + OpenAPI_list_add(supi_listList , ogs_strdup(supi_list_local->valuestring)); } } @@ -121,7 +120,7 @@ OpenAPI_identity_data_t *OpenAPI_identity_data_parseFromJSON(cJSON *identity_dat ogs_error("OpenAPI_identity_data_parseFromJSON() failed [gpsi_list]"); goto end; } - OpenAPI_list_add(gpsi_listList , ogs_strdup_or_assert(gpsi_list_local->valuestring)); + OpenAPI_list_add(gpsi_listList , ogs_strdup(gpsi_list_local->valuestring)); } } diff --git a/lib/sbi/openapi/model/identity_range.c b/lib/sbi/openapi/model/identity_range.c index acf1e4768..242f30a00 100644 --- a/lib/sbi/openapi/model/identity_range.c +++ b/lib/sbi/openapi/model/identity_range.c @@ -10,10 +10,9 @@ OpenAPI_identity_range_t *OpenAPI_identity_range_create( char *pattern ) { - OpenAPI_identity_range_t *identity_range_local_var = OpenAPI_malloc(sizeof(OpenAPI_identity_range_t)); - if (!identity_range_local_var) { - return NULL; - } + OpenAPI_identity_range_t *identity_range_local_var = ogs_malloc(sizeof(OpenAPI_identity_range_t)); + ogs_assert(identity_range_local_var); + identity_range_local_var->start = start; identity_range_local_var->end = end; identity_range_local_var->pattern = pattern; @@ -99,9 +98,9 @@ OpenAPI_identity_range_t *OpenAPI_identity_range_parseFromJSON(cJSON *identity_r } identity_range_local_var = OpenAPI_identity_range_create ( - start ? ogs_strdup_or_assert(start->valuestring) : NULL, - end ? ogs_strdup_or_assert(end->valuestring) : NULL, - pattern ? ogs_strdup_or_assert(pattern->valuestring) : NULL + start ? ogs_strdup(start->valuestring) : NULL, + end ? ogs_strdup(end->valuestring) : NULL, + pattern ? ogs_strdup(pattern->valuestring) : NULL ); return identity_range_local_var; diff --git a/lib/sbi/openapi/model/immediate_mdt_conf.c b/lib/sbi/openapi/model/immediate_mdt_conf.c index 5ba2e2852..8af90814e 100644 --- a/lib/sbi/openapi/model/immediate_mdt_conf.c +++ b/lib/sbi/openapi/model/immediate_mdt_conf.c @@ -30,10 +30,9 @@ OpenAPI_immediate_mdt_conf_t *OpenAPI_immediate_mdt_conf_create( OpenAPI_list_t *sensor_measurement_list ) { - OpenAPI_immediate_mdt_conf_t *immediate_mdt_conf_local_var = OpenAPI_malloc(sizeof(OpenAPI_immediate_mdt_conf_t)); - if (!immediate_mdt_conf_local_var) { - return NULL; - } + OpenAPI_immediate_mdt_conf_t *immediate_mdt_conf_local_var = ogs_malloc(sizeof(OpenAPI_immediate_mdt_conf_t)); + ogs_assert(immediate_mdt_conf_local_var); + immediate_mdt_conf_local_var->job_type = job_type; immediate_mdt_conf_local_var->measurement_lte_list = measurement_lte_list; immediate_mdt_conf_local_var->measurement_nr_list = measurement_nr_list; diff --git a/lib/sbi/openapi/model/imsi_range.c b/lib/sbi/openapi/model/imsi_range.c index eb8f8344f..17698bbe5 100644 --- a/lib/sbi/openapi/model/imsi_range.c +++ b/lib/sbi/openapi/model/imsi_range.c @@ -10,10 +10,9 @@ OpenAPI_imsi_range_t *OpenAPI_imsi_range_create( char *pattern ) { - OpenAPI_imsi_range_t *imsi_range_local_var = OpenAPI_malloc(sizeof(OpenAPI_imsi_range_t)); - if (!imsi_range_local_var) { - return NULL; - } + OpenAPI_imsi_range_t *imsi_range_local_var = ogs_malloc(sizeof(OpenAPI_imsi_range_t)); + ogs_assert(imsi_range_local_var); + imsi_range_local_var->start = start; imsi_range_local_var->end = end; imsi_range_local_var->pattern = pattern; @@ -99,9 +98,9 @@ OpenAPI_imsi_range_t *OpenAPI_imsi_range_parseFromJSON(cJSON *imsi_rangeJSON) } imsi_range_local_var = OpenAPI_imsi_range_create ( - start ? ogs_strdup_or_assert(start->valuestring) : NULL, - end ? ogs_strdup_or_assert(end->valuestring) : NULL, - pattern ? ogs_strdup_or_assert(pattern->valuestring) : NULL + start ? ogs_strdup(start->valuestring) : NULL, + end ? ogs_strdup(end->valuestring) : NULL, + pattern ? ogs_strdup(pattern->valuestring) : NULL ); return imsi_range_local_var; diff --git a/lib/sbi/openapi/model/indirect_data_forwarding_tunnel_info.c b/lib/sbi/openapi/model/indirect_data_forwarding_tunnel_info.c index 3e9d4cb74..305db69fd 100644 --- a/lib/sbi/openapi/model/indirect_data_forwarding_tunnel_info.c +++ b/lib/sbi/openapi/model/indirect_data_forwarding_tunnel_info.c @@ -14,10 +14,9 @@ OpenAPI_indirect_data_forwarding_tunnel_info_t *OpenAPI_indirect_data_forwarding int additional_tnl_nb ) { - OpenAPI_indirect_data_forwarding_tunnel_info_t *indirect_data_forwarding_tunnel_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_indirect_data_forwarding_tunnel_info_t)); - if (!indirect_data_forwarding_tunnel_info_local_var) { - return NULL; - } + OpenAPI_indirect_data_forwarding_tunnel_info_t *indirect_data_forwarding_tunnel_info_local_var = ogs_malloc(sizeof(OpenAPI_indirect_data_forwarding_tunnel_info_t)); + ogs_assert(indirect_data_forwarding_tunnel_info_local_var); + indirect_data_forwarding_tunnel_info_local_var->ipv4_addr = ipv4_addr; indirect_data_forwarding_tunnel_info_local_var->ipv6_addr = ipv6_addr; indirect_data_forwarding_tunnel_info_local_var->gtp_teid = gtp_teid; @@ -139,9 +138,9 @@ OpenAPI_indirect_data_forwarding_tunnel_info_t *OpenAPI_indirect_data_forwarding } indirect_data_forwarding_tunnel_info_local_var = OpenAPI_indirect_data_forwarding_tunnel_info_create ( - ipv4_addr ? ogs_strdup_or_assert(ipv4_addr->valuestring) : NULL, - ipv6_addr ? ogs_strdup_or_assert(ipv6_addr->valuestring) : NULL, - ogs_strdup_or_assert(gtp_teid->valuestring), + ipv4_addr ? ogs_strdup(ipv4_addr->valuestring) : NULL, + ipv6_addr ? ogs_strdup(ipv6_addr->valuestring) : NULL, + ogs_strdup(gtp_teid->valuestring), drb_id ? true : false, drb_id ? drb_id->valuedouble : 0, additional_tnl_nb ? true : false, diff --git a/lib/sbi/openapi/model/inline_object.c b/lib/sbi/openapi/model/inline_object.c index ce634c997..5464ea096 100644 --- a/lib/sbi/openapi/model/inline_object.c +++ b/lib/sbi/openapi/model/inline_object.c @@ -25,10 +25,9 @@ OpenAPI_inline_object_t *OpenAPI_inline_object_create( OpenAPI_binary_t* binary_data_n2_information_ext16 ) { - OpenAPI_inline_object_t *inline_object_local_var = OpenAPI_malloc(sizeof(OpenAPI_inline_object_t)); - if (!inline_object_local_var) { - return NULL; - } + OpenAPI_inline_object_t *inline_object_local_var = ogs_malloc(sizeof(OpenAPI_inline_object_t)); + ogs_assert(inline_object_local_var); + inline_object_local_var->json_data = json_data; inline_object_local_var->binary_data_n2_information = binary_data_n2_information; inline_object_local_var->binary_data_n2_information_ext1 = binary_data_n2_information_ext1; @@ -270,7 +269,8 @@ OpenAPI_inline_object_t *OpenAPI_inline_object_parseFromJSON(cJSON *inline_objec cJSON *binary_data_n2_information = cJSON_GetObjectItemCaseSensitive(inline_objectJSON, "binaryDataN2Information"); - OpenAPI_binary_t* decoded_str_binary_data_n2_information = OpenAPI_malloc(sizeof(OpenAPI_binary_t)); + OpenAPI_binary_t* decoded_str_binary_data_n2_information = ogs_malloc(sizeof(OpenAPI_binary_t)); + ogs_assert(decoded_str_binary_data_n2_information); if (binary_data_n2_information) { if (!cJSON_IsString(binary_data_n2_information)) { ogs_error("OpenAPI_inline_object_parseFromJSON() failed [binary_data_n2_information]"); @@ -285,7 +285,8 @@ OpenAPI_inline_object_t *OpenAPI_inline_object_parseFromJSON(cJSON *inline_objec cJSON *binary_data_n2_information_ext1 = cJSON_GetObjectItemCaseSensitive(inline_objectJSON, "binaryDataN2InformationExt1"); - OpenAPI_binary_t* decoded_str_binary_data_n2_information_ext1 = OpenAPI_malloc(sizeof(OpenAPI_binary_t)); + OpenAPI_binary_t* decoded_str_binary_data_n2_information_ext1 = ogs_malloc(sizeof(OpenAPI_binary_t)); + ogs_assert(decoded_str_binary_data_n2_information_ext1); if (binary_data_n2_information_ext1) { if (!cJSON_IsString(binary_data_n2_information_ext1)) { ogs_error("OpenAPI_inline_object_parseFromJSON() failed [binary_data_n2_information_ext1]"); @@ -300,7 +301,8 @@ OpenAPI_inline_object_t *OpenAPI_inline_object_parseFromJSON(cJSON *inline_objec cJSON *binary_data_n2_information_ext2 = cJSON_GetObjectItemCaseSensitive(inline_objectJSON, "binaryDataN2InformationExt2"); - OpenAPI_binary_t* decoded_str_binary_data_n2_information_ext2 = OpenAPI_malloc(sizeof(OpenAPI_binary_t)); + OpenAPI_binary_t* decoded_str_binary_data_n2_information_ext2 = ogs_malloc(sizeof(OpenAPI_binary_t)); + ogs_assert(decoded_str_binary_data_n2_information_ext2); if (binary_data_n2_information_ext2) { if (!cJSON_IsString(binary_data_n2_information_ext2)) { ogs_error("OpenAPI_inline_object_parseFromJSON() failed [binary_data_n2_information_ext2]"); @@ -315,7 +317,8 @@ OpenAPI_inline_object_t *OpenAPI_inline_object_parseFromJSON(cJSON *inline_objec cJSON *binary_data_n2_information_ext3 = cJSON_GetObjectItemCaseSensitive(inline_objectJSON, "binaryDataN2InformationExt3"); - OpenAPI_binary_t* decoded_str_binary_data_n2_information_ext3 = OpenAPI_malloc(sizeof(OpenAPI_binary_t)); + OpenAPI_binary_t* decoded_str_binary_data_n2_information_ext3 = ogs_malloc(sizeof(OpenAPI_binary_t)); + ogs_assert(decoded_str_binary_data_n2_information_ext3); if (binary_data_n2_information_ext3) { if (!cJSON_IsString(binary_data_n2_information_ext3)) { ogs_error("OpenAPI_inline_object_parseFromJSON() failed [binary_data_n2_information_ext3]"); @@ -330,7 +333,8 @@ OpenAPI_inline_object_t *OpenAPI_inline_object_parseFromJSON(cJSON *inline_objec cJSON *binary_data_n2_information_ext4 = cJSON_GetObjectItemCaseSensitive(inline_objectJSON, "binaryDataN2InformationExt4"); - OpenAPI_binary_t* decoded_str_binary_data_n2_information_ext4 = OpenAPI_malloc(sizeof(OpenAPI_binary_t)); + OpenAPI_binary_t* decoded_str_binary_data_n2_information_ext4 = ogs_malloc(sizeof(OpenAPI_binary_t)); + ogs_assert(decoded_str_binary_data_n2_information_ext4); if (binary_data_n2_information_ext4) { if (!cJSON_IsString(binary_data_n2_information_ext4)) { ogs_error("OpenAPI_inline_object_parseFromJSON() failed [binary_data_n2_information_ext4]"); @@ -345,7 +349,8 @@ OpenAPI_inline_object_t *OpenAPI_inline_object_parseFromJSON(cJSON *inline_objec cJSON *binary_data_n2_information_ext5 = cJSON_GetObjectItemCaseSensitive(inline_objectJSON, "binaryDataN2InformationExt5"); - OpenAPI_binary_t* decoded_str_binary_data_n2_information_ext5 = OpenAPI_malloc(sizeof(OpenAPI_binary_t)); + OpenAPI_binary_t* decoded_str_binary_data_n2_information_ext5 = ogs_malloc(sizeof(OpenAPI_binary_t)); + ogs_assert(decoded_str_binary_data_n2_information_ext5); if (binary_data_n2_information_ext5) { if (!cJSON_IsString(binary_data_n2_information_ext5)) { ogs_error("OpenAPI_inline_object_parseFromJSON() failed [binary_data_n2_information_ext5]"); @@ -360,7 +365,8 @@ OpenAPI_inline_object_t *OpenAPI_inline_object_parseFromJSON(cJSON *inline_objec cJSON *binary_data_n2_information_ext6 = cJSON_GetObjectItemCaseSensitive(inline_objectJSON, "binaryDataN2InformationExt6"); - OpenAPI_binary_t* decoded_str_binary_data_n2_information_ext6 = OpenAPI_malloc(sizeof(OpenAPI_binary_t)); + OpenAPI_binary_t* decoded_str_binary_data_n2_information_ext6 = ogs_malloc(sizeof(OpenAPI_binary_t)); + ogs_assert(decoded_str_binary_data_n2_information_ext6); if (binary_data_n2_information_ext6) { if (!cJSON_IsString(binary_data_n2_information_ext6)) { ogs_error("OpenAPI_inline_object_parseFromJSON() failed [binary_data_n2_information_ext6]"); @@ -375,7 +381,8 @@ OpenAPI_inline_object_t *OpenAPI_inline_object_parseFromJSON(cJSON *inline_objec cJSON *binary_data_n2_information_ext7 = cJSON_GetObjectItemCaseSensitive(inline_objectJSON, "binaryDataN2InformationExt7"); - OpenAPI_binary_t* decoded_str_binary_data_n2_information_ext7 = OpenAPI_malloc(sizeof(OpenAPI_binary_t)); + OpenAPI_binary_t* decoded_str_binary_data_n2_information_ext7 = ogs_malloc(sizeof(OpenAPI_binary_t)); + ogs_assert(decoded_str_binary_data_n2_information_ext7); if (binary_data_n2_information_ext7) { if (!cJSON_IsString(binary_data_n2_information_ext7)) { ogs_error("OpenAPI_inline_object_parseFromJSON() failed [binary_data_n2_information_ext7]"); @@ -390,7 +397,8 @@ OpenAPI_inline_object_t *OpenAPI_inline_object_parseFromJSON(cJSON *inline_objec cJSON *binary_data_n2_information_ext8 = cJSON_GetObjectItemCaseSensitive(inline_objectJSON, "binaryDataN2InformationExt8"); - OpenAPI_binary_t* decoded_str_binary_data_n2_information_ext8 = OpenAPI_malloc(sizeof(OpenAPI_binary_t)); + OpenAPI_binary_t* decoded_str_binary_data_n2_information_ext8 = ogs_malloc(sizeof(OpenAPI_binary_t)); + ogs_assert(decoded_str_binary_data_n2_information_ext8); if (binary_data_n2_information_ext8) { if (!cJSON_IsString(binary_data_n2_information_ext8)) { ogs_error("OpenAPI_inline_object_parseFromJSON() failed [binary_data_n2_information_ext8]"); @@ -405,7 +413,8 @@ OpenAPI_inline_object_t *OpenAPI_inline_object_parseFromJSON(cJSON *inline_objec cJSON *binary_data_n2_information_ext9 = cJSON_GetObjectItemCaseSensitive(inline_objectJSON, "binaryDataN2InformationExt9"); - OpenAPI_binary_t* decoded_str_binary_data_n2_information_ext9 = OpenAPI_malloc(sizeof(OpenAPI_binary_t)); + OpenAPI_binary_t* decoded_str_binary_data_n2_information_ext9 = ogs_malloc(sizeof(OpenAPI_binary_t)); + ogs_assert(decoded_str_binary_data_n2_information_ext9); if (binary_data_n2_information_ext9) { if (!cJSON_IsString(binary_data_n2_information_ext9)) { ogs_error("OpenAPI_inline_object_parseFromJSON() failed [binary_data_n2_information_ext9]"); @@ -420,7 +429,8 @@ OpenAPI_inline_object_t *OpenAPI_inline_object_parseFromJSON(cJSON *inline_objec cJSON *binary_data_n2_information_ext10 = cJSON_GetObjectItemCaseSensitive(inline_objectJSON, "binaryDataN2InformationExt10"); - OpenAPI_binary_t* decoded_str_binary_data_n2_information_ext10 = OpenAPI_malloc(sizeof(OpenAPI_binary_t)); + OpenAPI_binary_t* decoded_str_binary_data_n2_information_ext10 = ogs_malloc(sizeof(OpenAPI_binary_t)); + ogs_assert(decoded_str_binary_data_n2_information_ext10); if (binary_data_n2_information_ext10) { if (!cJSON_IsString(binary_data_n2_information_ext10)) { ogs_error("OpenAPI_inline_object_parseFromJSON() failed [binary_data_n2_information_ext10]"); @@ -435,7 +445,8 @@ OpenAPI_inline_object_t *OpenAPI_inline_object_parseFromJSON(cJSON *inline_objec cJSON *binary_data_n2_information_ext11 = cJSON_GetObjectItemCaseSensitive(inline_objectJSON, "binaryDataN2InformationExt11"); - OpenAPI_binary_t* decoded_str_binary_data_n2_information_ext11 = OpenAPI_malloc(sizeof(OpenAPI_binary_t)); + OpenAPI_binary_t* decoded_str_binary_data_n2_information_ext11 = ogs_malloc(sizeof(OpenAPI_binary_t)); + ogs_assert(decoded_str_binary_data_n2_information_ext11); if (binary_data_n2_information_ext11) { if (!cJSON_IsString(binary_data_n2_information_ext11)) { ogs_error("OpenAPI_inline_object_parseFromJSON() failed [binary_data_n2_information_ext11]"); @@ -450,7 +461,8 @@ OpenAPI_inline_object_t *OpenAPI_inline_object_parseFromJSON(cJSON *inline_objec cJSON *binary_data_n2_information_ext12 = cJSON_GetObjectItemCaseSensitive(inline_objectJSON, "binaryDataN2InformationExt12"); - OpenAPI_binary_t* decoded_str_binary_data_n2_information_ext12 = OpenAPI_malloc(sizeof(OpenAPI_binary_t)); + OpenAPI_binary_t* decoded_str_binary_data_n2_information_ext12 = ogs_malloc(sizeof(OpenAPI_binary_t)); + ogs_assert(decoded_str_binary_data_n2_information_ext12); if (binary_data_n2_information_ext12) { if (!cJSON_IsString(binary_data_n2_information_ext12)) { ogs_error("OpenAPI_inline_object_parseFromJSON() failed [binary_data_n2_information_ext12]"); @@ -465,7 +477,8 @@ OpenAPI_inline_object_t *OpenAPI_inline_object_parseFromJSON(cJSON *inline_objec cJSON *binary_data_n2_information_ext13 = cJSON_GetObjectItemCaseSensitive(inline_objectJSON, "binaryDataN2InformationExt13"); - OpenAPI_binary_t* decoded_str_binary_data_n2_information_ext13 = OpenAPI_malloc(sizeof(OpenAPI_binary_t)); + OpenAPI_binary_t* decoded_str_binary_data_n2_information_ext13 = ogs_malloc(sizeof(OpenAPI_binary_t)); + ogs_assert(decoded_str_binary_data_n2_information_ext13); if (binary_data_n2_information_ext13) { if (!cJSON_IsString(binary_data_n2_information_ext13)) { ogs_error("OpenAPI_inline_object_parseFromJSON() failed [binary_data_n2_information_ext13]"); @@ -480,7 +493,8 @@ OpenAPI_inline_object_t *OpenAPI_inline_object_parseFromJSON(cJSON *inline_objec cJSON *binary_data_n2_information_ext14 = cJSON_GetObjectItemCaseSensitive(inline_objectJSON, "binaryDataN2InformationExt14"); - OpenAPI_binary_t* decoded_str_binary_data_n2_information_ext14 = OpenAPI_malloc(sizeof(OpenAPI_binary_t)); + OpenAPI_binary_t* decoded_str_binary_data_n2_information_ext14 = ogs_malloc(sizeof(OpenAPI_binary_t)); + ogs_assert(decoded_str_binary_data_n2_information_ext14); if (binary_data_n2_information_ext14) { if (!cJSON_IsString(binary_data_n2_information_ext14)) { ogs_error("OpenAPI_inline_object_parseFromJSON() failed [binary_data_n2_information_ext14]"); @@ -495,7 +509,8 @@ OpenAPI_inline_object_t *OpenAPI_inline_object_parseFromJSON(cJSON *inline_objec cJSON *binary_data_n2_information_ext15 = cJSON_GetObjectItemCaseSensitive(inline_objectJSON, "binaryDataN2InformationExt15"); - OpenAPI_binary_t* decoded_str_binary_data_n2_information_ext15 = OpenAPI_malloc(sizeof(OpenAPI_binary_t)); + OpenAPI_binary_t* decoded_str_binary_data_n2_information_ext15 = ogs_malloc(sizeof(OpenAPI_binary_t)); + ogs_assert(decoded_str_binary_data_n2_information_ext15); if (binary_data_n2_information_ext15) { if (!cJSON_IsString(binary_data_n2_information_ext15)) { ogs_error("OpenAPI_inline_object_parseFromJSON() failed [binary_data_n2_information_ext15]"); @@ -510,7 +525,8 @@ OpenAPI_inline_object_t *OpenAPI_inline_object_parseFromJSON(cJSON *inline_objec cJSON *binary_data_n2_information_ext16 = cJSON_GetObjectItemCaseSensitive(inline_objectJSON, "binaryDataN2InformationExt16"); - OpenAPI_binary_t* decoded_str_binary_data_n2_information_ext16 = OpenAPI_malloc(sizeof(OpenAPI_binary_t)); + OpenAPI_binary_t* decoded_str_binary_data_n2_information_ext16 = ogs_malloc(sizeof(OpenAPI_binary_t)); + ogs_assert(decoded_str_binary_data_n2_information_ext16); if (binary_data_n2_information_ext16) { if (!cJSON_IsString(binary_data_n2_information_ext16)) { ogs_error("OpenAPI_inline_object_parseFromJSON() failed [binary_data_n2_information_ext16]"); diff --git a/lib/sbi/openapi/model/inline_object_1.c b/lib/sbi/openapi/model/inline_object_1.c index eb5783d0c..b06d936ee 100644 --- a/lib/sbi/openapi/model/inline_object_1.c +++ b/lib/sbi/openapi/model/inline_object_1.c @@ -26,10 +26,9 @@ OpenAPI_inline_object_1_t *OpenAPI_inline_object_1_create( OpenAPI_binary_t* binary_data_n2_information_ext16 ) { - OpenAPI_inline_object_1_t *inline_object_1_local_var = OpenAPI_malloc(sizeof(OpenAPI_inline_object_1_t)); - if (!inline_object_1_local_var) { - return NULL; - } + OpenAPI_inline_object_1_t *inline_object_1_local_var = ogs_malloc(sizeof(OpenAPI_inline_object_1_t)); + ogs_assert(inline_object_1_local_var); + inline_object_1_local_var->json_data = json_data; inline_object_1_local_var->binary_data_gtpc_message = binary_data_gtpc_message; inline_object_1_local_var->binary_data_n2_information = binary_data_n2_information; @@ -282,7 +281,8 @@ OpenAPI_inline_object_1_t *OpenAPI_inline_object_1_parseFromJSON(cJSON *inline_o cJSON *binary_data_gtpc_message = cJSON_GetObjectItemCaseSensitive(inline_object_1JSON, "binaryDataGtpcMessage"); - OpenAPI_binary_t* decoded_str_binary_data_gtpc_message = OpenAPI_malloc(sizeof(OpenAPI_binary_t)); + OpenAPI_binary_t* decoded_str_binary_data_gtpc_message = ogs_malloc(sizeof(OpenAPI_binary_t)); + ogs_assert(decoded_str_binary_data_gtpc_message); if (binary_data_gtpc_message) { if (!cJSON_IsString(binary_data_gtpc_message)) { ogs_error("OpenAPI_inline_object_1_parseFromJSON() failed [binary_data_gtpc_message]"); @@ -297,7 +297,8 @@ OpenAPI_inline_object_1_t *OpenAPI_inline_object_1_parseFromJSON(cJSON *inline_o cJSON *binary_data_n2_information = cJSON_GetObjectItemCaseSensitive(inline_object_1JSON, "binaryDataN2Information"); - OpenAPI_binary_t* decoded_str_binary_data_n2_information = OpenAPI_malloc(sizeof(OpenAPI_binary_t)); + OpenAPI_binary_t* decoded_str_binary_data_n2_information = ogs_malloc(sizeof(OpenAPI_binary_t)); + ogs_assert(decoded_str_binary_data_n2_information); if (binary_data_n2_information) { if (!cJSON_IsString(binary_data_n2_information)) { ogs_error("OpenAPI_inline_object_1_parseFromJSON() failed [binary_data_n2_information]"); @@ -312,7 +313,8 @@ OpenAPI_inline_object_1_t *OpenAPI_inline_object_1_parseFromJSON(cJSON *inline_o cJSON *binary_data_n2_information_ext1 = cJSON_GetObjectItemCaseSensitive(inline_object_1JSON, "binaryDataN2InformationExt1"); - OpenAPI_binary_t* decoded_str_binary_data_n2_information_ext1 = OpenAPI_malloc(sizeof(OpenAPI_binary_t)); + OpenAPI_binary_t* decoded_str_binary_data_n2_information_ext1 = ogs_malloc(sizeof(OpenAPI_binary_t)); + ogs_assert(decoded_str_binary_data_n2_information_ext1); if (binary_data_n2_information_ext1) { if (!cJSON_IsString(binary_data_n2_information_ext1)) { ogs_error("OpenAPI_inline_object_1_parseFromJSON() failed [binary_data_n2_information_ext1]"); @@ -327,7 +329,8 @@ OpenAPI_inline_object_1_t *OpenAPI_inline_object_1_parseFromJSON(cJSON *inline_o cJSON *binary_data_n2_information_ext2 = cJSON_GetObjectItemCaseSensitive(inline_object_1JSON, "binaryDataN2InformationExt2"); - OpenAPI_binary_t* decoded_str_binary_data_n2_information_ext2 = OpenAPI_malloc(sizeof(OpenAPI_binary_t)); + OpenAPI_binary_t* decoded_str_binary_data_n2_information_ext2 = ogs_malloc(sizeof(OpenAPI_binary_t)); + ogs_assert(decoded_str_binary_data_n2_information_ext2); if (binary_data_n2_information_ext2) { if (!cJSON_IsString(binary_data_n2_information_ext2)) { ogs_error("OpenAPI_inline_object_1_parseFromJSON() failed [binary_data_n2_information_ext2]"); @@ -342,7 +345,8 @@ OpenAPI_inline_object_1_t *OpenAPI_inline_object_1_parseFromJSON(cJSON *inline_o cJSON *binary_data_n2_information_ext3 = cJSON_GetObjectItemCaseSensitive(inline_object_1JSON, "binaryDataN2InformationExt3"); - OpenAPI_binary_t* decoded_str_binary_data_n2_information_ext3 = OpenAPI_malloc(sizeof(OpenAPI_binary_t)); + OpenAPI_binary_t* decoded_str_binary_data_n2_information_ext3 = ogs_malloc(sizeof(OpenAPI_binary_t)); + ogs_assert(decoded_str_binary_data_n2_information_ext3); if (binary_data_n2_information_ext3) { if (!cJSON_IsString(binary_data_n2_information_ext3)) { ogs_error("OpenAPI_inline_object_1_parseFromJSON() failed [binary_data_n2_information_ext3]"); @@ -357,7 +361,8 @@ OpenAPI_inline_object_1_t *OpenAPI_inline_object_1_parseFromJSON(cJSON *inline_o cJSON *binary_data_n2_information_ext4 = cJSON_GetObjectItemCaseSensitive(inline_object_1JSON, "binaryDataN2InformationExt4"); - OpenAPI_binary_t* decoded_str_binary_data_n2_information_ext4 = OpenAPI_malloc(sizeof(OpenAPI_binary_t)); + OpenAPI_binary_t* decoded_str_binary_data_n2_information_ext4 = ogs_malloc(sizeof(OpenAPI_binary_t)); + ogs_assert(decoded_str_binary_data_n2_information_ext4); if (binary_data_n2_information_ext4) { if (!cJSON_IsString(binary_data_n2_information_ext4)) { ogs_error("OpenAPI_inline_object_1_parseFromJSON() failed [binary_data_n2_information_ext4]"); @@ -372,7 +377,8 @@ OpenAPI_inline_object_1_t *OpenAPI_inline_object_1_parseFromJSON(cJSON *inline_o cJSON *binary_data_n2_information_ext5 = cJSON_GetObjectItemCaseSensitive(inline_object_1JSON, "binaryDataN2InformationExt5"); - OpenAPI_binary_t* decoded_str_binary_data_n2_information_ext5 = OpenAPI_malloc(sizeof(OpenAPI_binary_t)); + OpenAPI_binary_t* decoded_str_binary_data_n2_information_ext5 = ogs_malloc(sizeof(OpenAPI_binary_t)); + ogs_assert(decoded_str_binary_data_n2_information_ext5); if (binary_data_n2_information_ext5) { if (!cJSON_IsString(binary_data_n2_information_ext5)) { ogs_error("OpenAPI_inline_object_1_parseFromJSON() failed [binary_data_n2_information_ext5]"); @@ -387,7 +393,8 @@ OpenAPI_inline_object_1_t *OpenAPI_inline_object_1_parseFromJSON(cJSON *inline_o cJSON *binary_data_n2_information_ext6 = cJSON_GetObjectItemCaseSensitive(inline_object_1JSON, "binaryDataN2InformationExt6"); - OpenAPI_binary_t* decoded_str_binary_data_n2_information_ext6 = OpenAPI_malloc(sizeof(OpenAPI_binary_t)); + OpenAPI_binary_t* decoded_str_binary_data_n2_information_ext6 = ogs_malloc(sizeof(OpenAPI_binary_t)); + ogs_assert(decoded_str_binary_data_n2_information_ext6); if (binary_data_n2_information_ext6) { if (!cJSON_IsString(binary_data_n2_information_ext6)) { ogs_error("OpenAPI_inline_object_1_parseFromJSON() failed [binary_data_n2_information_ext6]"); @@ -402,7 +409,8 @@ OpenAPI_inline_object_1_t *OpenAPI_inline_object_1_parseFromJSON(cJSON *inline_o cJSON *binary_data_n2_information_ext7 = cJSON_GetObjectItemCaseSensitive(inline_object_1JSON, "binaryDataN2InformationExt7"); - OpenAPI_binary_t* decoded_str_binary_data_n2_information_ext7 = OpenAPI_malloc(sizeof(OpenAPI_binary_t)); + OpenAPI_binary_t* decoded_str_binary_data_n2_information_ext7 = ogs_malloc(sizeof(OpenAPI_binary_t)); + ogs_assert(decoded_str_binary_data_n2_information_ext7); if (binary_data_n2_information_ext7) { if (!cJSON_IsString(binary_data_n2_information_ext7)) { ogs_error("OpenAPI_inline_object_1_parseFromJSON() failed [binary_data_n2_information_ext7]"); @@ -417,7 +425,8 @@ OpenAPI_inline_object_1_t *OpenAPI_inline_object_1_parseFromJSON(cJSON *inline_o cJSON *binary_data_n2_information_ext8 = cJSON_GetObjectItemCaseSensitive(inline_object_1JSON, "binaryDataN2InformationExt8"); - OpenAPI_binary_t* decoded_str_binary_data_n2_information_ext8 = OpenAPI_malloc(sizeof(OpenAPI_binary_t)); + OpenAPI_binary_t* decoded_str_binary_data_n2_information_ext8 = ogs_malloc(sizeof(OpenAPI_binary_t)); + ogs_assert(decoded_str_binary_data_n2_information_ext8); if (binary_data_n2_information_ext8) { if (!cJSON_IsString(binary_data_n2_information_ext8)) { ogs_error("OpenAPI_inline_object_1_parseFromJSON() failed [binary_data_n2_information_ext8]"); @@ -432,7 +441,8 @@ OpenAPI_inline_object_1_t *OpenAPI_inline_object_1_parseFromJSON(cJSON *inline_o cJSON *binary_data_n2_information_ext9 = cJSON_GetObjectItemCaseSensitive(inline_object_1JSON, "binaryDataN2InformationExt9"); - OpenAPI_binary_t* decoded_str_binary_data_n2_information_ext9 = OpenAPI_malloc(sizeof(OpenAPI_binary_t)); + OpenAPI_binary_t* decoded_str_binary_data_n2_information_ext9 = ogs_malloc(sizeof(OpenAPI_binary_t)); + ogs_assert(decoded_str_binary_data_n2_information_ext9); if (binary_data_n2_information_ext9) { if (!cJSON_IsString(binary_data_n2_information_ext9)) { ogs_error("OpenAPI_inline_object_1_parseFromJSON() failed [binary_data_n2_information_ext9]"); @@ -447,7 +457,8 @@ OpenAPI_inline_object_1_t *OpenAPI_inline_object_1_parseFromJSON(cJSON *inline_o cJSON *binary_data_n2_information_ext10 = cJSON_GetObjectItemCaseSensitive(inline_object_1JSON, "binaryDataN2InformationExt10"); - OpenAPI_binary_t* decoded_str_binary_data_n2_information_ext10 = OpenAPI_malloc(sizeof(OpenAPI_binary_t)); + OpenAPI_binary_t* decoded_str_binary_data_n2_information_ext10 = ogs_malloc(sizeof(OpenAPI_binary_t)); + ogs_assert(decoded_str_binary_data_n2_information_ext10); if (binary_data_n2_information_ext10) { if (!cJSON_IsString(binary_data_n2_information_ext10)) { ogs_error("OpenAPI_inline_object_1_parseFromJSON() failed [binary_data_n2_information_ext10]"); @@ -462,7 +473,8 @@ OpenAPI_inline_object_1_t *OpenAPI_inline_object_1_parseFromJSON(cJSON *inline_o cJSON *binary_data_n2_information_ext11 = cJSON_GetObjectItemCaseSensitive(inline_object_1JSON, "binaryDataN2InformationExt11"); - OpenAPI_binary_t* decoded_str_binary_data_n2_information_ext11 = OpenAPI_malloc(sizeof(OpenAPI_binary_t)); + OpenAPI_binary_t* decoded_str_binary_data_n2_information_ext11 = ogs_malloc(sizeof(OpenAPI_binary_t)); + ogs_assert(decoded_str_binary_data_n2_information_ext11); if (binary_data_n2_information_ext11) { if (!cJSON_IsString(binary_data_n2_information_ext11)) { ogs_error("OpenAPI_inline_object_1_parseFromJSON() failed [binary_data_n2_information_ext11]"); @@ -477,7 +489,8 @@ OpenAPI_inline_object_1_t *OpenAPI_inline_object_1_parseFromJSON(cJSON *inline_o cJSON *binary_data_n2_information_ext12 = cJSON_GetObjectItemCaseSensitive(inline_object_1JSON, "binaryDataN2InformationExt12"); - OpenAPI_binary_t* decoded_str_binary_data_n2_information_ext12 = OpenAPI_malloc(sizeof(OpenAPI_binary_t)); + OpenAPI_binary_t* decoded_str_binary_data_n2_information_ext12 = ogs_malloc(sizeof(OpenAPI_binary_t)); + ogs_assert(decoded_str_binary_data_n2_information_ext12); if (binary_data_n2_information_ext12) { if (!cJSON_IsString(binary_data_n2_information_ext12)) { ogs_error("OpenAPI_inline_object_1_parseFromJSON() failed [binary_data_n2_information_ext12]"); @@ -492,7 +505,8 @@ OpenAPI_inline_object_1_t *OpenAPI_inline_object_1_parseFromJSON(cJSON *inline_o cJSON *binary_data_n2_information_ext13 = cJSON_GetObjectItemCaseSensitive(inline_object_1JSON, "binaryDataN2InformationExt13"); - OpenAPI_binary_t* decoded_str_binary_data_n2_information_ext13 = OpenAPI_malloc(sizeof(OpenAPI_binary_t)); + OpenAPI_binary_t* decoded_str_binary_data_n2_information_ext13 = ogs_malloc(sizeof(OpenAPI_binary_t)); + ogs_assert(decoded_str_binary_data_n2_information_ext13); if (binary_data_n2_information_ext13) { if (!cJSON_IsString(binary_data_n2_information_ext13)) { ogs_error("OpenAPI_inline_object_1_parseFromJSON() failed [binary_data_n2_information_ext13]"); @@ -507,7 +521,8 @@ OpenAPI_inline_object_1_t *OpenAPI_inline_object_1_parseFromJSON(cJSON *inline_o cJSON *binary_data_n2_information_ext14 = cJSON_GetObjectItemCaseSensitive(inline_object_1JSON, "binaryDataN2InformationExt14"); - OpenAPI_binary_t* decoded_str_binary_data_n2_information_ext14 = OpenAPI_malloc(sizeof(OpenAPI_binary_t)); + OpenAPI_binary_t* decoded_str_binary_data_n2_information_ext14 = ogs_malloc(sizeof(OpenAPI_binary_t)); + ogs_assert(decoded_str_binary_data_n2_information_ext14); if (binary_data_n2_information_ext14) { if (!cJSON_IsString(binary_data_n2_information_ext14)) { ogs_error("OpenAPI_inline_object_1_parseFromJSON() failed [binary_data_n2_information_ext14]"); @@ -522,7 +537,8 @@ OpenAPI_inline_object_1_t *OpenAPI_inline_object_1_parseFromJSON(cJSON *inline_o cJSON *binary_data_n2_information_ext15 = cJSON_GetObjectItemCaseSensitive(inline_object_1JSON, "binaryDataN2InformationExt15"); - OpenAPI_binary_t* decoded_str_binary_data_n2_information_ext15 = OpenAPI_malloc(sizeof(OpenAPI_binary_t)); + OpenAPI_binary_t* decoded_str_binary_data_n2_information_ext15 = ogs_malloc(sizeof(OpenAPI_binary_t)); + ogs_assert(decoded_str_binary_data_n2_information_ext15); if (binary_data_n2_information_ext15) { if (!cJSON_IsString(binary_data_n2_information_ext15)) { ogs_error("OpenAPI_inline_object_1_parseFromJSON() failed [binary_data_n2_information_ext15]"); @@ -537,7 +553,8 @@ OpenAPI_inline_object_1_t *OpenAPI_inline_object_1_parseFromJSON(cJSON *inline_o cJSON *binary_data_n2_information_ext16 = cJSON_GetObjectItemCaseSensitive(inline_object_1JSON, "binaryDataN2InformationExt16"); - OpenAPI_binary_t* decoded_str_binary_data_n2_information_ext16 = OpenAPI_malloc(sizeof(OpenAPI_binary_t)); + OpenAPI_binary_t* decoded_str_binary_data_n2_information_ext16 = ogs_malloc(sizeof(OpenAPI_binary_t)); + ogs_assert(decoded_str_binary_data_n2_information_ext16); if (binary_data_n2_information_ext16) { if (!cJSON_IsString(binary_data_n2_information_ext16)) { ogs_error("OpenAPI_inline_object_1_parseFromJSON() failed [binary_data_n2_information_ext16]"); diff --git a/lib/sbi/openapi/model/inline_object_2.c b/lib/sbi/openapi/model/inline_object_2.c index d878a2200..7d6a19c56 100644 --- a/lib/sbi/openapi/model/inline_object_2.c +++ b/lib/sbi/openapi/model/inline_object_2.c @@ -9,10 +9,9 @@ OpenAPI_inline_object_2_t *OpenAPI_inline_object_2_create( OpenAPI_binary_t* binary_data_gtpc_message ) { - OpenAPI_inline_object_2_t *inline_object_2_local_var = OpenAPI_malloc(sizeof(OpenAPI_inline_object_2_t)); - if (!inline_object_2_local_var) { - return NULL; - } + OpenAPI_inline_object_2_t *inline_object_2_local_var = ogs_malloc(sizeof(OpenAPI_inline_object_2_t)); + ogs_assert(inline_object_2_local_var); + inline_object_2_local_var->json_data = json_data; inline_object_2_local_var->binary_data_gtpc_message = binary_data_gtpc_message; @@ -78,7 +77,8 @@ OpenAPI_inline_object_2_t *OpenAPI_inline_object_2_parseFromJSON(cJSON *inline_o cJSON *binary_data_gtpc_message = cJSON_GetObjectItemCaseSensitive(inline_object_2JSON, "binaryDataGtpcMessage"); - OpenAPI_binary_t* decoded_str_binary_data_gtpc_message = OpenAPI_malloc(sizeof(OpenAPI_binary_t)); + OpenAPI_binary_t* decoded_str_binary_data_gtpc_message = ogs_malloc(sizeof(OpenAPI_binary_t)); + ogs_assert(decoded_str_binary_data_gtpc_message); if (binary_data_gtpc_message) { if (!cJSON_IsString(binary_data_gtpc_message)) { ogs_error("OpenAPI_inline_object_2_parseFromJSON() failed [binary_data_gtpc_message]"); diff --git a/lib/sbi/openapi/model/inline_object_3.c b/lib/sbi/openapi/model/inline_object_3.c index 56c25ba11..98255503a 100644 --- a/lib/sbi/openapi/model/inline_object_3.c +++ b/lib/sbi/openapi/model/inline_object_3.c @@ -9,10 +9,9 @@ OpenAPI_inline_object_3_t *OpenAPI_inline_object_3_create( OpenAPI_binary_t* binary_data_n1_message ) { - OpenAPI_inline_object_3_t *inline_object_3_local_var = OpenAPI_malloc(sizeof(OpenAPI_inline_object_3_t)); - if (!inline_object_3_local_var) { - return NULL; - } + OpenAPI_inline_object_3_t *inline_object_3_local_var = ogs_malloc(sizeof(OpenAPI_inline_object_3_t)); + ogs_assert(inline_object_3_local_var); + inline_object_3_local_var->json_data = json_data; inline_object_3_local_var->binary_data_n1_message = binary_data_n1_message; @@ -78,7 +77,8 @@ OpenAPI_inline_object_3_t *OpenAPI_inline_object_3_parseFromJSON(cJSON *inline_o cJSON *binary_data_n1_message = cJSON_GetObjectItemCaseSensitive(inline_object_3JSON, "binaryDataN1Message"); - OpenAPI_binary_t* decoded_str_binary_data_n1_message = OpenAPI_malloc(sizeof(OpenAPI_binary_t)); + OpenAPI_binary_t* decoded_str_binary_data_n1_message = ogs_malloc(sizeof(OpenAPI_binary_t)); + ogs_assert(decoded_str_binary_data_n1_message); if (binary_data_n1_message) { if (!cJSON_IsString(binary_data_n1_message)) { ogs_error("OpenAPI_inline_object_3_parseFromJSON() failed [binary_data_n1_message]"); diff --git a/lib/sbi/openapi/model/inline_object_4.c b/lib/sbi/openapi/model/inline_object_4.c index 0a263a1fa..95933f204 100644 --- a/lib/sbi/openapi/model/inline_object_4.c +++ b/lib/sbi/openapi/model/inline_object_4.c @@ -10,10 +10,9 @@ OpenAPI_inline_object_4_t *OpenAPI_inline_object_4_create( OpenAPI_binary_t* binary_data_n2_information ) { - OpenAPI_inline_object_4_t *inline_object_4_local_var = OpenAPI_malloc(sizeof(OpenAPI_inline_object_4_t)); - if (!inline_object_4_local_var) { - return NULL; - } + OpenAPI_inline_object_4_t *inline_object_4_local_var = ogs_malloc(sizeof(OpenAPI_inline_object_4_t)); + ogs_assert(inline_object_4_local_var); + inline_object_4_local_var->json_data = json_data; inline_object_4_local_var->binary_data_n1_message = binary_data_n1_message; inline_object_4_local_var->binary_data_n2_information = binary_data_n2_information; @@ -90,7 +89,8 @@ OpenAPI_inline_object_4_t *OpenAPI_inline_object_4_parseFromJSON(cJSON *inline_o cJSON *binary_data_n1_message = cJSON_GetObjectItemCaseSensitive(inline_object_4JSON, "binaryDataN1Message"); - OpenAPI_binary_t* decoded_str_binary_data_n1_message = OpenAPI_malloc(sizeof(OpenAPI_binary_t)); + OpenAPI_binary_t* decoded_str_binary_data_n1_message = ogs_malloc(sizeof(OpenAPI_binary_t)); + ogs_assert(decoded_str_binary_data_n1_message); if (binary_data_n1_message) { if (!cJSON_IsString(binary_data_n1_message)) { ogs_error("OpenAPI_inline_object_4_parseFromJSON() failed [binary_data_n1_message]"); @@ -105,7 +105,8 @@ OpenAPI_inline_object_4_t *OpenAPI_inline_object_4_parseFromJSON(cJSON *inline_o cJSON *binary_data_n2_information = cJSON_GetObjectItemCaseSensitive(inline_object_4JSON, "binaryDataN2Information"); - OpenAPI_binary_t* decoded_str_binary_data_n2_information = OpenAPI_malloc(sizeof(OpenAPI_binary_t)); + OpenAPI_binary_t* decoded_str_binary_data_n2_information = ogs_malloc(sizeof(OpenAPI_binary_t)); + ogs_assert(decoded_str_binary_data_n2_information); if (binary_data_n2_information) { if (!cJSON_IsString(binary_data_n2_information)) { ogs_error("OpenAPI_inline_object_4_parseFromJSON() failed [binary_data_n2_information]"); diff --git a/lib/sbi/openapi/model/inline_response_200.c b/lib/sbi/openapi/model/inline_response_200.c index 3395b0b0a..98f12a91c 100644 --- a/lib/sbi/openapi/model/inline_response_200.c +++ b/lib/sbi/openapi/model/inline_response_200.c @@ -8,10 +8,9 @@ OpenAPI_inline_response_200_t *OpenAPI_inline_response_200_create( OpenAPI_list_t* _links ) { - OpenAPI_inline_response_200_t *inline_response_200_local_var = OpenAPI_malloc(sizeof(OpenAPI_inline_response_200_t)); - if (!inline_response_200_local_var) { - return NULL; - } + OpenAPI_inline_response_200_t *inline_response_200_local_var = ogs_malloc(sizeof(OpenAPI_inline_response_200_t)); + ogs_assert(inline_response_200_local_var); + inline_response_200_local_var->_links = _links; return inline_response_200_local_var; @@ -25,6 +24,7 @@ void OpenAPI_inline_response_200_free(OpenAPI_inline_response_200_t *inline_resp OpenAPI_lnode_t *node; OpenAPI_list_for_each(inline_response_200->_links, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_links_value_schema_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -87,9 +87,9 @@ OpenAPI_inline_response_200_t *OpenAPI_inline_response_200_parseFromJSON(cJSON * cJSON *localMapObject = _links_local_map; if (cJSON_IsObject(_links_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_links_value_schema_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_links_value_schema_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(_links_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_inline_response_200_parseFromJSON() failed [_links]"); goto end; diff --git a/lib/sbi/openapi/model/inter_freq_target_info.c b/lib/sbi/openapi/model/inter_freq_target_info.c index b2bf7084d..901d18914 100644 --- a/lib/sbi/openapi/model/inter_freq_target_info.c +++ b/lib/sbi/openapi/model/inter_freq_target_info.c @@ -9,10 +9,9 @@ OpenAPI_inter_freq_target_info_t *OpenAPI_inter_freq_target_info_create( OpenAPI_list_t *cell_id_list ) { - OpenAPI_inter_freq_target_info_t *inter_freq_target_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_inter_freq_target_info_t)); - if (!inter_freq_target_info_local_var) { - return NULL; - } + OpenAPI_inter_freq_target_info_t *inter_freq_target_info_local_var = ogs_malloc(sizeof(OpenAPI_inter_freq_target_info_t)); + ogs_assert(inter_freq_target_info_local_var); + inter_freq_target_info_local_var->dl_carrier_freq = dl_carrier_freq; inter_freq_target_info_local_var->cell_id_list = cell_id_list; diff --git a/lib/sbi/openapi/model/inter_freq_target_info_1.c b/lib/sbi/openapi/model/inter_freq_target_info_1.c index 6bd15a112..9305e1bd4 100644 --- a/lib/sbi/openapi/model/inter_freq_target_info_1.c +++ b/lib/sbi/openapi/model/inter_freq_target_info_1.c @@ -9,10 +9,9 @@ OpenAPI_inter_freq_target_info_1_t *OpenAPI_inter_freq_target_info_1_create( OpenAPI_list_t *cell_id_list ) { - OpenAPI_inter_freq_target_info_1_t *inter_freq_target_info_1_local_var = OpenAPI_malloc(sizeof(OpenAPI_inter_freq_target_info_1_t)); - if (!inter_freq_target_info_1_local_var) { - return NULL; - } + OpenAPI_inter_freq_target_info_1_t *inter_freq_target_info_1_local_var = ogs_malloc(sizeof(OpenAPI_inter_freq_target_info_1_t)); + ogs_assert(inter_freq_target_info_1_local_var); + inter_freq_target_info_1_local_var->dl_carrier_freq = dl_carrier_freq; inter_freq_target_info_1_local_var->cell_id_list = cell_id_list; diff --git a/lib/sbi/openapi/model/interface_upf_info_item.c b/lib/sbi/openapi/model/interface_upf_info_item.c index e8427989d..85bd2dc52 100644 --- a/lib/sbi/openapi/model/interface_upf_info_item.c +++ b/lib/sbi/openapi/model/interface_upf_info_item.c @@ -12,10 +12,9 @@ OpenAPI_interface_upf_info_item_t *OpenAPI_interface_upf_info_item_create( char *network_instance ) { - OpenAPI_interface_upf_info_item_t *interface_upf_info_item_local_var = OpenAPI_malloc(sizeof(OpenAPI_interface_upf_info_item_t)); - if (!interface_upf_info_item_local_var) { - return NULL; - } + OpenAPI_interface_upf_info_item_t *interface_upf_info_item_local_var = ogs_malloc(sizeof(OpenAPI_interface_upf_info_item_t)); + ogs_assert(interface_upf_info_item_local_var); + interface_upf_info_item_local_var->interface_type = interface_type; interface_upf_info_item_local_var->ipv4_endpoint_addresses = ipv4_endpoint_addresses; interface_upf_info_item_local_var->ipv6_endpoint_addresses = ipv6_endpoint_addresses; @@ -141,7 +140,7 @@ OpenAPI_interface_upf_info_item_t *OpenAPI_interface_upf_info_item_parseFromJSON ogs_error("OpenAPI_interface_upf_info_item_parseFromJSON() failed [ipv4_endpoint_addresses]"); goto end; } - OpenAPI_list_add(ipv4_endpoint_addressesList , ogs_strdup_or_assert(ipv4_endpoint_addresses_local->valuestring)); + OpenAPI_list_add(ipv4_endpoint_addressesList , ogs_strdup(ipv4_endpoint_addresses_local->valuestring)); } } @@ -161,7 +160,7 @@ OpenAPI_interface_upf_info_item_t *OpenAPI_interface_upf_info_item_parseFromJSON ogs_error("OpenAPI_interface_upf_info_item_parseFromJSON() failed [ipv6_endpoint_addresses]"); goto end; } - OpenAPI_list_add(ipv6_endpoint_addressesList , ogs_strdup_or_assert(ipv6_endpoint_addresses_local->valuestring)); + OpenAPI_list_add(ipv6_endpoint_addressesList , ogs_strdup(ipv6_endpoint_addresses_local->valuestring)); } } @@ -187,8 +186,8 @@ OpenAPI_interface_upf_info_item_t *OpenAPI_interface_upf_info_item_parseFromJSON interface_typeVariable, ipv4_endpoint_addresses ? ipv4_endpoint_addressesList : NULL, ipv6_endpoint_addresses ? ipv6_endpoint_addressesList : NULL, - endpoint_fqdn ? ogs_strdup_or_assert(endpoint_fqdn->valuestring) : NULL, - network_instance ? ogs_strdup_or_assert(network_instance->valuestring) : NULL + endpoint_fqdn ? ogs_strdup(endpoint_fqdn->valuestring) : NULL, + network_instance ? ogs_strdup(network_instance->valuestring) : NULL ); return interface_upf_info_item_local_var; diff --git a/lib/sbi/openapi/model/internal_group_id_range.c b/lib/sbi/openapi/model/internal_group_id_range.c index ed1378c94..e4def16f5 100644 --- a/lib/sbi/openapi/model/internal_group_id_range.c +++ b/lib/sbi/openapi/model/internal_group_id_range.c @@ -10,10 +10,9 @@ OpenAPI_internal_group_id_range_t *OpenAPI_internal_group_id_range_create( char *pattern ) { - OpenAPI_internal_group_id_range_t *internal_group_id_range_local_var = OpenAPI_malloc(sizeof(OpenAPI_internal_group_id_range_t)); - if (!internal_group_id_range_local_var) { - return NULL; - } + OpenAPI_internal_group_id_range_t *internal_group_id_range_local_var = ogs_malloc(sizeof(OpenAPI_internal_group_id_range_t)); + ogs_assert(internal_group_id_range_local_var); + internal_group_id_range_local_var->start = start; internal_group_id_range_local_var->end = end; internal_group_id_range_local_var->pattern = pattern; @@ -99,9 +98,9 @@ OpenAPI_internal_group_id_range_t *OpenAPI_internal_group_id_range_parseFromJSON } internal_group_id_range_local_var = OpenAPI_internal_group_id_range_create ( - start ? ogs_strdup_or_assert(start->valuestring) : NULL, - end ? ogs_strdup_or_assert(end->valuestring) : NULL, - pattern ? ogs_strdup_or_assert(pattern->valuestring) : NULL + start ? ogs_strdup(start->valuestring) : NULL, + end ? ogs_strdup(end->valuestring) : NULL, + pattern ? ogs_strdup(pattern->valuestring) : NULL ); return internal_group_id_range_local_var; diff --git a/lib/sbi/openapi/model/invalid_param.c b/lib/sbi/openapi/model/invalid_param.c index 7c379e8fe..b52e93133 100644 --- a/lib/sbi/openapi/model/invalid_param.c +++ b/lib/sbi/openapi/model/invalid_param.c @@ -9,10 +9,9 @@ OpenAPI_invalid_param_t *OpenAPI_invalid_param_create( char *reason ) { - OpenAPI_invalid_param_t *invalid_param_local_var = OpenAPI_malloc(sizeof(OpenAPI_invalid_param_t)); - if (!invalid_param_local_var) { - return NULL; - } + OpenAPI_invalid_param_t *invalid_param_local_var = ogs_malloc(sizeof(OpenAPI_invalid_param_t)); + ogs_assert(invalid_param_local_var); + invalid_param_local_var->param = param; invalid_param_local_var->reason = reason; @@ -80,8 +79,8 @@ OpenAPI_invalid_param_t *OpenAPI_invalid_param_parseFromJSON(cJSON *invalid_para } invalid_param_local_var = OpenAPI_invalid_param_create ( - ogs_strdup_or_assert(param->valuestring), - reason ? ogs_strdup_or_assert(reason->valuestring) : NULL + ogs_strdup(param->valuestring), + reason ? ogs_strdup(reason->valuestring) : NULL ); return invalid_param_local_var; diff --git a/lib/sbi/openapi/model/invalid_param_1.c b/lib/sbi/openapi/model/invalid_param_1.c index 71be41c0a..d24ce1a5c 100644 --- a/lib/sbi/openapi/model/invalid_param_1.c +++ b/lib/sbi/openapi/model/invalid_param_1.c @@ -9,10 +9,9 @@ OpenAPI_invalid_param_1_t *OpenAPI_invalid_param_1_create( char *reason ) { - OpenAPI_invalid_param_1_t *invalid_param_1_local_var = OpenAPI_malloc(sizeof(OpenAPI_invalid_param_1_t)); - if (!invalid_param_1_local_var) { - return NULL; - } + OpenAPI_invalid_param_1_t *invalid_param_1_local_var = ogs_malloc(sizeof(OpenAPI_invalid_param_1_t)); + ogs_assert(invalid_param_1_local_var); + invalid_param_1_local_var->param = param; invalid_param_1_local_var->reason = reason; @@ -80,8 +79,8 @@ OpenAPI_invalid_param_1_t *OpenAPI_invalid_param_1_parseFromJSON(cJSON *invalid_ } invalid_param_1_local_var = OpenAPI_invalid_param_1_create ( - ogs_strdup_or_assert(param->valuestring), - reason ? ogs_strdup_or_assert(reason->valuestring) : NULL + ogs_strdup(param->valuestring), + reason ? ogs_strdup(reason->valuestring) : NULL ); return invalid_param_1_local_var; diff --git a/lib/sbi/openapi/model/ip_address.c b/lib/sbi/openapi/model/ip_address.c index b564b9893..454100677 100644 --- a/lib/sbi/openapi/model/ip_address.c +++ b/lib/sbi/openapi/model/ip_address.c @@ -10,10 +10,9 @@ OpenAPI_ip_address_t *OpenAPI_ip_address_create( char *ipv6_prefix ) { - OpenAPI_ip_address_t *ip_address_local_var = OpenAPI_malloc(sizeof(OpenAPI_ip_address_t)); - if (!ip_address_local_var) { - return NULL; - } + OpenAPI_ip_address_t *ip_address_local_var = ogs_malloc(sizeof(OpenAPI_ip_address_t)); + ogs_assert(ip_address_local_var); + ip_address_local_var->ipv4_addr = ipv4_addr; ip_address_local_var->ipv6_addr = ipv6_addr; ip_address_local_var->ipv6_prefix = ipv6_prefix; @@ -99,9 +98,9 @@ OpenAPI_ip_address_t *OpenAPI_ip_address_parseFromJSON(cJSON *ip_addressJSON) } ip_address_local_var = OpenAPI_ip_address_create ( - ipv4_addr ? ogs_strdup_or_assert(ipv4_addr->valuestring) : NULL, - ipv6_addr ? ogs_strdup_or_assert(ipv6_addr->valuestring) : NULL, - ipv6_prefix ? ogs_strdup_or_assert(ipv6_prefix->valuestring) : NULL + ipv4_addr ? ogs_strdup(ipv4_addr->valuestring) : NULL, + ipv6_addr ? ogs_strdup(ipv6_addr->valuestring) : NULL, + ipv6_prefix ? ogs_strdup(ipv6_prefix->valuestring) : NULL ); return ip_address_local_var; diff --git a/lib/sbi/openapi/model/ip_address_1.c b/lib/sbi/openapi/model/ip_address_1.c index 3dc9b9cc5..d930fdece 100644 --- a/lib/sbi/openapi/model/ip_address_1.c +++ b/lib/sbi/openapi/model/ip_address_1.c @@ -10,10 +10,9 @@ OpenAPI_ip_address_1_t *OpenAPI_ip_address_1_create( char *ipv6_prefix ) { - OpenAPI_ip_address_1_t *ip_address_1_local_var = OpenAPI_malloc(sizeof(OpenAPI_ip_address_1_t)); - if (!ip_address_1_local_var) { - return NULL; - } + OpenAPI_ip_address_1_t *ip_address_1_local_var = ogs_malloc(sizeof(OpenAPI_ip_address_1_t)); + ogs_assert(ip_address_1_local_var); + ip_address_1_local_var->ipv4_addr = ipv4_addr; ip_address_1_local_var->ipv6_addr = ipv6_addr; ip_address_1_local_var->ipv6_prefix = ipv6_prefix; @@ -99,9 +98,9 @@ OpenAPI_ip_address_1_t *OpenAPI_ip_address_1_parseFromJSON(cJSON *ip_address_1JS } ip_address_1_local_var = OpenAPI_ip_address_1_create ( - ipv4_addr ? ogs_strdup_or_assert(ipv4_addr->valuestring) : NULL, - ipv6_addr ? ogs_strdup_or_assert(ipv6_addr->valuestring) : NULL, - ipv6_prefix ? ogs_strdup_or_assert(ipv6_prefix->valuestring) : NULL + ipv4_addr ? ogs_strdup(ipv4_addr->valuestring) : NULL, + ipv6_addr ? ogs_strdup(ipv6_addr->valuestring) : NULL, + ipv6_prefix ? ogs_strdup(ipv6_prefix->valuestring) : NULL ); return ip_address_1_local_var; diff --git a/lib/sbi/openapi/model/ip_end_point.c b/lib/sbi/openapi/model/ip_end_point.c index 70f694d37..b15c9245b 100644 --- a/lib/sbi/openapi/model/ip_end_point.c +++ b/lib/sbi/openapi/model/ip_end_point.c @@ -12,10 +12,9 @@ OpenAPI_ip_end_point_t *OpenAPI_ip_end_point_create( int port ) { - OpenAPI_ip_end_point_t *ip_end_point_local_var = OpenAPI_malloc(sizeof(OpenAPI_ip_end_point_t)); - if (!ip_end_point_local_var) { - return NULL; - } + OpenAPI_ip_end_point_t *ip_end_point_local_var = ogs_malloc(sizeof(OpenAPI_ip_end_point_t)); + ogs_assert(ip_end_point_local_var); + ip_end_point_local_var->ipv4_address = ipv4_address; ip_end_point_local_var->ipv6_address = ipv6_address; ip_end_point_local_var->transport = transport; @@ -120,8 +119,8 @@ OpenAPI_ip_end_point_t *OpenAPI_ip_end_point_parseFromJSON(cJSON *ip_end_pointJS } ip_end_point_local_var = OpenAPI_ip_end_point_create ( - ipv4_address ? ogs_strdup_or_assert(ipv4_address->valuestring) : NULL, - ipv6_address ? ogs_strdup_or_assert(ipv6_address->valuestring) : NULL, + ipv4_address ? ogs_strdup(ipv4_address->valuestring) : NULL, + ipv6_address ? ogs_strdup(ipv6_address->valuestring) : NULL, transport ? transportVariable : 0, port ? true : false, port ? port->valuedouble : 0 diff --git a/lib/sbi/openapi/model/ip_multicast_address_info.c b/lib/sbi/openapi/model/ip_multicast_address_info.c index 6e934d2d4..5c1b5d8ce 100644 --- a/lib/sbi/openapi/model/ip_multicast_address_info.c +++ b/lib/sbi/openapi/model/ip_multicast_address_info.c @@ -11,10 +11,9 @@ OpenAPI_ip_multicast_address_info_t *OpenAPI_ip_multicast_address_info_create( char *ipv6_mul_addr ) { - OpenAPI_ip_multicast_address_info_t *ip_multicast_address_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_ip_multicast_address_info_t)); - if (!ip_multicast_address_info_local_var) { - return NULL; - } + OpenAPI_ip_multicast_address_info_t *ip_multicast_address_info_local_var = ogs_malloc(sizeof(OpenAPI_ip_multicast_address_info_t)); + ogs_assert(ip_multicast_address_info_local_var); + ip_multicast_address_info_local_var->src_ipv4_addr = src_ipv4_addr; ip_multicast_address_info_local_var->ipv4_mul_addr = ipv4_mul_addr; ip_multicast_address_info_local_var->src_ipv6_addr = src_ipv6_addr; @@ -118,10 +117,10 @@ OpenAPI_ip_multicast_address_info_t *OpenAPI_ip_multicast_address_info_parseFrom } ip_multicast_address_info_local_var = OpenAPI_ip_multicast_address_info_create ( - src_ipv4_addr ? ogs_strdup_or_assert(src_ipv4_addr->valuestring) : NULL, - ipv4_mul_addr ? ogs_strdup_or_assert(ipv4_mul_addr->valuestring) : NULL, - src_ipv6_addr ? ogs_strdup_or_assert(src_ipv6_addr->valuestring) : NULL, - ipv6_mul_addr ? ogs_strdup_or_assert(ipv6_mul_addr->valuestring) : NULL + src_ipv4_addr ? ogs_strdup(src_ipv4_addr->valuestring) : NULL, + ipv4_mul_addr ? ogs_strdup(ipv4_mul_addr->valuestring) : NULL, + src_ipv6_addr ? ogs_strdup(src_ipv6_addr->valuestring) : NULL, + ipv6_mul_addr ? ogs_strdup(ipv6_mul_addr->valuestring) : NULL ); return ip_multicast_address_info_local_var; diff --git a/lib/sbi/openapi/model/ip_sm_gw_registration.c b/lib/sbi/openapi/model/ip_sm_gw_registration.c index 2fbf124a5..33da695f4 100644 --- a/lib/sbi/openapi/model/ip_sm_gw_registration.c +++ b/lib/sbi/openapi/model/ip_sm_gw_registration.c @@ -11,10 +11,9 @@ OpenAPI_ip_sm_gw_registration_t *OpenAPI_ip_sm_gw_registration_create( int unri_indicator ) { - OpenAPI_ip_sm_gw_registration_t *ip_sm_gw_registration_local_var = OpenAPI_malloc(sizeof(OpenAPI_ip_sm_gw_registration_t)); - if (!ip_sm_gw_registration_local_var) { - return NULL; - } + OpenAPI_ip_sm_gw_registration_t *ip_sm_gw_registration_local_var = ogs_malloc(sizeof(OpenAPI_ip_sm_gw_registration_t)); + ogs_assert(ip_sm_gw_registration_local_var); + ip_sm_gw_registration_local_var->ip_sm_gw_map_address = ip_sm_gw_map_address; ip_sm_gw_registration_local_var->ip_sm_gw_diameter_address = ip_sm_gw_diameter_address; ip_sm_gw_registration_local_var->is_unri_indicator = is_unri_indicator; @@ -104,7 +103,7 @@ OpenAPI_ip_sm_gw_registration_t *OpenAPI_ip_sm_gw_registration_parseFromJSON(cJS } ip_sm_gw_registration_local_var = OpenAPI_ip_sm_gw_registration_create ( - ip_sm_gw_map_address ? ogs_strdup_or_assert(ip_sm_gw_map_address->valuestring) : NULL, + ip_sm_gw_map_address ? ogs_strdup(ip_sm_gw_map_address->valuestring) : NULL, ip_sm_gw_diameter_address ? ip_sm_gw_diameter_address_local_nonprim : NULL, unri_indicator ? true : false, unri_indicator ? unri_indicator->valueint : 0 diff --git a/lib/sbi/openapi/model/iptv_config_data.c b/lib/sbi/openapi/model/iptv_config_data.c index 2a3b34842..bd2775f2a 100644 --- a/lib/sbi/openapi/model/iptv_config_data.c +++ b/lib/sbi/openapi/model/iptv_config_data.c @@ -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; diff --git a/lib/sbi/openapi/model/iptv_config_data_patch.c b/lib/sbi/openapi/model/iptv_config_data_patch.c index 11f4b0975..58d83c521 100644 --- a/lib/sbi/openapi/model/iptv_config_data_patch.c +++ b/lib/sbi/openapi/model/iptv_config_data_patch.c @@ -8,10 +8,9 @@ OpenAPI_iptv_config_data_patch_t *OpenAPI_iptv_config_data_patch_create( OpenAPI_list_t* multi_acc_ctrls ) { - OpenAPI_iptv_config_data_patch_t *iptv_config_data_patch_local_var = OpenAPI_malloc(sizeof(OpenAPI_iptv_config_data_patch_t)); - if (!iptv_config_data_patch_local_var) { - return NULL; - } + OpenAPI_iptv_config_data_patch_t *iptv_config_data_patch_local_var = ogs_malloc(sizeof(OpenAPI_iptv_config_data_patch_t)); + ogs_assert(iptv_config_data_patch_local_var); + iptv_config_data_patch_local_var->multi_acc_ctrls = multi_acc_ctrls; return iptv_config_data_patch_local_var; @@ -25,6 +24,7 @@ void OpenAPI_iptv_config_data_patch_free(OpenAPI_iptv_config_data_patch_t *iptv_ OpenAPI_lnode_t *node; OpenAPI_list_for_each(iptv_config_data_patch->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); } @@ -87,9 +87,9 @@ OpenAPI_iptv_config_data_patch_t *OpenAPI_iptv_config_data_patch_parseFromJSON(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_patch_parseFromJSON() failed [multi_acc_ctrls]"); goto end; diff --git a/lib/sbi/openapi/model/ipv4_address_range.c b/lib/sbi/openapi/model/ipv4_address_range.c index c90ff0148..3db010549 100644 --- a/lib/sbi/openapi/model/ipv4_address_range.c +++ b/lib/sbi/openapi/model/ipv4_address_range.c @@ -9,10 +9,9 @@ OpenAPI_ipv4_address_range_t *OpenAPI_ipv4_address_range_create( char *end ) { - OpenAPI_ipv4_address_range_t *ipv4_address_range_local_var = OpenAPI_malloc(sizeof(OpenAPI_ipv4_address_range_t)); - if (!ipv4_address_range_local_var) { - return NULL; - } + OpenAPI_ipv4_address_range_t *ipv4_address_range_local_var = ogs_malloc(sizeof(OpenAPI_ipv4_address_range_t)); + ogs_assert(ipv4_address_range_local_var); + ipv4_address_range_local_var->start = start; ipv4_address_range_local_var->end = end; @@ -80,8 +79,8 @@ OpenAPI_ipv4_address_range_t *OpenAPI_ipv4_address_range_parseFromJSON(cJSON *ip } ipv4_address_range_local_var = OpenAPI_ipv4_address_range_create ( - start ? ogs_strdup_or_assert(start->valuestring) : NULL, - end ? ogs_strdup_or_assert(end->valuestring) : NULL + start ? ogs_strdup(start->valuestring) : NULL, + end ? ogs_strdup(end->valuestring) : NULL ); return ipv4_address_range_local_var; diff --git a/lib/sbi/openapi/model/ipv6_prefix_range.c b/lib/sbi/openapi/model/ipv6_prefix_range.c index d11e8e9f1..2df5ed09d 100644 --- a/lib/sbi/openapi/model/ipv6_prefix_range.c +++ b/lib/sbi/openapi/model/ipv6_prefix_range.c @@ -9,10 +9,9 @@ OpenAPI_ipv6_prefix_range_t *OpenAPI_ipv6_prefix_range_create( char *end ) { - OpenAPI_ipv6_prefix_range_t *ipv6_prefix_range_local_var = OpenAPI_malloc(sizeof(OpenAPI_ipv6_prefix_range_t)); - if (!ipv6_prefix_range_local_var) { - return NULL; - } + OpenAPI_ipv6_prefix_range_t *ipv6_prefix_range_local_var = ogs_malloc(sizeof(OpenAPI_ipv6_prefix_range_t)); + ogs_assert(ipv6_prefix_range_local_var); + ipv6_prefix_range_local_var->start = start; ipv6_prefix_range_local_var->end = end; @@ -80,8 +79,8 @@ OpenAPI_ipv6_prefix_range_t *OpenAPI_ipv6_prefix_range_parseFromJSON(cJSON *ipv6 } ipv6_prefix_range_local_var = OpenAPI_ipv6_prefix_range_create ( - start ? ogs_strdup_or_assert(start->valuestring) : NULL, - end ? ogs_strdup_or_assert(end->valuestring) : NULL + start ? ogs_strdup(start->valuestring) : NULL, + end ? ogs_strdup(end->valuestring) : NULL ); return ipv6_prefix_range_local_var; diff --git a/lib/sbi/openapi/model/key_amf.c b/lib/sbi/openapi/model/key_amf.c index 0ba28aa56..8e1b5cd05 100644 --- a/lib/sbi/openapi/model/key_amf.c +++ b/lib/sbi/openapi/model/key_amf.c @@ -9,10 +9,9 @@ OpenAPI_key_amf_t *OpenAPI_key_amf_create( char *key_val ) { - OpenAPI_key_amf_t *key_amf_local_var = OpenAPI_malloc(sizeof(OpenAPI_key_amf_t)); - if (!key_amf_local_var) { - return NULL; - } + OpenAPI_key_amf_t *key_amf_local_var = ogs_malloc(sizeof(OpenAPI_key_amf_t)); + ogs_assert(key_amf_local_var); + key_amf_local_var->key_type = key_type; key_amf_local_var->key_val = key_val; @@ -82,7 +81,7 @@ OpenAPI_key_amf_t *OpenAPI_key_amf_parseFromJSON(cJSON *key_amfJSON) key_amf_local_var = OpenAPI_key_amf_create ( key_typeVariable, - ogs_strdup_or_assert(key_val->valuestring) + ogs_strdup(key_val->valuestring) ); return key_amf_local_var; diff --git a/lib/sbi/openapi/model/ladn_info.c b/lib/sbi/openapi/model/ladn_info.c index 57dbfe321..aa0d0d7b8 100644 --- a/lib/sbi/openapi/model/ladn_info.c +++ b/lib/sbi/openapi/model/ladn_info.c @@ -9,10 +9,9 @@ OpenAPI_ladn_info_t *OpenAPI_ladn_info_create( OpenAPI_presence_state_e presence ) { - OpenAPI_ladn_info_t *ladn_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_ladn_info_t)); - if (!ladn_info_local_var) { - return NULL; - } + OpenAPI_ladn_info_t *ladn_info_local_var = ogs_malloc(sizeof(OpenAPI_ladn_info_t)); + ogs_assert(ladn_info_local_var); + ladn_info_local_var->ladn = ladn; ladn_info_local_var->presence = presence; @@ -81,7 +80,7 @@ OpenAPI_ladn_info_t *OpenAPI_ladn_info_parseFromJSON(cJSON *ladn_infoJSON) } ladn_info_local_var = OpenAPI_ladn_info_create ( - ogs_strdup_or_assert(ladn->valuestring), + ogs_strdup(ladn->valuestring), presence ? presenceVariable : 0 ); diff --git a/lib/sbi/openapi/model/lcs_broadcast_assistance_types_data.c b/lib/sbi/openapi/model/lcs_broadcast_assistance_types_data.c index bd7dc3c8e..9375a08ce 100644 --- a/lib/sbi/openapi/model/lcs_broadcast_assistance_types_data.c +++ b/lib/sbi/openapi/model/lcs_broadcast_assistance_types_data.c @@ -8,10 +8,9 @@ OpenAPI_lcs_broadcast_assistance_types_data_t *OpenAPI_lcs_broadcast_assistance_ OpenAPI_list_t *location_assistance_type ) { - OpenAPI_lcs_broadcast_assistance_types_data_t *lcs_broadcast_assistance_types_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_lcs_broadcast_assistance_types_data_t)); - if (!lcs_broadcast_assistance_types_data_local_var) { - return NULL; - } + OpenAPI_lcs_broadcast_assistance_types_data_t *lcs_broadcast_assistance_types_data_local_var = ogs_malloc(sizeof(OpenAPI_lcs_broadcast_assistance_types_data_t)); + ogs_assert(lcs_broadcast_assistance_types_data_local_var); + lcs_broadcast_assistance_types_data_local_var->location_assistance_type = location_assistance_type; return lcs_broadcast_assistance_types_data_local_var; diff --git a/lib/sbi/openapi/model/lcs_broadcast_assistance_types_data_1.c b/lib/sbi/openapi/model/lcs_broadcast_assistance_types_data_1.c index 830f0a855..3c822ac79 100644 --- a/lib/sbi/openapi/model/lcs_broadcast_assistance_types_data_1.c +++ b/lib/sbi/openapi/model/lcs_broadcast_assistance_types_data_1.c @@ -8,10 +8,9 @@ OpenAPI_lcs_broadcast_assistance_types_data_1_t *OpenAPI_lcs_broadcast_assistanc OpenAPI_list_t *location_assistance_type ) { - OpenAPI_lcs_broadcast_assistance_types_data_1_t *lcs_broadcast_assistance_types_data_1_local_var = OpenAPI_malloc(sizeof(OpenAPI_lcs_broadcast_assistance_types_data_1_t)); - if (!lcs_broadcast_assistance_types_data_1_local_var) { - return NULL; - } + OpenAPI_lcs_broadcast_assistance_types_data_1_t *lcs_broadcast_assistance_types_data_1_local_var = ogs_malloc(sizeof(OpenAPI_lcs_broadcast_assistance_types_data_1_t)); + ogs_assert(lcs_broadcast_assistance_types_data_1_local_var); + lcs_broadcast_assistance_types_data_1_local_var->location_assistance_type = location_assistance_type; return lcs_broadcast_assistance_types_data_1_local_var; diff --git a/lib/sbi/openapi/model/lcs_client_external.c b/lib/sbi/openapi/model/lcs_client_external.c index 18c965316..9d942de22 100644 --- a/lib/sbi/openapi/model/lcs_client_external.c +++ b/lib/sbi/openapi/model/lcs_client_external.c @@ -10,10 +10,9 @@ OpenAPI_lcs_client_external_t *OpenAPI_lcs_client_external_create( OpenAPI_valid_time_period_t *valid_time_period ) { - OpenAPI_lcs_client_external_t *lcs_client_external_local_var = OpenAPI_malloc(sizeof(OpenAPI_lcs_client_external_t)); - if (!lcs_client_external_local_var) { - return NULL; - } + OpenAPI_lcs_client_external_t *lcs_client_external_local_var = ogs_malloc(sizeof(OpenAPI_lcs_client_external_t)); + ogs_assert(lcs_client_external_local_var); + lcs_client_external_local_var->allowed_geographic_area = allowed_geographic_area; lcs_client_external_local_var->privacy_check_related_action = privacy_check_related_action; lcs_client_external_local_var->valid_time_period = valid_time_period; diff --git a/lib/sbi/openapi/model/lcs_client_group_external.c b/lib/sbi/openapi/model/lcs_client_group_external.c index 0c6d0e961..be3165281 100644 --- a/lib/sbi/openapi/model/lcs_client_group_external.c +++ b/lib/sbi/openapi/model/lcs_client_group_external.c @@ -11,10 +11,9 @@ OpenAPI_lcs_client_group_external_t *OpenAPI_lcs_client_group_external_create( OpenAPI_valid_time_period_t *valid_time_period ) { - OpenAPI_lcs_client_group_external_t *lcs_client_group_external_local_var = OpenAPI_malloc(sizeof(OpenAPI_lcs_client_group_external_t)); - if (!lcs_client_group_external_local_var) { - return NULL; - } + OpenAPI_lcs_client_group_external_t *lcs_client_group_external_local_var = ogs_malloc(sizeof(OpenAPI_lcs_client_group_external_t)); + ogs_assert(lcs_client_group_external_local_var); + lcs_client_group_external_local_var->lcs_client_group_id = lcs_client_group_id; lcs_client_group_external_local_var->allowed_geographic_area = allowed_geographic_area; lcs_client_group_external_local_var->privacy_check_related_action = privacy_check_related_action; @@ -153,7 +152,7 @@ OpenAPI_lcs_client_group_external_t *OpenAPI_lcs_client_group_external_parseFrom } lcs_client_group_external_local_var = OpenAPI_lcs_client_group_external_create ( - lcs_client_group_id ? ogs_strdup_or_assert(lcs_client_group_id->valuestring) : NULL, + lcs_client_group_id ? ogs_strdup(lcs_client_group_id->valuestring) : NULL, allowed_geographic_area ? allowed_geographic_areaList : NULL, privacy_check_related_action ? privacy_check_related_actionVariable : 0, valid_time_period ? valid_time_period_local_nonprim : NULL diff --git a/lib/sbi/openapi/model/lcs_mo_data.c b/lib/sbi/openapi/model/lcs_mo_data.c index 8229197b2..0548643b4 100644 --- a/lib/sbi/openapi/model/lcs_mo_data.c +++ b/lib/sbi/openapi/model/lcs_mo_data.c @@ -8,10 +8,9 @@ OpenAPI_lcs_mo_data_t *OpenAPI_lcs_mo_data_create( OpenAPI_list_t *allowed_service_classes ) { - OpenAPI_lcs_mo_data_t *lcs_mo_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_lcs_mo_data_t)); - if (!lcs_mo_data_local_var) { - return NULL; - } + OpenAPI_lcs_mo_data_t *lcs_mo_data_local_var = ogs_malloc(sizeof(OpenAPI_lcs_mo_data_t)); + ogs_assert(lcs_mo_data_local_var); + lcs_mo_data_local_var->allowed_service_classes = allowed_service_classes; return lcs_mo_data_local_var; diff --git a/lib/sbi/openapi/model/lcs_privacy.c b/lib/sbi/openapi/model/lcs_privacy.c index 042b0cd67..bcc5d96ae 100644 --- a/lib/sbi/openapi/model/lcs_privacy.c +++ b/lib/sbi/openapi/model/lcs_privacy.c @@ -12,10 +12,9 @@ OpenAPI_lcs_privacy_t *OpenAPI_lcs_privacy_create( char *mtc_provider_information ) { - OpenAPI_lcs_privacy_t *lcs_privacy_local_var = OpenAPI_malloc(sizeof(OpenAPI_lcs_privacy_t)); - if (!lcs_privacy_local_var) { - return NULL; - } + OpenAPI_lcs_privacy_t *lcs_privacy_local_var = ogs_malloc(sizeof(OpenAPI_lcs_privacy_t)); + ogs_assert(lcs_privacy_local_var); + lcs_privacy_local_var->af_instance_id = af_instance_id; lcs_privacy_local_var->is_reference_id = is_reference_id; lcs_privacy_local_var->reference_id = reference_id; @@ -123,11 +122,11 @@ OpenAPI_lcs_privacy_t *OpenAPI_lcs_privacy_parseFromJSON(cJSON *lcs_privacyJSON) } lcs_privacy_local_var = OpenAPI_lcs_privacy_create ( - af_instance_id ? ogs_strdup_or_assert(af_instance_id->valuestring) : NULL, + af_instance_id ? ogs_strdup(af_instance_id->valuestring) : NULL, reference_id ? true : false, reference_id ? reference_id->valuedouble : 0, lpi ? lpi_local_nonprim : NULL, - mtc_provider_information ? ogs_strdup_or_assert(mtc_provider_information->valuestring) : NULL + mtc_provider_information ? ogs_strdup(mtc_provider_information->valuestring) : NULL ); return lcs_privacy_local_var; diff --git a/lib/sbi/openapi/model/lcs_privacy_data.c b/lib/sbi/openapi/model/lcs_privacy_data.c index f592f55b3..adf76170e 100644 --- a/lib/sbi/openapi/model/lcs_privacy_data.c +++ b/lib/sbi/openapi/model/lcs_privacy_data.c @@ -10,10 +10,9 @@ OpenAPI_lcs_privacy_data_t *OpenAPI_lcs_privacy_data_create( OpenAPI_list_t *plmn_operator_classes ) { - OpenAPI_lcs_privacy_data_t *lcs_privacy_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_lcs_privacy_data_t)); - if (!lcs_privacy_data_local_var) { - return NULL; - } + OpenAPI_lcs_privacy_data_t *lcs_privacy_data_local_var = ogs_malloc(sizeof(OpenAPI_lcs_privacy_data_t)); + ogs_assert(lcs_privacy_data_local_var); + lcs_privacy_data_local_var->lpi = lpi; lcs_privacy_data_local_var->unrelated_class = unrelated_class; lcs_privacy_data_local_var->plmn_operator_classes = plmn_operator_classes; diff --git a/lib/sbi/openapi/model/lcs_privacy_data_1.c b/lib/sbi/openapi/model/lcs_privacy_data_1.c index af357f2af..af5c325db 100644 --- a/lib/sbi/openapi/model/lcs_privacy_data_1.c +++ b/lib/sbi/openapi/model/lcs_privacy_data_1.c @@ -10,10 +10,9 @@ OpenAPI_lcs_privacy_data_1_t *OpenAPI_lcs_privacy_data_1_create( OpenAPI_list_t *plmn_operator_classes ) { - OpenAPI_lcs_privacy_data_1_t *lcs_privacy_data_1_local_var = OpenAPI_malloc(sizeof(OpenAPI_lcs_privacy_data_1_t)); - if (!lcs_privacy_data_1_local_var) { - return NULL; - } + OpenAPI_lcs_privacy_data_1_t *lcs_privacy_data_1_local_var = ogs_malloc(sizeof(OpenAPI_lcs_privacy_data_1_t)); + ogs_assert(lcs_privacy_data_1_local_var); + lcs_privacy_data_1_local_var->lpi = lpi; lcs_privacy_data_1_local_var->unrelated_class = unrelated_class; lcs_privacy_data_1_local_var->plmn_operator_classes = plmn_operator_classes; diff --git a/lib/sbi/openapi/model/limit_id_to_monitoring_key.c b/lib/sbi/openapi/model/limit_id_to_monitoring_key.c index d860b3c6a..cc86cf4fd 100644 --- a/lib/sbi/openapi/model/limit_id_to_monitoring_key.c +++ b/lib/sbi/openapi/model/limit_id_to_monitoring_key.c @@ -9,10 +9,9 @@ OpenAPI_limit_id_to_monitoring_key_t *OpenAPI_limit_id_to_monitoring_key_create( OpenAPI_list_t *monkey ) { - OpenAPI_limit_id_to_monitoring_key_t *limit_id_to_monitoring_key_local_var = OpenAPI_malloc(sizeof(OpenAPI_limit_id_to_monitoring_key_t)); - if (!limit_id_to_monitoring_key_local_var) { - return NULL; - } + OpenAPI_limit_id_to_monitoring_key_t *limit_id_to_monitoring_key_local_var = ogs_malloc(sizeof(OpenAPI_limit_id_to_monitoring_key_t)); + ogs_assert(limit_id_to_monitoring_key_local_var); + limit_id_to_monitoring_key_local_var->limit_id = limit_id; limit_id_to_monitoring_key_local_var->monkey = monkey; @@ -98,12 +97,12 @@ OpenAPI_limit_id_to_monitoring_key_t *OpenAPI_limit_id_to_monitoring_key_parseFr ogs_error("OpenAPI_limit_id_to_monitoring_key_parseFromJSON() failed [monkey]"); goto end; } - OpenAPI_list_add(monkeyList , ogs_strdup_or_assert(monkey_local->valuestring)); + OpenAPI_list_add(monkeyList , ogs_strdup(monkey_local->valuestring)); } } limit_id_to_monitoring_key_local_var = OpenAPI_limit_id_to_monitoring_key_create ( - ogs_strdup_or_assert(limit_id->valuestring), + ogs_strdup(limit_id->valuestring), monkey ? monkeyList : NULL ); diff --git a/lib/sbi/openapi/model/link.c b/lib/sbi/openapi/model/link.c index baa3b94ad..d696ae716 100644 --- a/lib/sbi/openapi/model/link.c +++ b/lib/sbi/openapi/model/link.c @@ -8,10 +8,9 @@ OpenAPI_link_t *OpenAPI_link_create( char *href ) { - OpenAPI_link_t *link_local_var = OpenAPI_malloc(sizeof(OpenAPI_link_t)); - if (!link_local_var) { - return NULL; - } + OpenAPI_link_t *link_local_var = ogs_malloc(sizeof(OpenAPI_link_t)); + ogs_assert(link_local_var); + link_local_var->href = href; return link_local_var; @@ -61,7 +60,7 @@ OpenAPI_link_t *OpenAPI_link_parseFromJSON(cJSON *linkJSON) } link_local_var = OpenAPI_link_create ( - href ? ogs_strdup_or_assert(href->valuestring) : NULL + href ? ogs_strdup(href->valuestring) : NULL ); return link_local_var; diff --git a/lib/sbi/openapi/model/links_value_schema.c b/lib/sbi/openapi/model/links_value_schema.c index c2c365a87..2a777be07 100644 --- a/lib/sbi/openapi/model/links_value_schema.c +++ b/lib/sbi/openapi/model/links_value_schema.c @@ -8,10 +8,9 @@ OpenAPI_links_value_schema_t *OpenAPI_links_value_schema_create( char *href ) { - OpenAPI_links_value_schema_t *links_value_schema_local_var = OpenAPI_malloc(sizeof(OpenAPI_links_value_schema_t)); - if (!links_value_schema_local_var) { - return NULL; - } + OpenAPI_links_value_schema_t *links_value_schema_local_var = ogs_malloc(sizeof(OpenAPI_links_value_schema_t)); + ogs_assert(links_value_schema_local_var); + links_value_schema_local_var->href = href; return links_value_schema_local_var; @@ -61,7 +60,7 @@ OpenAPI_links_value_schema_t *OpenAPI_links_value_schema_parseFromJSON(cJSON *li } links_value_schema_local_var = OpenAPI_links_value_schema_create ( - href ? ogs_strdup_or_assert(href->valuestring) : NULL + href ? ogs_strdup(href->valuestring) : NULL ); return links_value_schema_local_var; diff --git a/lib/sbi/openapi/model/lmf_info.c b/lib/sbi/openapi/model/lmf_info.c index 59ab88830..3dcfeff95 100644 --- a/lib/sbi/openapi/model/lmf_info.c +++ b/lib/sbi/openapi/model/lmf_info.c @@ -12,10 +12,9 @@ OpenAPI_lmf_info_t *OpenAPI_lmf_info_create( OpenAPI_list_t *serving_rat_types ) { - OpenAPI_lmf_info_t *lmf_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_lmf_info_t)); - if (!lmf_info_local_var) { - return NULL; - } + OpenAPI_lmf_info_t *lmf_info_local_var = ogs_malloc(sizeof(OpenAPI_lmf_info_t)); + ogs_assert(lmf_info_local_var); + lmf_info_local_var->serving_client_types = serving_client_types; lmf_info_local_var->lmf_id = lmf_id; lmf_info_local_var->serving_access_types = serving_access_types; @@ -231,7 +230,7 @@ OpenAPI_lmf_info_t *OpenAPI_lmf_info_parseFromJSON(cJSON *lmf_infoJSON) lmf_info_local_var = OpenAPI_lmf_info_create ( serving_client_types ? serving_client_typesList : NULL, - lmf_id ? ogs_strdup_or_assert(lmf_id->valuestring) : NULL, + lmf_id ? ogs_strdup(lmf_id->valuestring) : NULL, serving_access_types ? serving_access_typesList : NULL, serving_an_node_types ? serving_an_node_typesList : NULL, serving_rat_types ? serving_rat_typesList : NULL diff --git a/lib/sbi/openapi/model/location_accuracy.c b/lib/sbi/openapi/model/location_accuracy.c index cb05af36c..5b3401fad 100644 --- a/lib/sbi/openapi/model/location_accuracy.c +++ b/lib/sbi/openapi/model/location_accuracy.c @@ -7,10 +7,9 @@ OpenAPI_location_accuracy_t *OpenAPI_location_accuracy_create( ) { - OpenAPI_location_accuracy_t *location_accuracy_local_var = OpenAPI_malloc(sizeof(OpenAPI_location_accuracy_t)); - if (!location_accuracy_local_var) { - return NULL; - } + OpenAPI_location_accuracy_t *location_accuracy_local_var = ogs_malloc(sizeof(OpenAPI_location_accuracy_t)); + ogs_assert(location_accuracy_local_var); + return location_accuracy_local_var; } diff --git a/lib/sbi/openapi/model/location_area.c b/lib/sbi/openapi/model/location_area.c index dbb7ff837..578af65a9 100644 --- a/lib/sbi/openapi/model/location_area.c +++ b/lib/sbi/openapi/model/location_area.c @@ -10,10 +10,9 @@ OpenAPI_location_area_t *OpenAPI_location_area_create( OpenAPI_network_area_info_t *nw_area_info ) { - OpenAPI_location_area_t *location_area_local_var = OpenAPI_malloc(sizeof(OpenAPI_location_area_t)); - if (!location_area_local_var) { - return NULL; - } + OpenAPI_location_area_t *location_area_local_var = ogs_malloc(sizeof(OpenAPI_location_area_t)); + ogs_assert(location_area_local_var); + location_area_local_var->geographic_areas = geographic_areas; location_area_local_var->civic_addresses = civic_addresses; location_area_local_var->nw_area_info = nw_area_info; diff --git a/lib/sbi/openapi/model/location_area_1.c b/lib/sbi/openapi/model/location_area_1.c index b603439fb..6be013207 100644 --- a/lib/sbi/openapi/model/location_area_1.c +++ b/lib/sbi/openapi/model/location_area_1.c @@ -10,10 +10,9 @@ OpenAPI_location_area_1_t *OpenAPI_location_area_1_create( OpenAPI_network_area_info_1_t *nw_area_info ) { - OpenAPI_location_area_1_t *location_area_1_local_var = OpenAPI_malloc(sizeof(OpenAPI_location_area_1_t)); - if (!location_area_1_local_var) { - return NULL; - } + OpenAPI_location_area_1_t *location_area_1_local_var = ogs_malloc(sizeof(OpenAPI_location_area_1_t)); + ogs_assert(location_area_1_local_var); + location_area_1_local_var->geographic_areas = geographic_areas; location_area_1_local_var->civic_addresses = civic_addresses; location_area_1_local_var->nw_area_info = nw_area_info; diff --git a/lib/sbi/openapi/model/location_filter.c b/lib/sbi/openapi/model/location_filter.c index d59c06032..195566415 100644 --- a/lib/sbi/openapi/model/location_filter.c +++ b/lib/sbi/openapi/model/location_filter.c @@ -7,10 +7,9 @@ OpenAPI_location_filter_t *OpenAPI_location_filter_create( ) { - OpenAPI_location_filter_t *location_filter_local_var = OpenAPI_malloc(sizeof(OpenAPI_location_filter_t)); - if (!location_filter_local_var) { - return NULL; - } + OpenAPI_location_filter_t *location_filter_local_var = ogs_malloc(sizeof(OpenAPI_location_filter_t)); + ogs_assert(location_filter_local_var); + return location_filter_local_var; } diff --git a/lib/sbi/openapi/model/location_info.c b/lib/sbi/openapi/model/location_info.c index 9cea7b85e..c46b07921 100644 --- a/lib/sbi/openapi/model/location_info.c +++ b/lib/sbi/openapi/model/location_info.c @@ -11,10 +11,9 @@ OpenAPI_location_info_t *OpenAPI_location_info_create( char *supported_features ) { - OpenAPI_location_info_t *location_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_location_info_t)); - if (!location_info_local_var) { - return NULL; - } + OpenAPI_location_info_t *location_info_local_var = ogs_malloc(sizeof(OpenAPI_location_info_t)); + ogs_assert(location_info_local_var); + location_info_local_var->supi = supi; location_info_local_var->gpsi = gpsi; location_info_local_var->registration_location_info_list = registration_location_info_list; @@ -148,10 +147,10 @@ OpenAPI_location_info_t *OpenAPI_location_info_parseFromJSON(cJSON *location_inf } location_info_local_var = OpenAPI_location_info_create ( - supi ? ogs_strdup_or_assert(supi->valuestring) : NULL, - gpsi ? ogs_strdup_or_assert(gpsi->valuestring) : NULL, + supi ? ogs_strdup(supi->valuestring) : NULL, + gpsi ? ogs_strdup(gpsi->valuestring) : NULL, registration_location_info_listList, - supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL + supported_features ? ogs_strdup(supported_features->valuestring) : NULL ); return location_info_local_var; diff --git a/lib/sbi/openapi/model/location_reporting_configuration.c b/lib/sbi/openapi/model/location_reporting_configuration.c index 2c32a8ee1..5660ad2c4 100644 --- a/lib/sbi/openapi/model/location_reporting_configuration.c +++ b/lib/sbi/openapi/model/location_reporting_configuration.c @@ -12,10 +12,9 @@ OpenAPI_location_reporting_configuration_t *OpenAPI_location_reporting_configura OpenAPI_location_accuracy_t *n3gpp_accuracy ) { - OpenAPI_location_reporting_configuration_t *location_reporting_configuration_local_var = OpenAPI_malloc(sizeof(OpenAPI_location_reporting_configuration_t)); - if (!location_reporting_configuration_local_var) { - return NULL; - } + OpenAPI_location_reporting_configuration_t *location_reporting_configuration_local_var = ogs_malloc(sizeof(OpenAPI_location_reporting_configuration_t)); + ogs_assert(location_reporting_configuration_local_var); + location_reporting_configuration_local_var->current_location = current_location; location_reporting_configuration_local_var->is_one_time = is_one_time; location_reporting_configuration_local_var->one_time = one_time; diff --git a/lib/sbi/openapi/model/loss_connectivity_cfg.c b/lib/sbi/openapi/model/loss_connectivity_cfg.c index 3af3b5677..27aed3901 100644 --- a/lib/sbi/openapi/model/loss_connectivity_cfg.c +++ b/lib/sbi/openapi/model/loss_connectivity_cfg.c @@ -9,10 +9,9 @@ OpenAPI_loss_connectivity_cfg_t *OpenAPI_loss_connectivity_cfg_create( int max_detection_time ) { - OpenAPI_loss_connectivity_cfg_t *loss_connectivity_cfg_local_var = OpenAPI_malloc(sizeof(OpenAPI_loss_connectivity_cfg_t)); - if (!loss_connectivity_cfg_local_var) { - return NULL; - } + OpenAPI_loss_connectivity_cfg_t *loss_connectivity_cfg_local_var = ogs_malloc(sizeof(OpenAPI_loss_connectivity_cfg_t)); + ogs_assert(loss_connectivity_cfg_local_var); + loss_connectivity_cfg_local_var->is_max_detection_time = is_max_detection_time; loss_connectivity_cfg_local_var->max_detection_time = max_detection_time; diff --git a/lib/sbi/openapi/model/lpi.c b/lib/sbi/openapi/model/lpi.c index 2196f333e..b3a2e30a2 100644 --- a/lib/sbi/openapi/model/lpi.c +++ b/lib/sbi/openapi/model/lpi.c @@ -9,10 +9,9 @@ OpenAPI_lpi_t *OpenAPI_lpi_create( OpenAPI_valid_time_period_t *valid_time_period ) { - OpenAPI_lpi_t *lpi_local_var = OpenAPI_malloc(sizeof(OpenAPI_lpi_t)); - if (!lpi_local_var) { - return NULL; - } + OpenAPI_lpi_t *lpi_local_var = ogs_malloc(sizeof(OpenAPI_lpi_t)); + ogs_assert(lpi_local_var); + lpi_local_var->location_privacy_ind = location_privacy_ind; lpi_local_var->valid_time_period = valid_time_period; diff --git a/lib/sbi/openapi/model/lpi_1.c b/lib/sbi/openapi/model/lpi_1.c index 855075d97..775ffc856 100644 --- a/lib/sbi/openapi/model/lpi_1.c +++ b/lib/sbi/openapi/model/lpi_1.c @@ -9,10 +9,9 @@ OpenAPI_lpi_1_t *OpenAPI_lpi_1_create( OpenAPI_valid_time_period_1_t *valid_time_period ) { - OpenAPI_lpi_1_t *lpi_1_local_var = OpenAPI_malloc(sizeof(OpenAPI_lpi_1_t)); - if (!lpi_1_local_var) { - return NULL; - } + OpenAPI_lpi_1_t *lpi_1_local_var = ogs_malloc(sizeof(OpenAPI_lpi_1_t)); + ogs_assert(lpi_1_local_var); + lpi_1_local_var->location_privacy_ind = location_privacy_ind; lpi_1_local_var->valid_time_period = valid_time_period; diff --git a/lib/sbi/openapi/model/lte_m_ind.c b/lib/sbi/openapi/model/lte_m_ind.c index bf191bc0b..a5dc0be19 100644 --- a/lib/sbi/openapi/model/lte_m_ind.c +++ b/lib/sbi/openapi/model/lte_m_ind.c @@ -8,10 +8,9 @@ OpenAPI_lte_m_ind_t *OpenAPI_lte_m_ind_create( int lte_cat_m_ind ) { - OpenAPI_lte_m_ind_t *lte_m_ind_local_var = OpenAPI_malloc(sizeof(OpenAPI_lte_m_ind_t)); - if (!lte_m_ind_local_var) { - return NULL; - } + OpenAPI_lte_m_ind_t *lte_m_ind_local_var = ogs_malloc(sizeof(OpenAPI_lte_m_ind_t)); + ogs_assert(lte_m_ind_local_var); + lte_m_ind_local_var->lte_cat_m_ind = lte_cat_m_ind; return lte_m_ind_local_var; diff --git a/lib/sbi/openapi/model/lte_v2x_auth.c b/lib/sbi/openapi/model/lte_v2x_auth.c index cf3caa4d4..822c6b72f 100644 --- a/lib/sbi/openapi/model/lte_v2x_auth.c +++ b/lib/sbi/openapi/model/lte_v2x_auth.c @@ -9,10 +9,9 @@ OpenAPI_lte_v2x_auth_t *OpenAPI_lte_v2x_auth_create( OpenAPI_ue_auth_e pedestrian_ue_auth ) { - OpenAPI_lte_v2x_auth_t *lte_v2x_auth_local_var = OpenAPI_malloc(sizeof(OpenAPI_lte_v2x_auth_t)); - if (!lte_v2x_auth_local_var) { - return NULL; - } + OpenAPI_lte_v2x_auth_t *lte_v2x_auth_local_var = ogs_malloc(sizeof(OpenAPI_lte_v2x_auth_t)); + ogs_assert(lte_v2x_auth_local_var); + lte_v2x_auth_local_var->vehicle_ue_auth = vehicle_ue_auth; lte_v2x_auth_local_var->pedestrian_ue_auth = pedestrian_ue_auth; diff --git a/lib/sbi/openapi/model/lte_v2x_auth_1.c b/lib/sbi/openapi/model/lte_v2x_auth_1.c index 72718dcee..88f1a8700 100644 --- a/lib/sbi/openapi/model/lte_v2x_auth_1.c +++ b/lib/sbi/openapi/model/lte_v2x_auth_1.c @@ -9,10 +9,9 @@ OpenAPI_lte_v2x_auth_1_t *OpenAPI_lte_v2x_auth_1_create( OpenAPI_ue_auth_e pedestrian_ue_auth ) { - OpenAPI_lte_v2x_auth_1_t *lte_v2x_auth_1_local_var = OpenAPI_malloc(sizeof(OpenAPI_lte_v2x_auth_1_t)); - if (!lte_v2x_auth_1_local_var) { - return NULL; - } + OpenAPI_lte_v2x_auth_1_t *lte_v2x_auth_1_local_var = ogs_malloc(sizeof(OpenAPI_lte_v2x_auth_1_t)); + ogs_assert(lte_v2x_auth_1_local_var); + lte_v2x_auth_1_local_var->vehicle_ue_auth = vehicle_ue_auth; lte_v2x_auth_1_local_var->pedestrian_ue_auth = pedestrian_ue_auth; diff --git a/lib/sbi/openapi/model/mapping_of_snssai.c b/lib/sbi/openapi/model/mapping_of_snssai.c index 5cecb1bff..484b2cd20 100644 --- a/lib/sbi/openapi/model/mapping_of_snssai.c +++ b/lib/sbi/openapi/model/mapping_of_snssai.c @@ -9,10 +9,9 @@ OpenAPI_mapping_of_snssai_t *OpenAPI_mapping_of_snssai_create( OpenAPI_snssai_t *home_snssai ) { - OpenAPI_mapping_of_snssai_t *mapping_of_snssai_local_var = OpenAPI_malloc(sizeof(OpenAPI_mapping_of_snssai_t)); - if (!mapping_of_snssai_local_var) { - return NULL; - } + OpenAPI_mapping_of_snssai_t *mapping_of_snssai_local_var = ogs_malloc(sizeof(OpenAPI_mapping_of_snssai_t)); + ogs_assert(mapping_of_snssai_local_var); + mapping_of_snssai_local_var->serving_snssai = serving_snssai; mapping_of_snssai_local_var->home_snssai = home_snssai; diff --git a/lib/sbi/openapi/model/mbsfn_area.c b/lib/sbi/openapi/model/mbsfn_area.c index f0faa35c3..d3b3243f4 100644 --- a/lib/sbi/openapi/model/mbsfn_area.c +++ b/lib/sbi/openapi/model/mbsfn_area.c @@ -11,10 +11,9 @@ OpenAPI_mbsfn_area_t *OpenAPI_mbsfn_area_create( int carrier_frequency ) { - OpenAPI_mbsfn_area_t *mbsfn_area_local_var = OpenAPI_malloc(sizeof(OpenAPI_mbsfn_area_t)); - if (!mbsfn_area_local_var) { - return NULL; - } + OpenAPI_mbsfn_area_t *mbsfn_area_local_var = ogs_malloc(sizeof(OpenAPI_mbsfn_area_t)); + ogs_assert(mbsfn_area_local_var); + mbsfn_area_local_var->is_mbsfn_area_id = is_mbsfn_area_id; mbsfn_area_local_var->mbsfn_area_id = mbsfn_area_id; mbsfn_area_local_var->is_carrier_frequency = is_carrier_frequency; diff --git a/lib/sbi/openapi/model/mdt_configuration.c b/lib/sbi/openapi/model/mdt_configuration.c index 7c8b20bed..2e4a683d2 100644 --- a/lib/sbi/openapi/model/mdt_configuration.c +++ b/lib/sbi/openapi/model/mdt_configuration.c @@ -38,10 +38,9 @@ OpenAPI_mdt_configuration_t *OpenAPI_mdt_configuration_create( OpenAPI_list_t *inter_freq_target_list ) { - OpenAPI_mdt_configuration_t *mdt_configuration_local_var = OpenAPI_malloc(sizeof(OpenAPI_mdt_configuration_t)); - if (!mdt_configuration_local_var) { - return NULL; - } + OpenAPI_mdt_configuration_t *mdt_configuration_local_var = ogs_malloc(sizeof(OpenAPI_mdt_configuration_t)); + ogs_assert(mdt_configuration_local_var); + mdt_configuration_local_var->job_type = job_type; mdt_configuration_local_var->report_type = report_type; mdt_configuration_local_var->area_scope = area_scope; diff --git a/lib/sbi/openapi/model/mdt_configuration_1.c b/lib/sbi/openapi/model/mdt_configuration_1.c index 79c26e323..afae5f1df 100644 --- a/lib/sbi/openapi/model/mdt_configuration_1.c +++ b/lib/sbi/openapi/model/mdt_configuration_1.c @@ -38,10 +38,9 @@ OpenAPI_mdt_configuration_1_t *OpenAPI_mdt_configuration_1_create( OpenAPI_list_t *inter_freq_target_list ) { - OpenAPI_mdt_configuration_1_t *mdt_configuration_1_local_var = OpenAPI_malloc(sizeof(OpenAPI_mdt_configuration_1_t)); - if (!mdt_configuration_1_local_var) { - return NULL; - } + OpenAPI_mdt_configuration_1_t *mdt_configuration_1_local_var = ogs_malloc(sizeof(OpenAPI_mdt_configuration_1_t)); + ogs_assert(mdt_configuration_1_local_var); + mdt_configuration_1_local_var->job_type = job_type; mdt_configuration_1_local_var->report_type = report_type; mdt_configuration_1_local_var->area_scope = area_scope; diff --git a/lib/sbi/openapi/model/media_component.c b/lib/sbi/openapi/model/media_component.c index c92bf12dd..d19459ed2 100644 --- a/lib/sbi/openapi/model/media_component.c +++ b/lib/sbi/openapi/model/media_component.c @@ -50,10 +50,9 @@ OpenAPI_media_component_t *OpenAPI_media_component_create( OpenAPI_tscai_input_container_t *tscai_input_ul ) { - OpenAPI_media_component_t *media_component_local_var = OpenAPI_malloc(sizeof(OpenAPI_media_component_t)); - if (!media_component_local_var) { - return NULL; - } + OpenAPI_media_component_t *media_component_local_var = ogs_malloc(sizeof(OpenAPI_media_component_t)); + ogs_assert(media_component_local_var); + media_component_local_var->af_app_id = af_app_id; media_component_local_var->af_rout_req = af_rout_req; media_component_local_var->qos_reference = qos_reference; @@ -125,6 +124,7 @@ void OpenAPI_media_component_free(OpenAPI_media_component_t *media_component) ogs_free(media_component->max_supp_bw_ul); OpenAPI_list_for_each(media_component->med_sub_comps, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_media_sub_component_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -509,7 +509,7 @@ OpenAPI_media_component_t *OpenAPI_media_component_parseFromJSON(cJSON *media_co ogs_error("OpenAPI_media_component_parseFromJSON() failed [alt_ser_reqs]"); goto end; } - OpenAPI_list_add(alt_ser_reqsList , ogs_strdup_or_assert(alt_ser_reqs_local->valuestring)); + OpenAPI_list_add(alt_ser_reqsList , ogs_strdup(alt_ser_reqs_local->valuestring)); } } @@ -538,7 +538,7 @@ OpenAPI_media_component_t *OpenAPI_media_component_parseFromJSON(cJSON *media_co ogs_error("OpenAPI_media_component_parseFromJSON() failed [codecs]"); goto end; } - OpenAPI_list_add(codecsList , ogs_strdup_or_assert(codecs_local->valuestring)); + OpenAPI_list_add(codecsList , ogs_strdup(codecs_local->valuestring)); } } @@ -660,9 +660,9 @@ OpenAPI_media_component_t *OpenAPI_media_component_parseFromJSON(cJSON *media_co cJSON *localMapObject = med_sub_comps_local_map; if (cJSON_IsObject(med_sub_comps_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_media_sub_component_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_media_sub_component_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(med_sub_comps_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_media_component_parseFromJSON() failed [med_sub_comps]"); goto end; @@ -820,9 +820,9 @@ OpenAPI_media_component_t *OpenAPI_media_component_parseFromJSON(cJSON *media_co } media_component_local_var = OpenAPI_media_component_create ( - af_app_id ? ogs_strdup_or_assert(af_app_id->valuestring) : NULL, + af_app_id ? ogs_strdup(af_app_id->valuestring) : NULL, af_rout_req ? af_rout_req_local_nonprim : NULL, - qos_reference ? ogs_strdup_or_assert(qos_reference->valuestring) : NULL, + qos_reference ? ogs_strdup(qos_reference->valuestring) : NULL, dis_ue_notif ? true : false, dis_ue_notif ? dis_ue_notif->valueint : 0, alt_ser_reqs ? alt_ser_reqsList : NULL, @@ -833,30 +833,30 @@ OpenAPI_media_component_t *OpenAPI_media_component_parseFromJSON(cJSON *media_co des_max_latency ? des_max_latency->valuedouble : 0, des_max_loss ? true : false, des_max_loss ? des_max_loss->valuedouble : 0, - flus_id ? ogs_strdup_or_assert(flus_id->valuestring) : NULL, + flus_id ? ogs_strdup(flus_id->valuestring) : NULL, f_status ? f_statusVariable : 0, - mar_bw_dl ? ogs_strdup_or_assert(mar_bw_dl->valuestring) : NULL, - mar_bw_ul ? ogs_strdup_or_assert(mar_bw_ul->valuestring) : NULL, + mar_bw_dl ? ogs_strdup(mar_bw_dl->valuestring) : NULL, + mar_bw_ul ? ogs_strdup(mar_bw_ul->valuestring) : NULL, max_packet_loss_rate_dl ? true : false, max_packet_loss_rate_dl ? max_packet_loss_rate_dl->valuedouble : 0, max_packet_loss_rate_ul ? true : false, max_packet_loss_rate_ul ? max_packet_loss_rate_ul->valuedouble : 0, - max_supp_bw_dl ? ogs_strdup_or_assert(max_supp_bw_dl->valuestring) : NULL, - max_supp_bw_ul ? ogs_strdup_or_assert(max_supp_bw_ul->valuestring) : NULL, + max_supp_bw_dl ? ogs_strdup(max_supp_bw_dl->valuestring) : NULL, + max_supp_bw_ul ? ogs_strdup(max_supp_bw_ul->valuestring) : NULL, med_comp_n->valuedouble, med_sub_comps ? med_sub_compsList : NULL, med_type ? med_typeVariable : 0, - min_des_bw_dl ? ogs_strdup_or_assert(min_des_bw_dl->valuestring) : NULL, - min_des_bw_ul ? ogs_strdup_or_assert(min_des_bw_ul->valuestring) : NULL, - mir_bw_dl ? ogs_strdup_or_assert(mir_bw_dl->valuestring) : NULL, - mir_bw_ul ? ogs_strdup_or_assert(mir_bw_ul->valuestring) : NULL, + min_des_bw_dl ? ogs_strdup(min_des_bw_dl->valuestring) : NULL, + min_des_bw_ul ? ogs_strdup(min_des_bw_ul->valuestring) : NULL, + mir_bw_dl ? ogs_strdup(mir_bw_dl->valuestring) : NULL, + mir_bw_ul ? ogs_strdup(mir_bw_ul->valuestring) : NULL, preempt_cap ? preempt_capVariable : 0, preempt_vuln ? preempt_vulnVariable : 0, prio_sharing_ind ? prio_sharing_indVariable : 0, res_prio ? res_prioVariable : 0, - rr_bw ? ogs_strdup_or_assert(rr_bw->valuestring) : NULL, - rs_bw ? ogs_strdup_or_assert(rs_bw->valuestring) : NULL, + rr_bw ? ogs_strdup(rr_bw->valuestring) : NULL, + rs_bw ? ogs_strdup(rs_bw->valuestring) : NULL, sharing_key_dl ? true : false, sharing_key_dl ? sharing_key_dl->valuedouble : 0, sharing_key_ul ? true : false, diff --git a/lib/sbi/openapi/model/media_component_rm.c b/lib/sbi/openapi/model/media_component_rm.c index d4578221a..8ea35e586 100644 --- a/lib/sbi/openapi/model/media_component_rm.c +++ b/lib/sbi/openapi/model/media_component_rm.c @@ -50,10 +50,9 @@ OpenAPI_media_component_rm_t *OpenAPI_media_component_rm_create( OpenAPI_tscai_input_container_t *tscai_input_ul ) { - OpenAPI_media_component_rm_t *media_component_rm_local_var = OpenAPI_malloc(sizeof(OpenAPI_media_component_rm_t)); - if (!media_component_rm_local_var) { - return NULL; - } + OpenAPI_media_component_rm_t *media_component_rm_local_var = ogs_malloc(sizeof(OpenAPI_media_component_rm_t)); + ogs_assert(media_component_rm_local_var); + media_component_rm_local_var->af_app_id = af_app_id; media_component_rm_local_var->af_rout_req = af_rout_req; media_component_rm_local_var->qos_reference = qos_reference; @@ -125,6 +124,7 @@ void OpenAPI_media_component_rm_free(OpenAPI_media_component_rm_t *media_compone ogs_free(media_component_rm->max_supp_bw_ul); OpenAPI_list_for_each(media_component_rm->med_sub_comps, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_media_sub_component_rm_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -514,7 +514,7 @@ OpenAPI_media_component_rm_t *OpenAPI_media_component_rm_parseFromJSON(cJSON *me ogs_error("OpenAPI_media_component_rm_parseFromJSON() failed [alt_ser_reqs]"); goto end; } - OpenAPI_list_add(alt_ser_reqsList , ogs_strdup_or_assert(alt_ser_reqs_local->valuestring)); + OpenAPI_list_add(alt_ser_reqsList , ogs_strdup(alt_ser_reqs_local->valuestring)); } } @@ -552,7 +552,7 @@ OpenAPI_media_component_rm_t *OpenAPI_media_component_rm_parseFromJSON(cJSON *me ogs_error("OpenAPI_media_component_rm_parseFromJSON() failed [codecs]"); goto end; } - OpenAPI_list_add(codecsList , ogs_strdup_or_assert(codecs_local->valuestring)); + OpenAPI_list_add(codecsList , ogs_strdup(codecs_local->valuestring)); } } @@ -674,9 +674,9 @@ OpenAPI_media_component_rm_t *OpenAPI_media_component_rm_parseFromJSON(cJSON *me cJSON *localMapObject = med_sub_comps_local_map; if (cJSON_IsObject(med_sub_comps_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_media_sub_component_rm_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_media_sub_component_rm_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(med_sub_comps_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_media_component_rm_parseFromJSON() failed [med_sub_comps]"); goto end; @@ -826,9 +826,9 @@ OpenAPI_media_component_rm_t *OpenAPI_media_component_rm_parseFromJSON(cJSON *me } media_component_rm_local_var = OpenAPI_media_component_rm_create ( - af_app_id ? ogs_strdup_or_assert(af_app_id->valuestring) : NULL, + af_app_id ? ogs_strdup(af_app_id->valuestring) : NULL, af_rout_req ? af_rout_req_local_nonprim : NULL, - qos_reference ? ogs_strdup_or_assert(qos_reference->valuestring) : NULL, + qos_reference ? ogs_strdup(qos_reference->valuestring) : NULL, alt_ser_reqs ? alt_ser_reqsList : NULL, dis_ue_notif ? true : false, dis_ue_notif ? dis_ue_notif->valueint : 0, @@ -839,30 +839,30 @@ OpenAPI_media_component_rm_t *OpenAPI_media_component_rm_parseFromJSON(cJSON *me des_max_latency ? des_max_latency->valuedouble : 0, des_max_loss ? true : false, des_max_loss ? des_max_loss->valuedouble : 0, - flus_id ? ogs_strdup_or_assert(flus_id->valuestring) : NULL, + flus_id ? ogs_strdup(flus_id->valuestring) : NULL, f_status ? f_statusVariable : 0, - mar_bw_dl ? ogs_strdup_or_assert(mar_bw_dl->valuestring) : NULL, - mar_bw_ul ? ogs_strdup_or_assert(mar_bw_ul->valuestring) : NULL, + mar_bw_dl ? ogs_strdup(mar_bw_dl->valuestring) : NULL, + mar_bw_ul ? ogs_strdup(mar_bw_ul->valuestring) : NULL, max_packet_loss_rate_dl ? true : false, max_packet_loss_rate_dl ? max_packet_loss_rate_dl->valuedouble : 0, max_packet_loss_rate_ul ? true : false, max_packet_loss_rate_ul ? max_packet_loss_rate_ul->valuedouble : 0, - max_supp_bw_dl ? ogs_strdup_or_assert(max_supp_bw_dl->valuestring) : NULL, - max_supp_bw_ul ? ogs_strdup_or_assert(max_supp_bw_ul->valuestring) : NULL, + max_supp_bw_dl ? ogs_strdup(max_supp_bw_dl->valuestring) : NULL, + max_supp_bw_ul ? ogs_strdup(max_supp_bw_ul->valuestring) : NULL, med_comp_n->valuedouble, med_sub_comps ? med_sub_compsList : NULL, med_type ? med_typeVariable : 0, - min_des_bw_dl ? ogs_strdup_or_assert(min_des_bw_dl->valuestring) : NULL, - min_des_bw_ul ? ogs_strdup_or_assert(min_des_bw_ul->valuestring) : NULL, - mir_bw_dl ? ogs_strdup_or_assert(mir_bw_dl->valuestring) : NULL, - mir_bw_ul ? ogs_strdup_or_assert(mir_bw_ul->valuestring) : NULL, + min_des_bw_dl ? ogs_strdup(min_des_bw_dl->valuestring) : NULL, + min_des_bw_ul ? ogs_strdup(min_des_bw_ul->valuestring) : NULL, + mir_bw_dl ? ogs_strdup(mir_bw_dl->valuestring) : NULL, + mir_bw_ul ? ogs_strdup(mir_bw_ul->valuestring) : NULL, preempt_cap ? preempt_cap_local_nonprim : NULL, preempt_vuln ? preempt_vuln_local_nonprim : NULL, prio_sharing_ind ? prio_sharing_indVariable : 0, res_prio ? res_prioVariable : 0, - rr_bw ? ogs_strdup_or_assert(rr_bw->valuestring) : NULL, - rs_bw ? ogs_strdup_or_assert(rs_bw->valuestring) : NULL, + rr_bw ? ogs_strdup(rr_bw->valuestring) : NULL, + rs_bw ? ogs_strdup(rs_bw->valuestring) : NULL, sharing_key_dl ? true : false, sharing_key_dl ? sharing_key_dl->valuedouble : 0, sharing_key_ul ? true : false, diff --git a/lib/sbi/openapi/model/media_sub_component.c b/lib/sbi/openapi/model/media_sub_component.c index e8f0a05b3..66b9554d4 100644 --- a/lib/sbi/openapi/model/media_sub_component.c +++ b/lib/sbi/openapi/model/media_sub_component.c @@ -16,10 +16,9 @@ OpenAPI_media_sub_component_t *OpenAPI_media_sub_component_create( OpenAPI_flow_usage_e flow_usage ) { - OpenAPI_media_sub_component_t *media_sub_component_local_var = OpenAPI_malloc(sizeof(OpenAPI_media_sub_component_t)); - if (!media_sub_component_local_var) { - return NULL; - } + OpenAPI_media_sub_component_t *media_sub_component_local_var = ogs_malloc(sizeof(OpenAPI_media_sub_component_t)); + ogs_assert(media_sub_component_local_var); + media_sub_component_local_var->af_sig_protocol = af_sig_protocol; media_sub_component_local_var->ethf_descs = ethf_descs; media_sub_component_local_var->f_num = f_num; @@ -214,7 +213,7 @@ OpenAPI_media_sub_component_t *OpenAPI_media_sub_component_parseFromJSON(cJSON * ogs_error("OpenAPI_media_sub_component_parseFromJSON() failed [f_descs]"); goto end; } - OpenAPI_list_add(f_descsList , ogs_strdup_or_assert(f_descs_local->valuestring)); + OpenAPI_list_add(f_descsList , ogs_strdup(f_descs_local->valuestring)); } } @@ -274,9 +273,9 @@ OpenAPI_media_sub_component_t *OpenAPI_media_sub_component_parseFromJSON(cJSON * f_num->valuedouble, f_descs ? f_descsList : NULL, f_status ? f_statusVariable : 0, - mar_bw_dl ? ogs_strdup_or_assert(mar_bw_dl->valuestring) : NULL, - mar_bw_ul ? ogs_strdup_or_assert(mar_bw_ul->valuestring) : NULL, - tos_tr_cl ? ogs_strdup_or_assert(tos_tr_cl->valuestring) : NULL, + mar_bw_dl ? ogs_strdup(mar_bw_dl->valuestring) : NULL, + mar_bw_ul ? ogs_strdup(mar_bw_ul->valuestring) : NULL, + tos_tr_cl ? ogs_strdup(tos_tr_cl->valuestring) : NULL, flow_usage ? flow_usageVariable : 0 ); diff --git a/lib/sbi/openapi/model/media_sub_component_rm.c b/lib/sbi/openapi/model/media_sub_component_rm.c index 733ebb0df..da4a62330 100644 --- a/lib/sbi/openapi/model/media_sub_component_rm.c +++ b/lib/sbi/openapi/model/media_sub_component_rm.c @@ -16,10 +16,9 @@ OpenAPI_media_sub_component_rm_t *OpenAPI_media_sub_component_rm_create( OpenAPI_flow_usage_e flow_usage ) { - OpenAPI_media_sub_component_rm_t *media_sub_component_rm_local_var = OpenAPI_malloc(sizeof(OpenAPI_media_sub_component_rm_t)); - if (!media_sub_component_rm_local_var) { - return NULL; - } + OpenAPI_media_sub_component_rm_t *media_sub_component_rm_local_var = ogs_malloc(sizeof(OpenAPI_media_sub_component_rm_t)); + ogs_assert(media_sub_component_rm_local_var); + media_sub_component_rm_local_var->af_sig_protocol = af_sig_protocol; media_sub_component_rm_local_var->ethf_descs = ethf_descs; media_sub_component_rm_local_var->f_num = f_num; @@ -214,7 +213,7 @@ OpenAPI_media_sub_component_rm_t *OpenAPI_media_sub_component_rm_parseFromJSON(c ogs_error("OpenAPI_media_sub_component_rm_parseFromJSON() failed [f_descs]"); goto end; } - OpenAPI_list_add(f_descsList , ogs_strdup_or_assert(f_descs_local->valuestring)); + OpenAPI_list_add(f_descsList , ogs_strdup(f_descs_local->valuestring)); } } @@ -274,9 +273,9 @@ OpenAPI_media_sub_component_rm_t *OpenAPI_media_sub_component_rm_parseFromJSON(c f_num->valuedouble, f_descs ? f_descsList : NULL, f_status ? f_statusVariable : 0, - mar_bw_dl ? ogs_strdup_or_assert(mar_bw_dl->valuestring) : NULL, - mar_bw_ul ? ogs_strdup_or_assert(mar_bw_ul->valuestring) : NULL, - tos_tr_cl ? ogs_strdup_or_assert(tos_tr_cl->valuestring) : NULL, + mar_bw_dl ? ogs_strdup(mar_bw_dl->valuestring) : NULL, + mar_bw_ul ? ogs_strdup(mar_bw_ul->valuestring) : NULL, + tos_tr_cl ? ogs_strdup(tos_tr_cl->valuestring) : NULL, flow_usage ? flow_usageVariable : 0 ); diff --git a/lib/sbi/openapi/model/message_waiting_data.c b/lib/sbi/openapi/model/message_waiting_data.c index c9b5596ad..e123b91ca 100644 --- a/lib/sbi/openapi/model/message_waiting_data.c +++ b/lib/sbi/openapi/model/message_waiting_data.c @@ -8,10 +8,9 @@ OpenAPI_message_waiting_data_t *OpenAPI_message_waiting_data_create( OpenAPI_list_t *mwd_list ) { - OpenAPI_message_waiting_data_t *message_waiting_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_message_waiting_data_t)); - if (!message_waiting_data_local_var) { - return NULL; - } + OpenAPI_message_waiting_data_t *message_waiting_data_local_var = ogs_malloc(sizeof(OpenAPI_message_waiting_data_t)); + ogs_assert(message_waiting_data_local_var); + message_waiting_data_local_var->mwd_list = mwd_list; return message_waiting_data_local_var; diff --git a/lib/sbi/openapi/model/mm_context.c b/lib/sbi/openapi/model/mm_context.c index 47b66d203..c320a8f22 100644 --- a/lib/sbi/openapi/model/mm_context.c +++ b/lib/sbi/openapi/model/mm_context.c @@ -32,10 +32,9 @@ OpenAPI_mm_context_t *OpenAPI_mm_context_create( OpenAPI_list_t *pending_nssai_mapping_list ) { - OpenAPI_mm_context_t *mm_context_local_var = OpenAPI_malloc(sizeof(OpenAPI_mm_context_t)); - if (!mm_context_local_var) { - return NULL; - } + OpenAPI_mm_context_t *mm_context_local_var = ogs_malloc(sizeof(OpenAPI_mm_context_t)); + ogs_assert(mm_context_local_var); + mm_context_local_var->access_type = access_type; mm_context_local_var->nas_security_mode = nas_security_mode; mm_context_local_var->eps_nas_security_mode = eps_nas_security_mode; @@ -539,7 +538,7 @@ OpenAPI_mm_context_t *OpenAPI_mm_context_parseFromJSON(cJSON *mm_contextJSON) ogs_error("OpenAPI_mm_context_parseFromJSON() failed [ns_instance_list]"); goto end; } - OpenAPI_list_add(ns_instance_listList , ogs_strdup_or_assert(ns_instance_list_local->valuestring)); + OpenAPI_list_add(ns_instance_listList , ogs_strdup(ns_instance_list_local->valuestring)); } } @@ -678,7 +677,7 @@ OpenAPI_mm_context_t *OpenAPI_mm_context_parseFromJSON(cJSON *mm_contextJSON) ue_differentiation_info ? ue_differentiation_info_local_nonprim : NULL, plmn_assi_ue_radio_cap_id ? plmn_assi_ue_radio_cap_id->valueint : 0, man_assi_ue_radio_cap_id ? man_assi_ue_radio_cap_id->valueint : 0, - ucmf_dic_entry_id ? ogs_strdup_or_assert(ucmf_dic_entry_id->valuestring) : NULL, + ucmf_dic_entry_id ? ogs_strdup(ucmf_dic_entry_id->valuestring) : NULL, n3_iwf_id ? n3_iwf_id_local_nonprim : NULL, wagf_id ? wagf_id_local_nonprim : NULL, tngf_id ? tngf_id_local_nonprim : NULL, diff --git a/lib/sbi/openapi/model/mme_capabilities.c b/lib/sbi/openapi/model/mme_capabilities.c index 14bac4391..3d41e9461 100644 --- a/lib/sbi/openapi/model/mme_capabilities.c +++ b/lib/sbi/openapi/model/mme_capabilities.c @@ -11,10 +11,9 @@ OpenAPI_mme_capabilities_t *OpenAPI_mme_capabilities_create( int ethernet_supported ) { - OpenAPI_mme_capabilities_t *mme_capabilities_local_var = OpenAPI_malloc(sizeof(OpenAPI_mme_capabilities_t)); - if (!mme_capabilities_local_var) { - return NULL; - } + OpenAPI_mme_capabilities_t *mme_capabilities_local_var = ogs_malloc(sizeof(OpenAPI_mme_capabilities_t)); + ogs_assert(mme_capabilities_local_var); + mme_capabilities_local_var->is_non_ip_supported = is_non_ip_supported; mme_capabilities_local_var->non_ip_supported = non_ip_supported; mme_capabilities_local_var->is_ethernet_supported = is_ethernet_supported; diff --git a/lib/sbi/openapi/model/mo_exp_data_counter.c b/lib/sbi/openapi/model/mo_exp_data_counter.c index cb809b97b..5083340d0 100644 --- a/lib/sbi/openapi/model/mo_exp_data_counter.c +++ b/lib/sbi/openapi/model/mo_exp_data_counter.c @@ -9,10 +9,9 @@ OpenAPI_mo_exp_data_counter_t *OpenAPI_mo_exp_data_counter_create( char *time_stamp ) { - OpenAPI_mo_exp_data_counter_t *mo_exp_data_counter_local_var = OpenAPI_malloc(sizeof(OpenAPI_mo_exp_data_counter_t)); - if (!mo_exp_data_counter_local_var) { - return NULL; - } + OpenAPI_mo_exp_data_counter_t *mo_exp_data_counter_local_var = ogs_malloc(sizeof(OpenAPI_mo_exp_data_counter_t)); + ogs_assert(mo_exp_data_counter_local_var); + mo_exp_data_counter_local_var->counter = counter; mo_exp_data_counter_local_var->time_stamp = time_stamp; @@ -81,7 +80,7 @@ OpenAPI_mo_exp_data_counter_t *OpenAPI_mo_exp_data_counter_parseFromJSON(cJSON * mo_exp_data_counter_local_var = OpenAPI_mo_exp_data_counter_create ( counter->valuedouble, - time_stamp ? ogs_strdup_or_assert(time_stamp->valuestring) : NULL + time_stamp ? ogs_strdup(time_stamp->valuestring) : NULL ); return mo_exp_data_counter_local_var; diff --git a/lib/sbi/openapi/model/model_5_gvn_group_configuration.c b/lib/sbi/openapi/model/model_5_gvn_group_configuration.c index d85d5cfb0..4f9c29ddc 100644 --- a/lib/sbi/openapi/model/model_5_gvn_group_configuration.c +++ b/lib/sbi/openapi/model/model_5_gvn_group_configuration.c @@ -14,10 +14,9 @@ OpenAPI_model_5_gvn_group_configuration_t *OpenAPI_model_5_gvn_group_configurati char *mtc_provider_information ) { - OpenAPI_model_5_gvn_group_configuration_t *model_5_gvn_group_configuration_local_var = OpenAPI_malloc(sizeof(OpenAPI_model_5_gvn_group_configuration_t)); - if (!model_5_gvn_group_configuration_local_var) { - return NULL; - } + OpenAPI_model_5_gvn_group_configuration_t *model_5_gvn_group_configuration_local_var = ogs_malloc(sizeof(OpenAPI_model_5_gvn_group_configuration_t)); + ogs_assert(model_5_gvn_group_configuration_local_var); + model_5_gvn_group_configuration_local_var->_5g_vn_group_data = _5g_vn_group_data; model_5_gvn_group_configuration_local_var->members = members; model_5_gvn_group_configuration_local_var->is_reference_id = is_reference_id; @@ -143,7 +142,7 @@ OpenAPI_model_5_gvn_group_configuration_t *OpenAPI_model_5_gvn_group_configurati ogs_error("OpenAPI_model_5_gvn_group_configuration_parseFromJSON() failed [members]"); goto end; } - OpenAPI_list_add(membersList , ogs_strdup_or_assert(members_local->valuestring)); + OpenAPI_list_add(membersList , ogs_strdup(members_local->valuestring)); } } @@ -188,9 +187,9 @@ OpenAPI_model_5_gvn_group_configuration_t *OpenAPI_model_5_gvn_group_configurati members ? membersList : NULL, reference_id ? true : false, reference_id ? reference_id->valuedouble : 0, - af_instance_id ? ogs_strdup_or_assert(af_instance_id->valuestring) : NULL, - internal_group_identifier ? ogs_strdup_or_assert(internal_group_identifier->valuestring) : NULL, - mtc_provider_information ? ogs_strdup_or_assert(mtc_provider_information->valuestring) : NULL + af_instance_id ? ogs_strdup(af_instance_id->valuestring) : NULL, + internal_group_identifier ? ogs_strdup(internal_group_identifier->valuestring) : NULL, + mtc_provider_information ? ogs_strdup(mtc_provider_information->valuestring) : NULL ); return model_5_gvn_group_configuration_local_var; diff --git a/lib/sbi/openapi/model/model_5_gvn_group_data.c b/lib/sbi/openapi/model/model_5_gvn_group_data.c index 6b17bac5c..617c35c50 100644 --- a/lib/sbi/openapi/model/model_5_gvn_group_data.c +++ b/lib/sbi/openapi/model/model_5_gvn_group_data.c @@ -14,10 +14,9 @@ OpenAPI_model_5_gvn_group_data_t *OpenAPI_model_5_gvn_group_data_create( OpenAPI_ip_address_1_t *dn_aaa_address ) { - OpenAPI_model_5_gvn_group_data_t *model_5_gvn_group_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_model_5_gvn_group_data_t)); - if (!model_5_gvn_group_data_local_var) { - return NULL; - } + OpenAPI_model_5_gvn_group_data_t *model_5_gvn_group_data_local_var = ogs_malloc(sizeof(OpenAPI_model_5_gvn_group_data_t)); + ogs_assert(model_5_gvn_group_data_local_var); + model_5_gvn_group_data_local_var->dnn = dnn; model_5_gvn_group_data_local_var->s_nssai = s_nssai; model_5_gvn_group_data_local_var->pdu_session_types = pdu_session_types; @@ -216,7 +215,7 @@ OpenAPI_model_5_gvn_group_data_t *OpenAPI_model_5_gvn_group_data_parseFromJSON(c } model_5_gvn_group_data_local_var = OpenAPI_model_5_gvn_group_data_create ( - ogs_strdup_or_assert(dnn->valuestring), + ogs_strdup(dnn->valuestring), s_nssai_local_nonprim, pdu_session_types ? pdu_session_typesList : NULL, app_descriptors ? app_descriptorsList : NULL, diff --git a/lib/sbi/openapi/model/modification_notification.c b/lib/sbi/openapi/model/modification_notification.c index b09d49fd3..fa1ffddb6 100644 --- a/lib/sbi/openapi/model/modification_notification.c +++ b/lib/sbi/openapi/model/modification_notification.c @@ -8,10 +8,9 @@ OpenAPI_modification_notification_t *OpenAPI_modification_notification_create( OpenAPI_list_t *notify_items ) { - OpenAPI_modification_notification_t *modification_notification_local_var = OpenAPI_malloc(sizeof(OpenAPI_modification_notification_t)); - if (!modification_notification_local_var) { - return NULL; - } + OpenAPI_modification_notification_t *modification_notification_local_var = ogs_malloc(sizeof(OpenAPI_modification_notification_t)); + ogs_assert(modification_notification_local_var); + modification_notification_local_var->notify_items = notify_items; return modification_notification_local_var; diff --git a/lib/sbi/openapi/model/monitoring_configuration.c b/lib/sbi/openapi/model/monitoring_configuration.c index a9a8cf392..c30cca673 100644 --- a/lib/sbi/openapi/model/monitoring_configuration.c +++ b/lib/sbi/openapi/model/monitoring_configuration.c @@ -24,10 +24,9 @@ OpenAPI_monitoring_configuration_t *OpenAPI_monitoring_configuration_create( char *af_id ) { - OpenAPI_monitoring_configuration_t *monitoring_configuration_local_var = OpenAPI_malloc(sizeof(OpenAPI_monitoring_configuration_t)); - if (!monitoring_configuration_local_var) { - return NULL; - } + OpenAPI_monitoring_configuration_t *monitoring_configuration_local_var = ogs_malloc(sizeof(OpenAPI_monitoring_configuration_t)); + ogs_assert(monitoring_configuration_local_var); + monitoring_configuration_local_var->event_type = event_type; monitoring_configuration_local_var->is_immediate_flag = is_immediate_flag; monitoring_configuration_local_var->immediate_flag = immediate_flag; @@ -336,8 +335,8 @@ OpenAPI_monitoring_configuration_t *OpenAPI_monitoring_configuration_parseFromJS suggested_packet_num_dl ? suggested_packet_num_dl->valuedouble : 0, pdu_session_status_cfg ? pdu_session_status_cfg_local_nonprim : NULL, reachability_for_sms_cfg ? reachability_for_sms_cfg_local_nonprim : NULL, - mtc_provider_information ? ogs_strdup_or_assert(mtc_provider_information->valuestring) : NULL, - af_id ? ogs_strdup_or_assert(af_id->valuestring) : NULL + mtc_provider_information ? ogs_strdup(mtc_provider_information->valuestring) : NULL, + af_id ? ogs_strdup(af_id->valuestring) : NULL ); return monitoring_configuration_local_var; diff --git a/lib/sbi/openapi/model/mtc_provider.c b/lib/sbi/openapi/model/mtc_provider.c index f07b399a5..356a931a7 100644 --- a/lib/sbi/openapi/model/mtc_provider.c +++ b/lib/sbi/openapi/model/mtc_provider.c @@ -9,10 +9,9 @@ OpenAPI_mtc_provider_t *OpenAPI_mtc_provider_create( char *af_id ) { - OpenAPI_mtc_provider_t *mtc_provider_local_var = OpenAPI_malloc(sizeof(OpenAPI_mtc_provider_t)); - if (!mtc_provider_local_var) { - return NULL; - } + OpenAPI_mtc_provider_t *mtc_provider_local_var = ogs_malloc(sizeof(OpenAPI_mtc_provider_t)); + ogs_assert(mtc_provider_local_var); + mtc_provider_local_var->mtc_provider_information = mtc_provider_information; mtc_provider_local_var->af_id = af_id; @@ -80,8 +79,8 @@ OpenAPI_mtc_provider_t *OpenAPI_mtc_provider_parseFromJSON(cJSON *mtc_providerJS } mtc_provider_local_var = OpenAPI_mtc_provider_create ( - mtc_provider_information ? ogs_strdup_or_assert(mtc_provider_information->valuestring) : NULL, - af_id ? ogs_strdup_or_assert(af_id->valuestring) : NULL + mtc_provider_information ? ogs_strdup(mtc_provider_information->valuestring) : NULL, + af_id ? ogs_strdup(af_id->valuestring) : NULL ); return mtc_provider_local_var; diff --git a/lib/sbi/openapi/model/multicast_access_control.c b/lib/sbi/openapi/model/multicast_access_control.c index 992e0dd50..3ac68ce41 100644 --- a/lib/sbi/openapi/model/multicast_access_control.c +++ b/lib/sbi/openapi/model/multicast_access_control.c @@ -12,10 +12,9 @@ OpenAPI_multicast_access_control_t *OpenAPI_multicast_access_control_create( OpenAPI_access_right_status_t *acc_status ) { - OpenAPI_multicast_access_control_t *multicast_access_control_local_var = OpenAPI_malloc(sizeof(OpenAPI_multicast_access_control_t)); - if (!multicast_access_control_local_var) { - return NULL; - } + OpenAPI_multicast_access_control_t *multicast_access_control_local_var = ogs_malloc(sizeof(OpenAPI_multicast_access_control_t)); + ogs_assert(multicast_access_control_local_var); + multicast_access_control_local_var->src_ipv4_addr = src_ipv4_addr; multicast_access_control_local_var->src_ipv6_addr = src_ipv6_addr; multicast_access_control_local_var->multicast_v4_addr = multicast_v4_addr; @@ -141,10 +140,10 @@ OpenAPI_multicast_access_control_t *OpenAPI_multicast_access_control_parseFromJS acc_status_local_nonprim = OpenAPI_access_right_status_parseFromJSON(acc_status); multicast_access_control_local_var = OpenAPI_multicast_access_control_create ( - src_ipv4_addr ? ogs_strdup_or_assert(src_ipv4_addr->valuestring) : NULL, - src_ipv6_addr ? ogs_strdup_or_assert(src_ipv6_addr->valuestring) : NULL, - multicast_v4_addr ? ogs_strdup_or_assert(multicast_v4_addr->valuestring) : NULL, - multicast_v6_addr ? ogs_strdup_or_assert(multicast_v6_addr->valuestring) : NULL, + src_ipv4_addr ? ogs_strdup(src_ipv4_addr->valuestring) : NULL, + src_ipv6_addr ? ogs_strdup(src_ipv6_addr->valuestring) : NULL, + multicast_v4_addr ? ogs_strdup(multicast_v4_addr->valuestring) : NULL, + multicast_v6_addr ? ogs_strdup(multicast_v6_addr->valuestring) : NULL, acc_status_local_nonprim ); diff --git a/lib/sbi/openapi/model/n1_message_container.c b/lib/sbi/openapi/model/n1_message_container.c index 4ca9bb8bd..6d62e67e7 100644 --- a/lib/sbi/openapi/model/n1_message_container.c +++ b/lib/sbi/openapi/model/n1_message_container.c @@ -11,10 +11,9 @@ OpenAPI_n1_message_container_t *OpenAPI_n1_message_container_create( char *service_instance_id ) { - OpenAPI_n1_message_container_t *n1_message_container_local_var = OpenAPI_malloc(sizeof(OpenAPI_n1_message_container_t)); - if (!n1_message_container_local_var) { - return NULL; - } + OpenAPI_n1_message_container_t *n1_message_container_local_var = ogs_malloc(sizeof(OpenAPI_n1_message_container_t)); + ogs_assert(n1_message_container_local_var); + n1_message_container_local_var->n1_message_class = n1_message_class; n1_message_container_local_var->n1_message_content = n1_message_content; n1_message_container_local_var->nf_id = nf_id; @@ -125,8 +124,8 @@ OpenAPI_n1_message_container_t *OpenAPI_n1_message_container_parseFromJSON(cJSON n1_message_container_local_var = OpenAPI_n1_message_container_create ( n1_message_classVariable, n1_message_content_local_nonprim, - nf_id ? ogs_strdup_or_assert(nf_id->valuestring) : NULL, - service_instance_id ? ogs_strdup_or_assert(service_instance_id->valuestring) : NULL + nf_id ? ogs_strdup(nf_id->valuestring) : NULL, + service_instance_id ? ogs_strdup(service_instance_id->valuestring) : NULL ); return n1_message_container_local_var; diff --git a/lib/sbi/openapi/model/n1_message_notification.c b/lib/sbi/openapi/model/n1_message_notification.c index 931118b03..be8700449 100644 --- a/lib/sbi/openapi/model/n1_message_notification.c +++ b/lib/sbi/openapi/model/n1_message_notification.c @@ -17,10 +17,9 @@ OpenAPI_n1_message_notification_t *OpenAPI_n1_message_notification_create( OpenAPI_ncgi_t *ncgi ) { - OpenAPI_n1_message_notification_t *n1_message_notification_local_var = OpenAPI_malloc(sizeof(OpenAPI_n1_message_notification_t)); - if (!n1_message_notification_local_var) { - return NULL; - } + OpenAPI_n1_message_notification_t *n1_message_notification_local_var = ogs_malloc(sizeof(OpenAPI_n1_message_notification_t)); + ogs_assert(n1_message_notification_local_var); + n1_message_notification_local_var->n1_notify_subscription_id = n1_notify_subscription_id; n1_message_notification_local_var->n1_message_container = n1_message_container; n1_message_notification_local_var->lcs_correlation_id = lcs_correlation_id; @@ -234,11 +233,11 @@ OpenAPI_n1_message_notification_t *OpenAPI_n1_message_notification_parseFromJSON } n1_message_notification_local_var = OpenAPI_n1_message_notification_create ( - n1_notify_subscription_id ? ogs_strdup_or_assert(n1_notify_subscription_id->valuestring) : NULL, + n1_notify_subscription_id ? ogs_strdup(n1_notify_subscription_id->valuestring) : NULL, n1_message_container_local_nonprim, - lcs_correlation_id ? ogs_strdup_or_assert(lcs_correlation_id->valuestring) : NULL, + lcs_correlation_id ? ogs_strdup(lcs_correlation_id->valuestring) : NULL, registration_ctxt_container ? registration_ctxt_container_local_nonprim : NULL, - new_lmf_identification ? ogs_strdup_or_assert(new_lmf_identification->valuestring) : NULL, + new_lmf_identification ? ogs_strdup(new_lmf_identification->valuestring) : NULL, guami ? guami_local_nonprim : NULL, c_io_t5_gs_optimisation ? true : false, c_io_t5_gs_optimisation ? c_io_t5_gs_optimisation->valueint : 0, diff --git a/lib/sbi/openapi/model/n1_n2_message_transfer_error.c b/lib/sbi/openapi/model/n1_n2_message_transfer_error.c index a042bdb72..27f0af496 100644 --- a/lib/sbi/openapi/model/n1_n2_message_transfer_error.c +++ b/lib/sbi/openapi/model/n1_n2_message_transfer_error.c @@ -9,10 +9,9 @@ OpenAPI_n1_n2_message_transfer_error_t *OpenAPI_n1_n2_message_transfer_error_cre OpenAPI_n1_n2_msg_txfr_err_detail_t *err_info ) { - OpenAPI_n1_n2_message_transfer_error_t *n1_n2_message_transfer_error_local_var = OpenAPI_malloc(sizeof(OpenAPI_n1_n2_message_transfer_error_t)); - if (!n1_n2_message_transfer_error_local_var) { - return NULL; - } + OpenAPI_n1_n2_message_transfer_error_t *n1_n2_message_transfer_error_local_var = ogs_malloc(sizeof(OpenAPI_n1_n2_message_transfer_error_t)); + ogs_assert(n1_n2_message_transfer_error_local_var); + n1_n2_message_transfer_error_local_var->error = error; n1_n2_message_transfer_error_local_var->err_info = err_info; diff --git a/lib/sbi/openapi/model/n1_n2_message_transfer_req_data.c b/lib/sbi/openapi/model/n1_n2_message_transfer_req_data.c index f0ae3ad88..6a33bf965 100644 --- a/lib/sbi/openapi/model/n1_n2_message_transfer_req_data.c +++ b/lib/sbi/openapi/model/n1_n2_message_transfer_req_data.c @@ -33,10 +33,9 @@ OpenAPI_n1_n2_message_transfer_req_data_t *OpenAPI_n1_n2_message_transfer_req_da OpenAPI_access_type_e target_access ) { - OpenAPI_n1_n2_message_transfer_req_data_t *n1_n2_message_transfer_req_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_n1_n2_message_transfer_req_data_t)); - if (!n1_n2_message_transfer_req_data_local_var) { - return NULL; - } + OpenAPI_n1_n2_message_transfer_req_data_t *n1_n2_message_transfer_req_data_local_var = ogs_malloc(sizeof(OpenAPI_n1_n2_message_transfer_req_data_t)); + ogs_assert(n1_n2_message_transfer_req_data_local_var); + n1_n2_message_transfer_req_data_local_var->n1_message_container = n1_message_container; n1_n2_message_transfer_req_data_local_var->n2_info_container = n2_info_container; n1_n2_message_transfer_req_data_local_var->mt_data = mt_data; @@ -426,17 +425,17 @@ OpenAPI_n1_n2_message_transfer_req_data_t *OpenAPI_n1_n2_message_transfer_req_da last_msg_indication ? last_msg_indication->valueint : 0, pdu_session_id ? true : false, pdu_session_id ? pdu_session_id->valuedouble : 0, - lcs_correlation_id ? ogs_strdup_or_assert(lcs_correlation_id->valuestring) : NULL, + lcs_correlation_id ? ogs_strdup(lcs_correlation_id->valuestring) : NULL, ppi ? true : false, ppi ? ppi->valuedouble : 0, arp ? arp_local_nonprim : NULL, _5qi ? true : false, _5qi ? _5qi->valuedouble : 0, - n1n2_failure_txf_notif_uri ? ogs_strdup_or_assert(n1n2_failure_txf_notif_uri->valuestring) : NULL, + n1n2_failure_txf_notif_uri ? ogs_strdup(n1n2_failure_txf_notif_uri->valuestring) : NULL, smf_reallocation_ind ? true : false, smf_reallocation_ind ? smf_reallocation_ind->valueint : 0, area_of_validity ? area_of_validity_local_nonprim : NULL, - supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, + supported_features ? ogs_strdup(supported_features->valuestring) : NULL, old_guami ? old_guami_local_nonprim : NULL, ma_accepted_ind ? true : false, ma_accepted_ind ? ma_accepted_ind->valueint : 0, diff --git a/lib/sbi/openapi/model/n1_n2_message_transfer_rsp_data.c b/lib/sbi/openapi/model/n1_n2_message_transfer_rsp_data.c index 943cdc418..e46752113 100644 --- a/lib/sbi/openapi/model/n1_n2_message_transfer_rsp_data.c +++ b/lib/sbi/openapi/model/n1_n2_message_transfer_rsp_data.c @@ -9,10 +9,9 @@ OpenAPI_n1_n2_message_transfer_rsp_data_t *OpenAPI_n1_n2_message_transfer_rsp_da char *supported_features ) { - OpenAPI_n1_n2_message_transfer_rsp_data_t *n1_n2_message_transfer_rsp_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_n1_n2_message_transfer_rsp_data_t)); - if (!n1_n2_message_transfer_rsp_data_local_var) { - return NULL; - } + OpenAPI_n1_n2_message_transfer_rsp_data_t *n1_n2_message_transfer_rsp_data_local_var = ogs_malloc(sizeof(OpenAPI_n1_n2_message_transfer_rsp_data_t)); + ogs_assert(n1_n2_message_transfer_rsp_data_local_var); + n1_n2_message_transfer_rsp_data_local_var->cause = cause; n1_n2_message_transfer_rsp_data_local_var->supported_features = supported_features; @@ -82,7 +81,7 @@ OpenAPI_n1_n2_message_transfer_rsp_data_t *OpenAPI_n1_n2_message_transfer_rsp_da n1_n2_message_transfer_rsp_data_local_var = OpenAPI_n1_n2_message_transfer_rsp_data_create ( causeVariable, - supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL + supported_features ? ogs_strdup(supported_features->valuestring) : NULL ); return n1_n2_message_transfer_rsp_data_local_var; diff --git a/lib/sbi/openapi/model/n1_n2_msg_txfr_err_detail.c b/lib/sbi/openapi/model/n1_n2_msg_txfr_err_detail.c index 886fd4b1f..bbf6e56db 100644 --- a/lib/sbi/openapi/model/n1_n2_msg_txfr_err_detail.c +++ b/lib/sbi/openapi/model/n1_n2_msg_txfr_err_detail.c @@ -12,10 +12,9 @@ OpenAPI_n1_n2_msg_txfr_err_detail_t *OpenAPI_n1_n2_msg_txfr_err_detail_create( int max_waiting_time ) { - OpenAPI_n1_n2_msg_txfr_err_detail_t *n1_n2_msg_txfr_err_detail_local_var = OpenAPI_malloc(sizeof(OpenAPI_n1_n2_msg_txfr_err_detail_t)); - if (!n1_n2_msg_txfr_err_detail_local_var) { - return NULL; - } + OpenAPI_n1_n2_msg_txfr_err_detail_t *n1_n2_msg_txfr_err_detail_local_var = ogs_malloc(sizeof(OpenAPI_n1_n2_msg_txfr_err_detail_t)); + ogs_assert(n1_n2_msg_txfr_err_detail_local_var); + n1_n2_msg_txfr_err_detail_local_var->is_retry_after = is_retry_after; n1_n2_msg_txfr_err_detail_local_var->retry_after = retry_after; n1_n2_msg_txfr_err_detail_local_var->highest_prio_arp = highest_prio_arp; diff --git a/lib/sbi/openapi/model/n1_n2_msg_txfr_failure_notification.c b/lib/sbi/openapi/model/n1_n2_msg_txfr_failure_notification.c index c20c6e626..692742f31 100644 --- a/lib/sbi/openapi/model/n1_n2_msg_txfr_failure_notification.c +++ b/lib/sbi/openapi/model/n1_n2_msg_txfr_failure_notification.c @@ -9,10 +9,9 @@ OpenAPI_n1_n2_msg_txfr_failure_notification_t *OpenAPI_n1_n2_msg_txfr_failure_no char *n1n2_msg_data_uri ) { - OpenAPI_n1_n2_msg_txfr_failure_notification_t *n1_n2_msg_txfr_failure_notification_local_var = OpenAPI_malloc(sizeof(OpenAPI_n1_n2_msg_txfr_failure_notification_t)); - if (!n1_n2_msg_txfr_failure_notification_local_var) { - return NULL; - } + OpenAPI_n1_n2_msg_txfr_failure_notification_t *n1_n2_msg_txfr_failure_notification_local_var = ogs_malloc(sizeof(OpenAPI_n1_n2_msg_txfr_failure_notification_t)); + ogs_assert(n1_n2_msg_txfr_failure_notification_local_var); + n1_n2_msg_txfr_failure_notification_local_var->cause = cause; n1_n2_msg_txfr_failure_notification_local_var->n1n2_msg_data_uri = n1n2_msg_data_uri; @@ -82,7 +81,7 @@ OpenAPI_n1_n2_msg_txfr_failure_notification_t *OpenAPI_n1_n2_msg_txfr_failure_no n1_n2_msg_txfr_failure_notification_local_var = OpenAPI_n1_n2_msg_txfr_failure_notification_create ( causeVariable, - ogs_strdup_or_assert(n1n2_msg_data_uri->valuestring) + ogs_strdup(n1n2_msg_data_uri->valuestring) ); return n1_n2_msg_txfr_failure_notification_local_var; diff --git a/lib/sbi/openapi/model/n2_info_container.c b/lib/sbi/openapi/model/n2_info_container.c index 1bbff74ff..905ba5a92 100644 --- a/lib/sbi/openapi/model/n2_info_container.c +++ b/lib/sbi/openapi/model/n2_info_container.c @@ -13,10 +13,9 @@ OpenAPI_n2_info_container_t *OpenAPI_n2_info_container_create( OpenAPI_v2x_information_t *v2x_info ) { - OpenAPI_n2_info_container_t *n2_info_container_local_var = OpenAPI_malloc(sizeof(OpenAPI_n2_info_container_t)); - if (!n2_info_container_local_var) { - return NULL; - } + OpenAPI_n2_info_container_t *n2_info_container_local_var = ogs_malloc(sizeof(OpenAPI_n2_info_container_t)); + ogs_assert(n2_info_container_local_var); + n2_info_container_local_var->n2_information_class = n2_information_class; n2_info_container_local_var->sm_info = sm_info; n2_info_container_local_var->ran_info = ran_info; diff --git a/lib/sbi/openapi/model/n2_info_content.c b/lib/sbi/openapi/model/n2_info_content.c index a3c5872f0..a081bb45f 100644 --- a/lib/sbi/openapi/model/n2_info_content.c +++ b/lib/sbi/openapi/model/n2_info_content.c @@ -11,10 +11,9 @@ OpenAPI_n2_info_content_t *OpenAPI_n2_info_content_create( OpenAPI_ref_to_binary_data_t *ngap_data ) { - OpenAPI_n2_info_content_t *n2_info_content_local_var = OpenAPI_malloc(sizeof(OpenAPI_n2_info_content_t)); - if (!n2_info_content_local_var) { - return NULL; - } + OpenAPI_n2_info_content_t *n2_info_content_local_var = ogs_malloc(sizeof(OpenAPI_n2_info_content_t)); + ogs_assert(n2_info_content_local_var); + n2_info_content_local_var->is_ngap_message_type = is_ngap_message_type; n2_info_content_local_var->ngap_message_type = ngap_message_type; n2_info_content_local_var->ngap_ie_type = ngap_ie_type; diff --git a/lib/sbi/openapi/model/n2_info_notification_rsp_data.c b/lib/sbi/openapi/model/n2_info_notification_rsp_data.c index 477169a07..c83cf0d3a 100644 --- a/lib/sbi/openapi/model/n2_info_notification_rsp_data.c +++ b/lib/sbi/openapi/model/n2_info_notification_rsp_data.c @@ -8,10 +8,9 @@ OpenAPI_n2_info_notification_rsp_data_t *OpenAPI_n2_info_notification_rsp_data_c OpenAPI_n2_info_content_t *n2_info_content ) { - OpenAPI_n2_info_notification_rsp_data_t *n2_info_notification_rsp_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_n2_info_notification_rsp_data_t)); - if (!n2_info_notification_rsp_data_local_var) { - return NULL; - } + OpenAPI_n2_info_notification_rsp_data_t *n2_info_notification_rsp_data_local_var = ogs_malloc(sizeof(OpenAPI_n2_info_notification_rsp_data_t)); + ogs_assert(n2_info_notification_rsp_data_local_var); + n2_info_notification_rsp_data_local_var->n2_info_content = n2_info_content; return n2_info_notification_rsp_data_local_var; diff --git a/lib/sbi/openapi/model/n2_information_notification.c b/lib/sbi/openapi/model/n2_information_notification.c index e8df7eeee..c15fc33b8 100644 --- a/lib/sbi/openapi/model/n2_information_notification.c +++ b/lib/sbi/openapi/model/n2_information_notification.c @@ -20,10 +20,9 @@ OpenAPI_n2_information_notification_t *OpenAPI_n2_information_notification_creat int notify_source_ng_ran ) { - OpenAPI_n2_information_notification_t *n2_information_notification_local_var = OpenAPI_malloc(sizeof(OpenAPI_n2_information_notification_t)); - if (!n2_information_notification_local_var) { - return NULL; - } + OpenAPI_n2_information_notification_t *n2_information_notification_local_var = ogs_malloc(sizeof(OpenAPI_n2_information_notification_t)); + ogs_assert(n2_information_notification_local_var); + n2_information_notification_local_var->n2_notify_subscription_id = n2_notify_subscription_id; n2_information_notification_local_var->n2_info_container = n2_info_container; n2_information_notification_local_var->to_release_session_list = to_release_session_list; @@ -337,16 +336,16 @@ OpenAPI_n2_information_notification_t *OpenAPI_n2_information_notification_parse } n2_information_notification_local_var = OpenAPI_n2_information_notification_create ( - ogs_strdup_or_assert(n2_notify_subscription_id->valuestring), + ogs_strdup(n2_notify_subscription_id->valuestring), n2_info_container ? n2_info_container_local_nonprim : NULL, to_release_session_list ? to_release_session_listList : NULL, - lcs_correlation_id ? ogs_strdup_or_assert(lcs_correlation_id->valuestring) : NULL, + lcs_correlation_id ? ogs_strdup(lcs_correlation_id->valuestring) : NULL, notify_reason ? notify_reasonVariable : 0, smf_change_info_list ? smf_change_info_listList : NULL, ran_node_id ? ran_node_id_local_nonprim : NULL, - initial_amf_name ? ogs_strdup_or_assert(initial_amf_name->valuestring) : NULL, - an_n2_ipv4_addr ? ogs_strdup_or_assert(an_n2_ipv4_addr->valuestring) : NULL, - an_n2_ipv6_addr ? ogs_strdup_or_assert(an_n2_ipv6_addr->valuestring) : NULL, + initial_amf_name ? ogs_strdup(initial_amf_name->valuestring) : NULL, + an_n2_ipv4_addr ? ogs_strdup(an_n2_ipv4_addr->valuestring) : NULL, + an_n2_ipv6_addr ? ogs_strdup(an_n2_ipv6_addr->valuestring) : NULL, guami ? guami_local_nonprim : NULL, notify_source_ng_ran ? true : false, notify_source_ng_ran ? notify_source_ng_ran->valueint : 0 diff --git a/lib/sbi/openapi/model/n2_information_transfer_error.c b/lib/sbi/openapi/model/n2_information_transfer_error.c index 1750cfa66..939faf576 100644 --- a/lib/sbi/openapi/model/n2_information_transfer_error.c +++ b/lib/sbi/openapi/model/n2_information_transfer_error.c @@ -9,10 +9,9 @@ OpenAPI_n2_information_transfer_error_t *OpenAPI_n2_information_transfer_error_c OpenAPI_pws_error_data_t *pws_error_info ) { - OpenAPI_n2_information_transfer_error_t *n2_information_transfer_error_local_var = OpenAPI_malloc(sizeof(OpenAPI_n2_information_transfer_error_t)); - if (!n2_information_transfer_error_local_var) { - return NULL; - } + OpenAPI_n2_information_transfer_error_t *n2_information_transfer_error_local_var = ogs_malloc(sizeof(OpenAPI_n2_information_transfer_error_t)); + ogs_assert(n2_information_transfer_error_local_var); + n2_information_transfer_error_local_var->error = error; n2_information_transfer_error_local_var->pws_error_info = pws_error_info; diff --git a/lib/sbi/openapi/model/n2_information_transfer_req_data.c b/lib/sbi/openapi/model/n2_information_transfer_req_data.c index 426a541c4..d2a769d19 100644 --- a/lib/sbi/openapi/model/n2_information_transfer_req_data.c +++ b/lib/sbi/openapi/model/n2_information_transfer_req_data.c @@ -12,10 +12,9 @@ OpenAPI_n2_information_transfer_req_data_t *OpenAPI_n2_information_transfer_req_ char *supported_features ) { - OpenAPI_n2_information_transfer_req_data_t *n2_information_transfer_req_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_n2_information_transfer_req_data_t)); - if (!n2_information_transfer_req_data_local_var) { - return NULL; - } + OpenAPI_n2_information_transfer_req_data_t *n2_information_transfer_req_data_local_var = ogs_malloc(sizeof(OpenAPI_n2_information_transfer_req_data_t)); + ogs_assert(n2_information_transfer_req_data_local_var); + n2_information_transfer_req_data_local_var->tai_list = tai_list; n2_information_transfer_req_data_local_var->rat_selector = rat_selector; n2_information_transfer_req_data_local_var->global_ran_node_list = global_ran_node_list; @@ -206,7 +205,7 @@ OpenAPI_n2_information_transfer_req_data_t *OpenAPI_n2_information_transfer_req_ rat_selector ? rat_selectorVariable : 0, global_ran_node_list ? global_ran_node_listList : NULL, n2_information_local_nonprim, - supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL + supported_features ? ogs_strdup(supported_features->valuestring) : NULL ); return n2_information_transfer_req_data_local_var; diff --git a/lib/sbi/openapi/model/n2_information_transfer_rsp_data.c b/lib/sbi/openapi/model/n2_information_transfer_rsp_data.c index e760eaedd..15375c776 100644 --- a/lib/sbi/openapi/model/n2_information_transfer_rsp_data.c +++ b/lib/sbi/openapi/model/n2_information_transfer_rsp_data.c @@ -10,10 +10,9 @@ OpenAPI_n2_information_transfer_rsp_data_t *OpenAPI_n2_information_transfer_rsp_ char *supported_features ) { - OpenAPI_n2_information_transfer_rsp_data_t *n2_information_transfer_rsp_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_n2_information_transfer_rsp_data_t)); - if (!n2_information_transfer_rsp_data_local_var) { - return NULL; - } + OpenAPI_n2_information_transfer_rsp_data_t *n2_information_transfer_rsp_data_local_var = ogs_malloc(sizeof(OpenAPI_n2_information_transfer_rsp_data_t)); + ogs_assert(n2_information_transfer_rsp_data_local_var); + n2_information_transfer_rsp_data_local_var->result = result; n2_information_transfer_rsp_data_local_var->pws_rsp_data = pws_rsp_data; n2_information_transfer_rsp_data_local_var->supported_features = supported_features; @@ -106,7 +105,7 @@ OpenAPI_n2_information_transfer_rsp_data_t *OpenAPI_n2_information_transfer_rsp_ n2_information_transfer_rsp_data_local_var = OpenAPI_n2_information_transfer_rsp_data_create ( resultVariable, pws_rsp_data ? pws_rsp_data_local_nonprim : NULL, - supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL + supported_features ? ogs_strdup(supported_features->valuestring) : NULL ); return n2_information_transfer_rsp_data_local_var; diff --git a/lib/sbi/openapi/model/n2_interface_amf_info.c b/lib/sbi/openapi/model/n2_interface_amf_info.c index 5bd21da54..c224a18c3 100644 --- a/lib/sbi/openapi/model/n2_interface_amf_info.c +++ b/lib/sbi/openapi/model/n2_interface_amf_info.c @@ -10,10 +10,9 @@ OpenAPI_n2_interface_amf_info_t *OpenAPI_n2_interface_amf_info_create( char *amf_name ) { - OpenAPI_n2_interface_amf_info_t *n2_interface_amf_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_n2_interface_amf_info_t)); - if (!n2_interface_amf_info_local_var) { - return NULL; - } + OpenAPI_n2_interface_amf_info_t *n2_interface_amf_info_local_var = ogs_malloc(sizeof(OpenAPI_n2_interface_amf_info_t)); + ogs_assert(n2_interface_amf_info_local_var); + n2_interface_amf_info_local_var->ipv4_endpoint_address = ipv4_endpoint_address; n2_interface_amf_info_local_var->ipv6_endpoint_address = ipv6_endpoint_address; n2_interface_amf_info_local_var->amf_name = amf_name; @@ -111,7 +110,7 @@ OpenAPI_n2_interface_amf_info_t *OpenAPI_n2_interface_amf_info_parseFromJSON(cJS ogs_error("OpenAPI_n2_interface_amf_info_parseFromJSON() failed [ipv4_endpoint_address]"); goto end; } - OpenAPI_list_add(ipv4_endpoint_addressList , ogs_strdup_or_assert(ipv4_endpoint_address_local->valuestring)); + OpenAPI_list_add(ipv4_endpoint_addressList , ogs_strdup(ipv4_endpoint_address_local->valuestring)); } } @@ -131,7 +130,7 @@ OpenAPI_n2_interface_amf_info_t *OpenAPI_n2_interface_amf_info_parseFromJSON(cJS ogs_error("OpenAPI_n2_interface_amf_info_parseFromJSON() failed [ipv6_endpoint_address]"); goto end; } - OpenAPI_list_add(ipv6_endpoint_addressList , ogs_strdup_or_assert(ipv6_endpoint_address_local->valuestring)); + OpenAPI_list_add(ipv6_endpoint_addressList , ogs_strdup(ipv6_endpoint_address_local->valuestring)); } } @@ -147,7 +146,7 @@ OpenAPI_n2_interface_amf_info_t *OpenAPI_n2_interface_amf_info_parseFromJSON(cJS n2_interface_amf_info_local_var = OpenAPI_n2_interface_amf_info_create ( ipv4_endpoint_address ? ipv4_endpoint_addressList : NULL, ipv6_endpoint_address ? ipv6_endpoint_addressList : NULL, - amf_name ? ogs_strdup_or_assert(amf_name->valuestring) : NULL + amf_name ? ogs_strdup(amf_name->valuestring) : NULL ); return n2_interface_amf_info_local_var; diff --git a/lib/sbi/openapi/model/n2_ran_information.c b/lib/sbi/openapi/model/n2_ran_information.c index 3e8a588b4..3f4044c81 100644 --- a/lib/sbi/openapi/model/n2_ran_information.c +++ b/lib/sbi/openapi/model/n2_ran_information.c @@ -8,10 +8,9 @@ OpenAPI_n2_ran_information_t *OpenAPI_n2_ran_information_create( OpenAPI_n2_info_content_t *n2_info_content ) { - OpenAPI_n2_ran_information_t *n2_ran_information_local_var = OpenAPI_malloc(sizeof(OpenAPI_n2_ran_information_t)); - if (!n2_ran_information_local_var) { - return NULL; - } + OpenAPI_n2_ran_information_t *n2_ran_information_local_var = ogs_malloc(sizeof(OpenAPI_n2_ran_information_t)); + ogs_assert(n2_ran_information_local_var); + n2_ran_information_local_var->n2_info_content = n2_info_content; return n2_ran_information_local_var; diff --git a/lib/sbi/openapi/model/n2_sm_information.c b/lib/sbi/openapi/model/n2_sm_information.c index d3f10f78e..f50657f38 100644 --- a/lib/sbi/openapi/model/n2_sm_information.c +++ b/lib/sbi/openapi/model/n2_sm_information.c @@ -14,10 +14,9 @@ OpenAPI_n2_sm_information_t *OpenAPI_n2_sm_information_create( int subject_to_ho ) { - OpenAPI_n2_sm_information_t *n2_sm_information_local_var = OpenAPI_malloc(sizeof(OpenAPI_n2_sm_information_t)); - if (!n2_sm_information_local_var) { - return NULL; - } + OpenAPI_n2_sm_information_t *n2_sm_information_local_var = ogs_malloc(sizeof(OpenAPI_n2_sm_information_t)); + ogs_assert(n2_sm_information_local_var); + n2_sm_information_local_var->pdu_session_id = pdu_session_id; n2_sm_information_local_var->n2_info_content = n2_info_content; n2_sm_information_local_var->s_nssai = s_nssai; diff --git a/lib/sbi/openapi/model/n3ga_location.c b/lib/sbi/openapi/model/n3ga_location.c index fa3e034dc..acac8a95c 100644 --- a/lib/sbi/openapi/model/n3ga_location.c +++ b/lib/sbi/openapi/model/n3ga_location.c @@ -19,10 +19,9 @@ OpenAPI_n3ga_location_t *OpenAPI_n3ga_location_create( char *gci ) { - OpenAPI_n3ga_location_t *n3ga_location_local_var = OpenAPI_malloc(sizeof(OpenAPI_n3ga_location_t)); - if (!n3ga_location_local_var) { - return NULL; - } + OpenAPI_n3ga_location_t *n3ga_location_local_var = ogs_malloc(sizeof(OpenAPI_n3ga_location_t)); + ogs_assert(n3ga_location_local_var); + n3ga_location_local_var->n3gpp_tai = n3gpp_tai; n3ga_location_local_var->n3_iwf_id = n3_iwf_id; n3ga_location_local_var->ue_ipv4_addr = ue_ipv4_addr; @@ -270,17 +269,17 @@ OpenAPI_n3ga_location_t *OpenAPI_n3ga_location_parseFromJSON(cJSON *n3ga_locatio n3ga_location_local_var = OpenAPI_n3ga_location_create ( n3gpp_tai ? n3gpp_tai_local_nonprim : NULL, - n3_iwf_id ? ogs_strdup_or_assert(n3_iwf_id->valuestring) : NULL, - ue_ipv4_addr ? ogs_strdup_or_assert(ue_ipv4_addr->valuestring) : NULL, - ue_ipv6_addr ? ogs_strdup_or_assert(ue_ipv6_addr->valuestring) : NULL, + n3_iwf_id ? ogs_strdup(n3_iwf_id->valuestring) : NULL, + ue_ipv4_addr ? ogs_strdup(ue_ipv4_addr->valuestring) : NULL, + ue_ipv6_addr ? ogs_strdup(ue_ipv6_addr->valuestring) : NULL, port_number ? true : false, port_number ? port_number->valuedouble : 0, tnap_id ? tnap_id_local_nonprim : NULL, twap_id ? twap_id_local_nonprim : NULL, hfc_node_id ? hfc_node_id_local_nonprim : NULL, - gli ? ogs_strdup_or_assert(gli->valuestring) : NULL, + gli ? ogs_strdup(gli->valuestring) : NULL, w5gban_line_type ? w5gban_line_typeVariable : 0, - gci ? ogs_strdup_or_assert(gci->valuestring) : NULL + gci ? ogs_strdup(gci->valuestring) : NULL ); return n3ga_location_local_var; diff --git a/lib/sbi/openapi/model/n4_information.c b/lib/sbi/openapi/model/n4_information.c index 1c4568c19..bab866717 100644 --- a/lib/sbi/openapi/model/n4_information.c +++ b/lib/sbi/openapi/model/n4_information.c @@ -10,10 +10,9 @@ OpenAPI_n4_information_t *OpenAPI_n4_information_create( OpenAPI_dnai_information_t *n4_dnai_info ) { - OpenAPI_n4_information_t *n4_information_local_var = OpenAPI_malloc(sizeof(OpenAPI_n4_information_t)); - if (!n4_information_local_var) { - return NULL; - } + OpenAPI_n4_information_t *n4_information_local_var = ogs_malloc(sizeof(OpenAPI_n4_information_t)); + ogs_assert(n4_information_local_var); + n4_information_local_var->n4_message_type = n4_message_type; n4_information_local_var->n4_message_payload = n4_message_payload; n4_information_local_var->n4_dnai_info = n4_dnai_info; diff --git a/lib/sbi/openapi/model/nas_security_mode.c b/lib/sbi/openapi/model/nas_security_mode.c index 7a03d6160..18a564e69 100644 --- a/lib/sbi/openapi/model/nas_security_mode.c +++ b/lib/sbi/openapi/model/nas_security_mode.c @@ -9,10 +9,9 @@ OpenAPI_nas_security_mode_t *OpenAPI_nas_security_mode_create( OpenAPI_ciphering_algorithm_e ciphering_algorithm ) { - OpenAPI_nas_security_mode_t *nas_security_mode_local_var = OpenAPI_malloc(sizeof(OpenAPI_nas_security_mode_t)); - if (!nas_security_mode_local_var) { - return NULL; - } + OpenAPI_nas_security_mode_t *nas_security_mode_local_var = ogs_malloc(sizeof(OpenAPI_nas_security_mode_t)); + ogs_assert(nas_security_mode_local_var); + nas_security_mode_local_var->integrity_algorithm = integrity_algorithm; nas_security_mode_local_var->ciphering_algorithm = ciphering_algorithm; diff --git a/lib/sbi/openapi/model/ncgi.c b/lib/sbi/openapi/model/ncgi.c index f3e491000..13657ec4e 100644 --- a/lib/sbi/openapi/model/ncgi.c +++ b/lib/sbi/openapi/model/ncgi.c @@ -10,10 +10,9 @@ OpenAPI_ncgi_t *OpenAPI_ncgi_create( char *nid ) { - OpenAPI_ncgi_t *ncgi_local_var = OpenAPI_malloc(sizeof(OpenAPI_ncgi_t)); - if (!ncgi_local_var) { - return NULL; - } + OpenAPI_ncgi_t *ncgi_local_var = ogs_malloc(sizeof(OpenAPI_ncgi_t)); + ogs_assert(ncgi_local_var); + ncgi_local_var->plmn_id = plmn_id; ncgi_local_var->nr_cell_id = nr_cell_id; ncgi_local_var->nid = nid; @@ -104,8 +103,8 @@ OpenAPI_ncgi_t *OpenAPI_ncgi_parseFromJSON(cJSON *ncgiJSON) ncgi_local_var = OpenAPI_ncgi_create ( plmn_id_local_nonprim, - ogs_strdup_or_assert(nr_cell_id->valuestring), - nid ? ogs_strdup_or_assert(nid->valuestring) : NULL + ogs_strdup(nr_cell_id->valuestring), + nid ? ogs_strdup(nid->valuestring) : NULL ); return ncgi_local_var; diff --git a/lib/sbi/openapi/model/ncgi_1.c b/lib/sbi/openapi/model/ncgi_1.c index 4ade1035b..d7ebf5d22 100644 --- a/lib/sbi/openapi/model/ncgi_1.c +++ b/lib/sbi/openapi/model/ncgi_1.c @@ -10,10 +10,9 @@ OpenAPI_ncgi_1_t *OpenAPI_ncgi_1_create( char *nid ) { - OpenAPI_ncgi_1_t *ncgi_1_local_var = OpenAPI_malloc(sizeof(OpenAPI_ncgi_1_t)); - if (!ncgi_1_local_var) { - return NULL; - } + OpenAPI_ncgi_1_t *ncgi_1_local_var = ogs_malloc(sizeof(OpenAPI_ncgi_1_t)); + ogs_assert(ncgi_1_local_var); + ncgi_1_local_var->plmn_id = plmn_id; ncgi_1_local_var->nr_cell_id = nr_cell_id; ncgi_1_local_var->nid = nid; @@ -104,8 +103,8 @@ OpenAPI_ncgi_1_t *OpenAPI_ncgi_1_parseFromJSON(cJSON *ncgi_1JSON) ncgi_1_local_var = OpenAPI_ncgi_1_create ( plmn_id_local_nonprim, - ogs_strdup_or_assert(nr_cell_id->valuestring), - nid ? ogs_strdup_or_assert(nid->valuestring) : NULL + ogs_strdup(nr_cell_id->valuestring), + nid ? ogs_strdup(nid->valuestring) : NULL ); return ncgi_1_local_var; diff --git a/lib/sbi/openapi/model/nef_cond.c b/lib/sbi/openapi/model/nef_cond.c index 07bea78f4..3422db16e 100644 --- a/lib/sbi/openapi/model/nef_cond.c +++ b/lib/sbi/openapi/model/nef_cond.c @@ -37,10 +37,9 @@ OpenAPI_nef_cond_t *OpenAPI_nef_cond_create( OpenAPI_list_t *served_fqdn_list ) { - OpenAPI_nef_cond_t *nef_cond_local_var = OpenAPI_malloc(sizeof(OpenAPI_nef_cond_t)); - if (!nef_cond_local_var) { - return NULL; - } + OpenAPI_nef_cond_t *nef_cond_local_var = ogs_malloc(sizeof(OpenAPI_nef_cond_t)); + ogs_assert(nef_cond_local_var); + nef_cond_local_var->condition_type = condition_type; nef_cond_local_var->af_events = af_events; nef_cond_local_var->snssai_list = snssai_list; @@ -332,7 +331,7 @@ OpenAPI_nef_cond_t *OpenAPI_nef_cond_parseFromJSON(cJSON *nef_condJSON) ogs_error("OpenAPI_nef_cond_parseFromJSON() failed [served_fqdn_list]"); goto end; } - OpenAPI_list_add(served_fqdn_listList , ogs_strdup_or_assert(served_fqdn_list_local->valuestring)); + OpenAPI_list_add(served_fqdn_listList , ogs_strdup(served_fqdn_list_local->valuestring)); } } diff --git a/lib/sbi/openapi/model/nef_info.c b/lib/sbi/openapi/model/nef_info.c index 5422a1785..3501ef6ac 100644 --- a/lib/sbi/openapi/model/nef_info.c +++ b/lib/sbi/openapi/model/nef_info.c @@ -13,10 +13,9 @@ OpenAPI_nef_info_t *OpenAPI_nef_info_create( OpenAPI_list_t *served_fqdn_list ) { - OpenAPI_nef_info_t *nef_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_nef_info_t)); - if (!nef_info_local_var) { - return NULL; - } + OpenAPI_nef_info_t *nef_info_local_var = ogs_malloc(sizeof(OpenAPI_nef_info_t)); + ogs_assert(nef_info_local_var); + nef_info_local_var->nef_id = nef_id; nef_info_local_var->pfd_data = pfd_data; nef_info_local_var->af_ee_data = af_ee_data; @@ -242,12 +241,12 @@ OpenAPI_nef_info_t *OpenAPI_nef_info_parseFromJSON(cJSON *nef_infoJSON) ogs_error("OpenAPI_nef_info_parseFromJSON() failed [served_fqdn_list]"); goto end; } - OpenAPI_list_add(served_fqdn_listList , ogs_strdup_or_assert(served_fqdn_list_local->valuestring)); + OpenAPI_list_add(served_fqdn_listList , ogs_strdup(served_fqdn_list_local->valuestring)); } } nef_info_local_var = OpenAPI_nef_info_create ( - nef_id ? ogs_strdup_or_assert(nef_id->valuestring) : NULL, + nef_id ? ogs_strdup(nef_id->valuestring) : NULL, pfd_data ? pfd_data_local_nonprim : NULL, af_ee_data ? af_ee_data_local_nonprim : NULL, gpsi_ranges ? gpsi_rangesList : NULL, diff --git a/lib/sbi/openapi/model/network_area_info.c b/lib/sbi/openapi/model/network_area_info.c index 2f2fa82b0..6ad1f1f1f 100644 --- a/lib/sbi/openapi/model/network_area_info.c +++ b/lib/sbi/openapi/model/network_area_info.c @@ -11,10 +11,9 @@ OpenAPI_network_area_info_t *OpenAPI_network_area_info_create( OpenAPI_list_t *tais ) { - OpenAPI_network_area_info_t *network_area_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_network_area_info_t)); - if (!network_area_info_local_var) { - return NULL; - } + OpenAPI_network_area_info_t *network_area_info_local_var = ogs_malloc(sizeof(OpenAPI_network_area_info_t)); + ogs_assert(network_area_info_local_var); + network_area_info_local_var->ecgis = ecgis; network_area_info_local_var->ncgis = ncgis; network_area_info_local_var->g_ran_node_ids = g_ran_node_ids; diff --git a/lib/sbi/openapi/model/network_area_info_1.c b/lib/sbi/openapi/model/network_area_info_1.c index 923d98681..476e48789 100644 --- a/lib/sbi/openapi/model/network_area_info_1.c +++ b/lib/sbi/openapi/model/network_area_info_1.c @@ -11,10 +11,9 @@ OpenAPI_network_area_info_1_t *OpenAPI_network_area_info_1_create( OpenAPI_list_t *tais ) { - OpenAPI_network_area_info_1_t *network_area_info_1_local_var = OpenAPI_malloc(sizeof(OpenAPI_network_area_info_1_t)); - if (!network_area_info_1_local_var) { - return NULL; - } + OpenAPI_network_area_info_1_t *network_area_info_1_local_var = ogs_malloc(sizeof(OpenAPI_network_area_info_1_t)); + ogs_assert(network_area_info_1_local_var); + network_area_info_1_local_var->ecgis = ecgis; network_area_info_1_local_var->ncgis = ncgis; network_area_info_1_local_var->g_ran_node_ids = g_ran_node_ids; diff --git a/lib/sbi/openapi/model/network_node_diameter_address.c b/lib/sbi/openapi/model/network_node_diameter_address.c index 6db036e65..70bba1df7 100644 --- a/lib/sbi/openapi/model/network_node_diameter_address.c +++ b/lib/sbi/openapi/model/network_node_diameter_address.c @@ -9,10 +9,9 @@ OpenAPI_network_node_diameter_address_t *OpenAPI_network_node_diameter_address_c char *realm ) { - OpenAPI_network_node_diameter_address_t *network_node_diameter_address_local_var = OpenAPI_malloc(sizeof(OpenAPI_network_node_diameter_address_t)); - if (!network_node_diameter_address_local_var) { - return NULL; - } + OpenAPI_network_node_diameter_address_t *network_node_diameter_address_local_var = ogs_malloc(sizeof(OpenAPI_network_node_diameter_address_t)); + ogs_assert(network_node_diameter_address_local_var); + network_node_diameter_address_local_var->name = name; network_node_diameter_address_local_var->realm = realm; @@ -80,8 +79,8 @@ OpenAPI_network_node_diameter_address_t *OpenAPI_network_node_diameter_address_p } network_node_diameter_address_local_var = OpenAPI_network_node_diameter_address_create ( - ogs_strdup_or_assert(name->valuestring), - ogs_strdup_or_assert(realm->valuestring) + ogs_strdup(name->valuestring), + ogs_strdup(realm->valuestring) ); return network_node_diameter_address_local_var; diff --git a/lib/sbi/openapi/model/network_node_diameter_address_1.c b/lib/sbi/openapi/model/network_node_diameter_address_1.c index 675c86b8b..074d455d6 100644 --- a/lib/sbi/openapi/model/network_node_diameter_address_1.c +++ b/lib/sbi/openapi/model/network_node_diameter_address_1.c @@ -9,10 +9,9 @@ OpenAPI_network_node_diameter_address_1_t *OpenAPI_network_node_diameter_address char *realm ) { - OpenAPI_network_node_diameter_address_1_t *network_node_diameter_address_1_local_var = OpenAPI_malloc(sizeof(OpenAPI_network_node_diameter_address_1_t)); - if (!network_node_diameter_address_1_local_var) { - return NULL; - } + OpenAPI_network_node_diameter_address_1_t *network_node_diameter_address_1_local_var = ogs_malloc(sizeof(OpenAPI_network_node_diameter_address_1_t)); + ogs_assert(network_node_diameter_address_1_local_var); + network_node_diameter_address_1_local_var->name = name; network_node_diameter_address_1_local_var->realm = realm; @@ -80,8 +79,8 @@ OpenAPI_network_node_diameter_address_1_t *OpenAPI_network_node_diameter_address } network_node_diameter_address_1_local_var = OpenAPI_network_node_diameter_address_1_create ( - ogs_strdup_or_assert(name->valuestring), - ogs_strdup_or_assert(realm->valuestring) + ogs_strdup(name->valuestring), + ogs_strdup(realm->valuestring) ); return network_node_diameter_address_1_local_var; diff --git a/lib/sbi/openapi/model/network_slice_cond.c b/lib/sbi/openapi/model/network_slice_cond.c index 05b047d74..283872961 100644 --- a/lib/sbi/openapi/model/network_slice_cond.c +++ b/lib/sbi/openapi/model/network_slice_cond.c @@ -9,10 +9,9 @@ OpenAPI_network_slice_cond_t *OpenAPI_network_slice_cond_create( OpenAPI_list_t *nsi_list ) { - OpenAPI_network_slice_cond_t *network_slice_cond_local_var = OpenAPI_malloc(sizeof(OpenAPI_network_slice_cond_t)); - if (!network_slice_cond_local_var) { - return NULL; - } + OpenAPI_network_slice_cond_t *network_slice_cond_local_var = ogs_malloc(sizeof(OpenAPI_network_slice_cond_t)); + ogs_assert(network_slice_cond_local_var); + network_slice_cond_local_var->snssai_list = snssai_list; network_slice_cond_local_var->nsi_list = nsi_list; @@ -128,7 +127,7 @@ OpenAPI_network_slice_cond_t *OpenAPI_network_slice_cond_parseFromJSON(cJSON *ne ogs_error("OpenAPI_network_slice_cond_parseFromJSON() failed [nsi_list]"); goto end; } - OpenAPI_list_add(nsi_listList , ogs_strdup_or_assert(nsi_list_local->valuestring)); + OpenAPI_list_add(nsi_listList , ogs_strdup(nsi_list_local->valuestring)); } } diff --git a/lib/sbi/openapi/model/nf_group_cond.c b/lib/sbi/openapi/model/nf_group_cond.c index 122d8249e..018d47c20 100644 --- a/lib/sbi/openapi/model/nf_group_cond.c +++ b/lib/sbi/openapi/model/nf_group_cond.c @@ -32,10 +32,9 @@ OpenAPI_nf_group_cond_t *OpenAPI_nf_group_cond_create( char *nf_group_id ) { - OpenAPI_nf_group_cond_t *nf_group_cond_local_var = OpenAPI_malloc(sizeof(OpenAPI_nf_group_cond_t)); - if (!nf_group_cond_local_var) { - return NULL; - } + OpenAPI_nf_group_cond_t *nf_group_cond_local_var = ogs_malloc(sizeof(OpenAPI_nf_group_cond_t)); + ogs_assert(nf_group_cond_local_var); + nf_group_cond_local_var->nf_type = nf_type; nf_group_cond_local_var->nf_group_id = nf_group_id; @@ -105,7 +104,7 @@ OpenAPI_nf_group_cond_t *OpenAPI_nf_group_cond_parseFromJSON(cJSON *nf_group_con nf_group_cond_local_var = OpenAPI_nf_group_cond_create ( nf_typeVariable, - ogs_strdup_or_assert(nf_group_id->valuestring) + ogs_strdup(nf_group_id->valuestring) ); return nf_group_cond_local_var; diff --git a/lib/sbi/openapi/model/nf_info.c b/lib/sbi/openapi/model/nf_info.c index c3fa6334b..bdba28ee1 100644 --- a/lib/sbi/openapi/model/nf_info.c +++ b/lib/sbi/openapi/model/nf_info.c @@ -8,10 +8,9 @@ OpenAPI_nf_info_t *OpenAPI_nf_info_create( OpenAPI_nf_type_e nf_type ) { - OpenAPI_nf_info_t *nf_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_nf_info_t)); - if (!nf_info_local_var) { - return NULL; - } + OpenAPI_nf_info_t *nf_info_local_var = ogs_malloc(sizeof(OpenAPI_nf_info_t)); + ogs_assert(nf_info_local_var); + nf_info_local_var->nf_type = nf_type; return nf_info_local_var; diff --git a/lib/sbi/openapi/model/nf_instance_id_cond.c b/lib/sbi/openapi/model/nf_instance_id_cond.c index f3ebde027..2c45cf5bb 100644 --- a/lib/sbi/openapi/model/nf_instance_id_cond.c +++ b/lib/sbi/openapi/model/nf_instance_id_cond.c @@ -8,10 +8,9 @@ OpenAPI_nf_instance_id_cond_t *OpenAPI_nf_instance_id_cond_create( char *nf_instance_id ) { - OpenAPI_nf_instance_id_cond_t *nf_instance_id_cond_local_var = OpenAPI_malloc(sizeof(OpenAPI_nf_instance_id_cond_t)); - if (!nf_instance_id_cond_local_var) { - return NULL; - } + OpenAPI_nf_instance_id_cond_t *nf_instance_id_cond_local_var = ogs_malloc(sizeof(OpenAPI_nf_instance_id_cond_t)); + ogs_assert(nf_instance_id_cond_local_var); + nf_instance_id_cond_local_var->nf_instance_id = nf_instance_id; return nf_instance_id_cond_local_var; @@ -61,7 +60,7 @@ OpenAPI_nf_instance_id_cond_t *OpenAPI_nf_instance_id_cond_parseFromJSON(cJSON * } nf_instance_id_cond_local_var = OpenAPI_nf_instance_id_cond_create ( - ogs_strdup_or_assert(nf_instance_id->valuestring) + ogs_strdup(nf_instance_id->valuestring) ); return nf_instance_id_cond_local_var; diff --git a/lib/sbi/openapi/model/nf_instance_id_list_cond.c b/lib/sbi/openapi/model/nf_instance_id_list_cond.c index 122ad9cfc..768ac59dc 100644 --- a/lib/sbi/openapi/model/nf_instance_id_list_cond.c +++ b/lib/sbi/openapi/model/nf_instance_id_list_cond.c @@ -8,10 +8,9 @@ OpenAPI_nf_instance_id_list_cond_t *OpenAPI_nf_instance_id_list_cond_create( OpenAPI_list_t *nf_instance_id_list ) { - OpenAPI_nf_instance_id_list_cond_t *nf_instance_id_list_cond_local_var = OpenAPI_malloc(sizeof(OpenAPI_nf_instance_id_list_cond_t)); - if (!nf_instance_id_list_cond_local_var) { - return NULL; - } + OpenAPI_nf_instance_id_list_cond_t *nf_instance_id_list_cond_local_var = ogs_malloc(sizeof(OpenAPI_nf_instance_id_list_cond_t)); + ogs_assert(nf_instance_id_list_cond_local_var); + nf_instance_id_list_cond_local_var->nf_instance_id_list = nf_instance_id_list; return nf_instance_id_list_cond_local_var; @@ -80,7 +79,7 @@ OpenAPI_nf_instance_id_list_cond_t *OpenAPI_nf_instance_id_list_cond_parseFromJS ogs_error("OpenAPI_nf_instance_id_list_cond_parseFromJSON() failed [nf_instance_id_list]"); goto end; } - OpenAPI_list_add(nf_instance_id_listList , ogs_strdup_or_assert(nf_instance_id_list_local->valuestring)); + OpenAPI_list_add(nf_instance_id_listList , ogs_strdup(nf_instance_id_list_local->valuestring)); } nf_instance_id_list_cond_local_var = OpenAPI_nf_instance_id_list_cond_create ( diff --git a/lib/sbi/openapi/model/nf_profile.c b/lib/sbi/openapi/model/nf_profile.c index 34aa722ec..8ace14f39 100644 --- a/lib/sbi/openapi/model/nf_profile.c +++ b/lib/sbi/openapi/model/nf_profile.c @@ -83,10 +83,9 @@ OpenAPI_nf_profile_t *OpenAPI_nf_profile_create( OpenAPI_scp_info_t *scp_info ) { - OpenAPI_nf_profile_t *nf_profile_local_var = OpenAPI_malloc(sizeof(OpenAPI_nf_profile_t)); - if (!nf_profile_local_var) { - return NULL; - } + OpenAPI_nf_profile_t *nf_profile_local_var = ogs_malloc(sizeof(OpenAPI_nf_profile_t)); + ogs_assert(nf_profile_local_var); + nf_profile_local_var->nf_instance_id = nf_instance_id; nf_profile_local_var->nf_instance_name = nf_instance_name; nf_profile_local_var->nf_type = nf_type; @@ -227,6 +226,7 @@ void OpenAPI_nf_profile_free(OpenAPI_nf_profile_t *nf_profile) OpenAPI_udr_info_free(nf_profile->udr_info); OpenAPI_list_for_each(nf_profile->udr_info_list, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_udr_info_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -234,6 +234,7 @@ void OpenAPI_nf_profile_free(OpenAPI_nf_profile_t *nf_profile) OpenAPI_udm_info_free(nf_profile->udm_info); OpenAPI_list_for_each(nf_profile->udm_info_list, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_udm_info_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -241,6 +242,7 @@ void OpenAPI_nf_profile_free(OpenAPI_nf_profile_t *nf_profile) OpenAPI_ausf_info_free(nf_profile->ausf_info); OpenAPI_list_for_each(nf_profile->ausf_info_list, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_ausf_info_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -248,6 +250,7 @@ void OpenAPI_nf_profile_free(OpenAPI_nf_profile_t *nf_profile) OpenAPI_amf_info_free(nf_profile->amf_info); OpenAPI_list_for_each(nf_profile->amf_info_list, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_amf_info_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -255,6 +258,7 @@ void OpenAPI_nf_profile_free(OpenAPI_nf_profile_t *nf_profile) OpenAPI_smf_info_free(nf_profile->smf_info); OpenAPI_list_for_each(nf_profile->smf_info_list, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_smf_info_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -262,6 +266,7 @@ void OpenAPI_nf_profile_free(OpenAPI_nf_profile_t *nf_profile) OpenAPI_upf_info_free(nf_profile->upf_info); OpenAPI_list_for_each(nf_profile->upf_info_list, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_upf_info_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -269,6 +274,7 @@ void OpenAPI_nf_profile_free(OpenAPI_nf_profile_t *nf_profile) OpenAPI_pcf_info_free(nf_profile->pcf_info); OpenAPI_list_for_each(nf_profile->pcf_info_list, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_pcf_info_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -276,6 +282,7 @@ void OpenAPI_nf_profile_free(OpenAPI_nf_profile_t *nf_profile) OpenAPI_bsf_info_free(nf_profile->bsf_info); OpenAPI_list_for_each(nf_profile->bsf_info_list, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_bsf_info_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -283,6 +290,7 @@ void OpenAPI_nf_profile_free(OpenAPI_nf_profile_t *nf_profile) OpenAPI_chf_info_free(nf_profile->chf_info); OpenAPI_list_for_each(nf_profile->chf_info_list, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_chf_info_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -292,6 +300,7 @@ void OpenAPI_nf_profile_free(OpenAPI_nf_profile_t *nf_profile) OpenAPI_udsf_info_free(nf_profile->udsf_info); OpenAPI_list_for_each(nf_profile->udsf_info_list, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_udsf_info_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -299,12 +308,14 @@ void OpenAPI_nf_profile_free(OpenAPI_nf_profile_t *nf_profile) OpenAPI_nwdaf_info_free(nf_profile->nwdaf_info); OpenAPI_list_for_each(nf_profile->pcscf_info_list, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_pcscf_info_free(localKeyValue->value); ogs_free(localKeyValue); } OpenAPI_list_free(nf_profile->pcscf_info_list); OpenAPI_list_for_each(nf_profile->hss_info_list, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_hss_info_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -317,6 +328,7 @@ void OpenAPI_nf_profile_free(OpenAPI_nf_profile_t *nf_profile) OpenAPI_list_free(nf_profile->nf_services); OpenAPI_list_for_each(nf_profile->nf_service_list, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_nf_service_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -337,12 +349,14 @@ void OpenAPI_nf_profile_free(OpenAPI_nf_profile_t *nf_profile) OpenAPI_list_free(nf_profile->serving_scope); OpenAPI_list_for_each(nf_profile->nf_set_recovery_time_list, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); ogs_free(localKeyValue->value); ogs_free(localKeyValue); } OpenAPI_list_free(nf_profile->nf_set_recovery_time_list); OpenAPI_list_for_each(nf_profile->service_set_recovery_time_list, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); ogs_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -1512,7 +1526,7 @@ OpenAPI_nf_profile_t *OpenAPI_nf_profile_parseFromJSON(cJSON *nf_profileJSON) ogs_error("OpenAPI_nf_profile_parseFromJSON() failed [nsi_list]"); goto end; } - OpenAPI_list_add(nsi_listList , ogs_strdup_or_assert(nsi_list_local->valuestring)); + OpenAPI_list_add(nsi_listList , ogs_strdup(nsi_list_local->valuestring)); } } @@ -1550,7 +1564,7 @@ OpenAPI_nf_profile_t *OpenAPI_nf_profile_parseFromJSON(cJSON *nf_profileJSON) ogs_error("OpenAPI_nf_profile_parseFromJSON() failed [ipv4_addresses]"); goto end; } - OpenAPI_list_add(ipv4_addressesList , ogs_strdup_or_assert(ipv4_addresses_local->valuestring)); + OpenAPI_list_add(ipv4_addressesList , ogs_strdup(ipv4_addresses_local->valuestring)); } } @@ -1570,7 +1584,7 @@ OpenAPI_nf_profile_t *OpenAPI_nf_profile_parseFromJSON(cJSON *nf_profileJSON) ogs_error("OpenAPI_nf_profile_parseFromJSON() failed [ipv6_addresses]"); goto end; } - OpenAPI_list_add(ipv6_addressesList , ogs_strdup_or_assert(ipv6_addresses_local->valuestring)); + OpenAPI_list_add(ipv6_addressesList , ogs_strdup(ipv6_addresses_local->valuestring)); } } @@ -1658,7 +1672,7 @@ OpenAPI_nf_profile_t *OpenAPI_nf_profile_parseFromJSON(cJSON *nf_profileJSON) ogs_error("OpenAPI_nf_profile_parseFromJSON() failed [allowed_nf_domains]"); goto end; } - OpenAPI_list_add(allowed_nf_domainsList , ogs_strdup_or_assert(allowed_nf_domains_local->valuestring)); + OpenAPI_list_add(allowed_nf_domainsList , ogs_strdup(allowed_nf_domains_local->valuestring)); } } @@ -1752,9 +1766,9 @@ OpenAPI_nf_profile_t *OpenAPI_nf_profile_parseFromJSON(cJSON *nf_profileJSON) cJSON *localMapObject = udr_info_list_local_map; if (cJSON_IsObject(udr_info_list_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_udr_info_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_udr_info_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(udr_info_list_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_nf_profile_parseFromJSON() failed [udr_info_list]"); goto end; @@ -1785,9 +1799,9 @@ OpenAPI_nf_profile_t *OpenAPI_nf_profile_parseFromJSON(cJSON *nf_profileJSON) cJSON *localMapObject = udm_info_list_local_map; if (cJSON_IsObject(udm_info_list_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_udm_info_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_udm_info_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(udm_info_list_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_nf_profile_parseFromJSON() failed [udm_info_list]"); goto end; @@ -1818,9 +1832,9 @@ OpenAPI_nf_profile_t *OpenAPI_nf_profile_parseFromJSON(cJSON *nf_profileJSON) cJSON *localMapObject = ausf_info_list_local_map; if (cJSON_IsObject(ausf_info_list_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_ausf_info_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_ausf_info_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(ausf_info_list_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_nf_profile_parseFromJSON() failed [ausf_info_list]"); goto end; @@ -1851,9 +1865,9 @@ OpenAPI_nf_profile_t *OpenAPI_nf_profile_parseFromJSON(cJSON *nf_profileJSON) cJSON *localMapObject = amf_info_list_local_map; if (cJSON_IsObject(amf_info_list_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_amf_info_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_amf_info_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(amf_info_list_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_nf_profile_parseFromJSON() failed [amf_info_list]"); goto end; @@ -1884,9 +1898,9 @@ OpenAPI_nf_profile_t *OpenAPI_nf_profile_parseFromJSON(cJSON *nf_profileJSON) cJSON *localMapObject = smf_info_list_local_map; if (cJSON_IsObject(smf_info_list_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_smf_info_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_smf_info_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(smf_info_list_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_nf_profile_parseFromJSON() failed [smf_info_list]"); goto end; @@ -1917,9 +1931,9 @@ OpenAPI_nf_profile_t *OpenAPI_nf_profile_parseFromJSON(cJSON *nf_profileJSON) cJSON *localMapObject = upf_info_list_local_map; if (cJSON_IsObject(upf_info_list_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_upf_info_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_upf_info_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(upf_info_list_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_nf_profile_parseFromJSON() failed [upf_info_list]"); goto end; @@ -1950,9 +1964,9 @@ OpenAPI_nf_profile_t *OpenAPI_nf_profile_parseFromJSON(cJSON *nf_profileJSON) cJSON *localMapObject = pcf_info_list_local_map; if (cJSON_IsObject(pcf_info_list_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_pcf_info_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_pcf_info_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(pcf_info_list_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_nf_profile_parseFromJSON() failed [pcf_info_list]"); goto end; @@ -1983,9 +1997,9 @@ OpenAPI_nf_profile_t *OpenAPI_nf_profile_parseFromJSON(cJSON *nf_profileJSON) cJSON *localMapObject = bsf_info_list_local_map; if (cJSON_IsObject(bsf_info_list_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_bsf_info_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_bsf_info_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(bsf_info_list_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_nf_profile_parseFromJSON() failed [bsf_info_list]"); goto end; @@ -2016,9 +2030,9 @@ OpenAPI_nf_profile_t *OpenAPI_nf_profile_parseFromJSON(cJSON *nf_profileJSON) cJSON *localMapObject = chf_info_list_local_map; if (cJSON_IsObject(chf_info_list_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_chf_info_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_chf_info_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(chf_info_list_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_nf_profile_parseFromJSON() failed [chf_info_list]"); goto end; @@ -2063,9 +2077,9 @@ OpenAPI_nf_profile_t *OpenAPI_nf_profile_parseFromJSON(cJSON *nf_profileJSON) cJSON *localMapObject = udsf_info_list_local_map; if (cJSON_IsObject(udsf_info_list_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_udsf_info_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_udsf_info_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(udsf_info_list_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_nf_profile_parseFromJSON() failed [udsf_info_list]"); goto end; @@ -2096,9 +2110,9 @@ OpenAPI_nf_profile_t *OpenAPI_nf_profile_parseFromJSON(cJSON *nf_profileJSON) cJSON *localMapObject = pcscf_info_list_local_map; if (cJSON_IsObject(pcscf_info_list_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_pcscf_info_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_pcscf_info_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(pcscf_info_list_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_nf_profile_parseFromJSON() failed [pcscf_info_list]"); goto end; @@ -2122,9 +2136,9 @@ OpenAPI_nf_profile_t *OpenAPI_nf_profile_parseFromJSON(cJSON *nf_profileJSON) cJSON *localMapObject = hss_info_list_local_map; if (cJSON_IsObject(hss_info_list_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_hss_info_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_hss_info_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(hss_info_list_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_nf_profile_parseFromJSON() failed [hss_info_list]"); goto end; @@ -2196,9 +2210,9 @@ OpenAPI_nf_profile_t *OpenAPI_nf_profile_parseFromJSON(cJSON *nf_profileJSON) cJSON *localMapObject = nf_service_list_local_map; if (cJSON_IsObject(nf_service_list_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_nf_service_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_nf_service_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(nf_service_list_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_nf_profile_parseFromJSON() failed [nf_service_list]"); goto end; @@ -2278,7 +2292,7 @@ OpenAPI_nf_profile_t *OpenAPI_nf_profile_parseFromJSON(cJSON *nf_profileJSON) ogs_error("OpenAPI_nf_profile_parseFromJSON() failed [nf_set_id_list]"); goto end; } - OpenAPI_list_add(nf_set_id_listList , ogs_strdup_or_assert(nf_set_id_list_local->valuestring)); + OpenAPI_list_add(nf_set_id_listList , ogs_strdup(nf_set_id_list_local->valuestring)); } } @@ -2298,7 +2312,7 @@ OpenAPI_nf_profile_t *OpenAPI_nf_profile_parseFromJSON(cJSON *nf_profileJSON) ogs_error("OpenAPI_nf_profile_parseFromJSON() failed [serving_scope]"); goto end; } - OpenAPI_list_add(serving_scopeList , ogs_strdup_or_assert(serving_scope_local->valuestring)); + OpenAPI_list_add(serving_scopeList , ogs_strdup(serving_scope_local->valuestring)); } } @@ -2370,7 +2384,7 @@ OpenAPI_nf_profile_t *OpenAPI_nf_profile_parseFromJSON(cJSON *nf_profileJSON) ogs_error("OpenAPI_nf_profile_parseFromJSON() failed [scp_domains]"); goto end; } - OpenAPI_list_add(scp_domainsList , ogs_strdup_or_assert(scp_domains_local->valuestring)); + OpenAPI_list_add(scp_domainsList , ogs_strdup(scp_domains_local->valuestring)); } } @@ -2382,8 +2396,8 @@ OpenAPI_nf_profile_t *OpenAPI_nf_profile_parseFromJSON(cJSON *nf_profileJSON) } nf_profile_local_var = OpenAPI_nf_profile_create ( - ogs_strdup_or_assert(nf_instance_id->valuestring), - nf_instance_name ? ogs_strdup_or_assert(nf_instance_name->valuestring) : NULL, + ogs_strdup(nf_instance_id->valuestring), + nf_instance_name ? ogs_strdup(nf_instance_name->valuestring) : NULL, nf_typeVariable, nf_statusVariable, heart_beat_timer ? true : false, @@ -2393,8 +2407,8 @@ OpenAPI_nf_profile_t *OpenAPI_nf_profile_parseFromJSON(cJSON *nf_profileJSON) s_nssais ? s_nssaisList : NULL, per_plmn_snssai_list ? per_plmn_snssai_listList : NULL, nsi_list ? nsi_listList : NULL, - fqdn ? ogs_strdup_or_assert(fqdn->valuestring) : NULL, - inter_plmn_fqdn ? ogs_strdup_or_assert(inter_plmn_fqdn->valuestring) : NULL, + fqdn ? ogs_strdup(fqdn->valuestring) : NULL, + inter_plmn_fqdn ? ogs_strdup(inter_plmn_fqdn->valuestring) : NULL, ipv4_addresses ? ipv4_addressesList : NULL, ipv6_addresses ? ipv6_addressesList : NULL, allowed_plmns ? allowed_plmnsList : NULL, @@ -2408,8 +2422,8 @@ OpenAPI_nf_profile_t *OpenAPI_nf_profile_parseFromJSON(cJSON *nf_profileJSON) capacity ? capacity->valuedouble : 0, load ? true : false, load ? load->valuedouble : 0, - load_time_stamp ? ogs_strdup_or_assert(load_time_stamp->valuestring) : NULL, - locality ? ogs_strdup_or_assert(locality->valuestring) : NULL, + load_time_stamp ? ogs_strdup(load_time_stamp->valuestring) : NULL, + locality ? ogs_strdup(locality->valuestring) : NULL, udr_info ? udr_info_local_nonprim : NULL, udr_info_list ? udr_info_listList : NULL, udm_info ? udm_info_local_nonprim : NULL, @@ -2436,7 +2450,7 @@ OpenAPI_nf_profile_t *OpenAPI_nf_profile_parseFromJSON(cJSON *nf_profileJSON) pcscf_info_list ? pcscf_info_listList : NULL, hss_info_list ? hss_info_listList : NULL, custom_info ? custom_info_local_object : NULL, - recovery_time ? ogs_strdup_or_assert(recovery_time->valuestring) : NULL, + recovery_time ? ogs_strdup(recovery_time->valuestring) : NULL, nf_service_persistence ? true : false, nf_service_persistence ? nf_service_persistence->valueint : 0, nf_services ? nf_servicesList : NULL, diff --git a/lib/sbi/openapi/model/nf_service.c b/lib/sbi/openapi/model/nf_service.c index b70eac051..46cb884bc 100644 --- a/lib/sbi/openapi/model/nf_service.c +++ b/lib/sbi/openapi/model/nf_service.c @@ -40,10 +40,9 @@ OpenAPI_nf_service_t *OpenAPI_nf_service_create( int oauth2_required ) { - OpenAPI_nf_service_t *nf_service_local_var = OpenAPI_malloc(sizeof(OpenAPI_nf_service_t)); - if (!nf_service_local_var) { - return NULL; - } + OpenAPI_nf_service_t *nf_service_local_var = ogs_malloc(sizeof(OpenAPI_nf_service_t)); + ogs_assert(nf_service_local_var); + nf_service_local_var->service_instance_id = service_instance_id; nf_service_local_var->service_name = service_name; nf_service_local_var->versions = versions; @@ -123,12 +122,14 @@ void OpenAPI_nf_service_free(OpenAPI_nf_service_t *nf_service) OpenAPI_list_free(nf_service->allowed_nssais); OpenAPI_list_for_each(nf_service->allowed_operations_per_nf_type, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); ogs_free(localKeyValue->value); ogs_free(localKeyValue); } OpenAPI_list_free(nf_service->allowed_operations_per_nf_type); OpenAPI_list_for_each(nf_service->allowed_operations_per_nf_instance, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); ogs_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -151,6 +152,7 @@ void OpenAPI_nf_service_free(OpenAPI_nf_service_t *nf_service) ogs_free(nf_service->vendor_id); OpenAPI_list_for_each(nf_service->supported_vendor_specific_features, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); ogs_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -752,7 +754,7 @@ OpenAPI_nf_service_t *OpenAPI_nf_service_parseFromJSON(cJSON *nf_serviceJSON) ogs_error("OpenAPI_nf_service_parseFromJSON() failed [allowed_nf_domains]"); goto end; } - OpenAPI_list_add(allowed_nf_domainsList , ogs_strdup_or_assert(allowed_nf_domains_local->valuestring)); + OpenAPI_list_add(allowed_nf_domainsList , ogs_strdup(allowed_nf_domains_local->valuestring)); } } @@ -883,7 +885,7 @@ OpenAPI_nf_service_t *OpenAPI_nf_service_parseFromJSON(cJSON *nf_serviceJSON) ogs_error("OpenAPI_nf_service_parseFromJSON() failed [nf_service_set_id_list]"); goto end; } - OpenAPI_list_add(nf_service_set_id_listList , ogs_strdup_or_assert(nf_service_set_id_list_local->valuestring)); + OpenAPI_list_add(nf_service_set_id_listList , ogs_strdup(nf_service_set_id_list_local->valuestring)); } } @@ -969,15 +971,15 @@ OpenAPI_nf_service_t *OpenAPI_nf_service_parseFromJSON(cJSON *nf_serviceJSON) } nf_service_local_var = OpenAPI_nf_service_create ( - ogs_strdup_or_assert(service_instance_id->valuestring), - ogs_strdup_or_assert(service_name->valuestring), + ogs_strdup(service_instance_id->valuestring), + ogs_strdup(service_name->valuestring), versionsList, schemeVariable, nf_service_statusVariable, - fqdn ? ogs_strdup_or_assert(fqdn->valuestring) : NULL, - inter_plmn_fqdn ? ogs_strdup_or_assert(inter_plmn_fqdn->valuestring) : NULL, + fqdn ? ogs_strdup(fqdn->valuestring) : NULL, + inter_plmn_fqdn ? ogs_strdup(inter_plmn_fqdn->valuestring) : NULL, ip_end_points ? ip_end_pointsList : NULL, - api_prefix ? ogs_strdup_or_assert(api_prefix->valuestring) : NULL, + api_prefix ? ogs_strdup(api_prefix->valuestring) : NULL, default_notification_subscriptions ? default_notification_subscriptionsList : NULL, allowed_plmns ? allowed_plmnsList : NULL, allowed_snpns ? allowed_snpnsList : NULL, @@ -992,13 +994,13 @@ OpenAPI_nf_service_t *OpenAPI_nf_service_parseFromJSON(cJSON *nf_serviceJSON) capacity ? capacity->valuedouble : 0, load ? true : false, load ? load->valuedouble : 0, - load_time_stamp ? ogs_strdup_or_assert(load_time_stamp->valuestring) : NULL, - recovery_time ? ogs_strdup_or_assert(recovery_time->valuestring) : NULL, - supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, + load_time_stamp ? ogs_strdup(load_time_stamp->valuestring) : NULL, + recovery_time ? ogs_strdup(recovery_time->valuestring) : NULL, + supported_features ? ogs_strdup(supported_features->valuestring) : NULL, nf_service_set_id_list ? nf_service_set_id_listList : NULL, s_nssais ? s_nssaisList : NULL, per_plmn_snssai_list ? per_plmn_snssai_listList : NULL, - vendor_id ? ogs_strdup_or_assert(vendor_id->valuestring) : NULL, + vendor_id ? ogs_strdup(vendor_id->valuestring) : NULL, supported_vendor_specific_features ? supported_vendor_specific_featuresList : NULL, oauth2_required ? true : false, oauth2_required ? oauth2_required->valueint : 0 diff --git a/lib/sbi/openapi/model/nf_service_set_cond.c b/lib/sbi/openapi/model/nf_service_set_cond.c index 2a2641bb3..ff24bf7b3 100644 --- a/lib/sbi/openapi/model/nf_service_set_cond.c +++ b/lib/sbi/openapi/model/nf_service_set_cond.c @@ -8,10 +8,9 @@ OpenAPI_nf_service_set_cond_t *OpenAPI_nf_service_set_cond_create( char *nf_service_set_id ) { - OpenAPI_nf_service_set_cond_t *nf_service_set_cond_local_var = OpenAPI_malloc(sizeof(OpenAPI_nf_service_set_cond_t)); - if (!nf_service_set_cond_local_var) { - return NULL; - } + OpenAPI_nf_service_set_cond_t *nf_service_set_cond_local_var = ogs_malloc(sizeof(OpenAPI_nf_service_set_cond_t)); + ogs_assert(nf_service_set_cond_local_var); + nf_service_set_cond_local_var->nf_service_set_id = nf_service_set_id; return nf_service_set_cond_local_var; @@ -61,7 +60,7 @@ OpenAPI_nf_service_set_cond_t *OpenAPI_nf_service_set_cond_parseFromJSON(cJSON * } nf_service_set_cond_local_var = OpenAPI_nf_service_set_cond_create ( - ogs_strdup_or_assert(nf_service_set_id->valuestring) + ogs_strdup(nf_service_set_id->valuestring) ); return nf_service_set_cond_local_var; diff --git a/lib/sbi/openapi/model/nf_service_version.c b/lib/sbi/openapi/model/nf_service_version.c index c77b953d4..e0e268e24 100644 --- a/lib/sbi/openapi/model/nf_service_version.c +++ b/lib/sbi/openapi/model/nf_service_version.c @@ -10,10 +10,9 @@ OpenAPI_nf_service_version_t *OpenAPI_nf_service_version_create( char *expiry ) { - OpenAPI_nf_service_version_t *nf_service_version_local_var = OpenAPI_malloc(sizeof(OpenAPI_nf_service_version_t)); - if (!nf_service_version_local_var) { - return NULL; - } + OpenAPI_nf_service_version_t *nf_service_version_local_var = ogs_malloc(sizeof(OpenAPI_nf_service_version_t)); + ogs_assert(nf_service_version_local_var); + nf_service_version_local_var->api_version_in_uri = api_version_in_uri; nf_service_version_local_var->api_full_version = api_full_version; nf_service_version_local_var->expiry = expiry; @@ -99,9 +98,9 @@ OpenAPI_nf_service_version_t *OpenAPI_nf_service_version_parseFromJSON(cJSON *nf } nf_service_version_local_var = OpenAPI_nf_service_version_create ( - ogs_strdup_or_assert(api_version_in_uri->valuestring), - ogs_strdup_or_assert(api_full_version->valuestring), - expiry ? ogs_strdup_or_assert(expiry->valuestring) : NULL + ogs_strdup(api_version_in_uri->valuestring), + ogs_strdup(api_full_version->valuestring), + expiry ? ogs_strdup(expiry->valuestring) : NULL ); return nf_service_version_local_var; diff --git a/lib/sbi/openapi/model/nf_set_cond.c b/lib/sbi/openapi/model/nf_set_cond.c index 1e6507df4..e38735d9c 100644 --- a/lib/sbi/openapi/model/nf_set_cond.c +++ b/lib/sbi/openapi/model/nf_set_cond.c @@ -8,10 +8,9 @@ OpenAPI_nf_set_cond_t *OpenAPI_nf_set_cond_create( char *nf_set_id ) { - OpenAPI_nf_set_cond_t *nf_set_cond_local_var = OpenAPI_malloc(sizeof(OpenAPI_nf_set_cond_t)); - if (!nf_set_cond_local_var) { - return NULL; - } + OpenAPI_nf_set_cond_t *nf_set_cond_local_var = ogs_malloc(sizeof(OpenAPI_nf_set_cond_t)); + ogs_assert(nf_set_cond_local_var); + nf_set_cond_local_var->nf_set_id = nf_set_id; return nf_set_cond_local_var; @@ -61,7 +60,7 @@ OpenAPI_nf_set_cond_t *OpenAPI_nf_set_cond_parseFromJSON(cJSON *nf_set_condJSON) } nf_set_cond_local_var = OpenAPI_nf_set_cond_create ( - ogs_strdup_or_assert(nf_set_id->valuestring) + ogs_strdup(nf_set_id->valuestring) ); return nf_set_cond_local_var; diff --git a/lib/sbi/openapi/model/nf_type_cond.c b/lib/sbi/openapi/model/nf_type_cond.c index 4e084ce11..6550c5a28 100644 --- a/lib/sbi/openapi/model/nf_type_cond.c +++ b/lib/sbi/openapi/model/nf_type_cond.c @@ -8,10 +8,9 @@ OpenAPI_nf_type_cond_t *OpenAPI_nf_type_cond_create( OpenAPI_nf_type_e nf_type ) { - OpenAPI_nf_type_cond_t *nf_type_cond_local_var = OpenAPI_malloc(sizeof(OpenAPI_nf_type_cond_t)); - if (!nf_type_cond_local_var) { - return NULL; - } + OpenAPI_nf_type_cond_t *nf_type_cond_local_var = ogs_malloc(sizeof(OpenAPI_nf_type_cond_t)); + ogs_assert(nf_type_cond_local_var); + nf_type_cond_local_var->nf_type = nf_type; return nf_type_cond_local_var; diff --git a/lib/sbi/openapi/model/ng_ap_cause.c b/lib/sbi/openapi/model/ng_ap_cause.c index bf443d2df..898a3d908 100644 --- a/lib/sbi/openapi/model/ng_ap_cause.c +++ b/lib/sbi/openapi/model/ng_ap_cause.c @@ -9,10 +9,9 @@ OpenAPI_ng_ap_cause_t *OpenAPI_ng_ap_cause_create( int value ) { - OpenAPI_ng_ap_cause_t *ng_ap_cause_local_var = OpenAPI_malloc(sizeof(OpenAPI_ng_ap_cause_t)); - if (!ng_ap_cause_local_var) { - return NULL; - } + OpenAPI_ng_ap_cause_t *ng_ap_cause_local_var = ogs_malloc(sizeof(OpenAPI_ng_ap_cause_t)); + ogs_assert(ng_ap_cause_local_var); + ng_ap_cause_local_var->group = group; ng_ap_cause_local_var->value = value; diff --git a/lib/sbi/openapi/model/ng_ksi.c b/lib/sbi/openapi/model/ng_ksi.c index 9bee232b9..c6449bf58 100644 --- a/lib/sbi/openapi/model/ng_ksi.c +++ b/lib/sbi/openapi/model/ng_ksi.c @@ -9,10 +9,9 @@ OpenAPI_ng_ksi_t *OpenAPI_ng_ksi_create( int ksi ) { - OpenAPI_ng_ksi_t *ng_ksi_local_var = OpenAPI_malloc(sizeof(OpenAPI_ng_ksi_t)); - if (!ng_ksi_local_var) { - return NULL; - } + OpenAPI_ng_ksi_t *ng_ksi_local_var = ogs_malloc(sizeof(OpenAPI_ng_ksi_t)); + ogs_assert(ng_ksi_local_var); + ng_ksi_local_var->tsc = tsc; ng_ksi_local_var->ksi = ksi; diff --git a/lib/sbi/openapi/model/ng_ran_target_id.c b/lib/sbi/openapi/model/ng_ran_target_id.c index 53368bc43..4ad11eeb5 100644 --- a/lib/sbi/openapi/model/ng_ran_target_id.c +++ b/lib/sbi/openapi/model/ng_ran_target_id.c @@ -9,10 +9,9 @@ OpenAPI_ng_ran_target_id_t *OpenAPI_ng_ran_target_id_create( OpenAPI_tai_t *tai ) { - OpenAPI_ng_ran_target_id_t *ng_ran_target_id_local_var = OpenAPI_malloc(sizeof(OpenAPI_ng_ran_target_id_t)); - if (!ng_ran_target_id_local_var) { - return NULL; - } + OpenAPI_ng_ran_target_id_t *ng_ran_target_id_local_var = ogs_malloc(sizeof(OpenAPI_ng_ran_target_id_t)); + ogs_assert(ng_ran_target_id_local_var); + ng_ran_target_id_local_var->ran_node_id = ran_node_id; ng_ran_target_id_local_var->tai = tai; diff --git a/lib/sbi/openapi/model/nidd_information.c b/lib/sbi/openapi/model/nidd_information.c index d6f836f0d..94e8b8668 100644 --- a/lib/sbi/openapi/model/nidd_information.c +++ b/lib/sbi/openapi/model/nidd_information.c @@ -10,10 +10,9 @@ OpenAPI_nidd_information_t *OpenAPI_nidd_information_create( char *ext_group_id ) { - OpenAPI_nidd_information_t *nidd_information_local_var = OpenAPI_malloc(sizeof(OpenAPI_nidd_information_t)); - if (!nidd_information_local_var) { - return NULL; - } + OpenAPI_nidd_information_t *nidd_information_local_var = ogs_malloc(sizeof(OpenAPI_nidd_information_t)); + ogs_assert(nidd_information_local_var); + nidd_information_local_var->af_id = af_id; nidd_information_local_var->gpsi = gpsi; nidd_information_local_var->ext_group_id = ext_group_id; @@ -99,9 +98,9 @@ OpenAPI_nidd_information_t *OpenAPI_nidd_information_parseFromJSON(cJSON *nidd_i } nidd_information_local_var = OpenAPI_nidd_information_create ( - ogs_strdup_or_assert(af_id->valuestring), - gpsi ? ogs_strdup_or_assert(gpsi->valuestring) : NULL, - ext_group_id ? ogs_strdup_or_assert(ext_group_id->valuestring) : NULL + ogs_strdup(af_id->valuestring), + gpsi ? ogs_strdup(gpsi->valuestring) : NULL, + ext_group_id ? ogs_strdup(ext_group_id->valuestring) : NULL ); return nidd_information_local_var; diff --git a/lib/sbi/openapi/model/nidd_information_1.c b/lib/sbi/openapi/model/nidd_information_1.c index b7cf9f279..bedb81574 100644 --- a/lib/sbi/openapi/model/nidd_information_1.c +++ b/lib/sbi/openapi/model/nidd_information_1.c @@ -10,10 +10,9 @@ OpenAPI_nidd_information_1_t *OpenAPI_nidd_information_1_create( char *ext_group_id ) { - OpenAPI_nidd_information_1_t *nidd_information_1_local_var = OpenAPI_malloc(sizeof(OpenAPI_nidd_information_1_t)); - if (!nidd_information_1_local_var) { - return NULL; - } + OpenAPI_nidd_information_1_t *nidd_information_1_local_var = ogs_malloc(sizeof(OpenAPI_nidd_information_1_t)); + ogs_assert(nidd_information_1_local_var); + nidd_information_1_local_var->af_id = af_id; nidd_information_1_local_var->gpsi = gpsi; nidd_information_1_local_var->ext_group_id = ext_group_id; @@ -99,9 +98,9 @@ OpenAPI_nidd_information_1_t *OpenAPI_nidd_information_1_parseFromJSON(cJSON *ni } nidd_information_1_local_var = OpenAPI_nidd_information_1_create ( - ogs_strdup_or_assert(af_id->valuestring), - gpsi ? ogs_strdup_or_assert(gpsi->valuestring) : NULL, - ext_group_id ? ogs_strdup_or_assert(ext_group_id->valuestring) : NULL + ogs_strdup(af_id->valuestring), + gpsi ? ogs_strdup(gpsi->valuestring) : NULL, + ext_group_id ? ogs_strdup(ext_group_id->valuestring) : NULL ); return nidd_information_1_local_var; diff --git a/lib/sbi/openapi/model/non_dynamic5_qi.c b/lib/sbi/openapi/model/non_dynamic5_qi.c index 8a83d51b3..b4473c629 100644 --- a/lib/sbi/openapi/model/non_dynamic5_qi.c +++ b/lib/sbi/openapi/model/non_dynamic5_qi.c @@ -19,10 +19,9 @@ OpenAPI_non_dynamic5_qi_t *OpenAPI_non_dynamic5_qi_create( int cn_packet_delay_budget_ul ) { - OpenAPI_non_dynamic5_qi_t *non_dynamic5_qi_local_var = OpenAPI_malloc(sizeof(OpenAPI_non_dynamic5_qi_t)); - if (!non_dynamic5_qi_local_var) { - return NULL; - } + OpenAPI_non_dynamic5_qi_t *non_dynamic5_qi_local_var = ogs_malloc(sizeof(OpenAPI_non_dynamic5_qi_t)); + ogs_assert(non_dynamic5_qi_local_var); + non_dynamic5_qi_local_var->is_priority_level = is_priority_level; non_dynamic5_qi_local_var->priority_level = priority_level; non_dynamic5_qi_local_var->is_aver_window = is_aver_window; diff --git a/lib/sbi/openapi/model/non_ue_n2_info_subscription_create_data.c b/lib/sbi/openapi/model/non_ue_n2_info_subscription_create_data.c index a31556a33..ed48e3de7 100644 --- a/lib/sbi/openapi/model/non_ue_n2_info_subscription_create_data.c +++ b/lib/sbi/openapi/model/non_ue_n2_info_subscription_create_data.c @@ -13,10 +13,9 @@ OpenAPI_non_ue_n2_info_subscription_create_data_t *OpenAPI_non_ue_n2_info_subscr char *supported_features ) { - OpenAPI_non_ue_n2_info_subscription_create_data_t *non_ue_n2_info_subscription_create_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_non_ue_n2_info_subscription_create_data_t)); - if (!non_ue_n2_info_subscription_create_data_local_var) { - return NULL; - } + OpenAPI_non_ue_n2_info_subscription_create_data_t *non_ue_n2_info_subscription_create_data_local_var = ogs_malloc(sizeof(OpenAPI_non_ue_n2_info_subscription_create_data_t)); + ogs_assert(non_ue_n2_info_subscription_create_data_local_var); + non_ue_n2_info_subscription_create_data_local_var->global_ran_node_list = global_ran_node_list; non_ue_n2_info_subscription_create_data_local_var->an_type_list = an_type_list; non_ue_n2_info_subscription_create_data_local_var->n2_information_class = n2_information_class; @@ -211,9 +210,9 @@ OpenAPI_non_ue_n2_info_subscription_create_data_t *OpenAPI_non_ue_n2_info_subscr global_ran_node_list ? global_ran_node_listList : NULL, an_type_list ? an_type_listList : NULL, n2_information_classVariable, - ogs_strdup_or_assert(n2_notify_callback_uri->valuestring), - nf_id ? ogs_strdup_or_assert(nf_id->valuestring) : NULL, - supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL + ogs_strdup(n2_notify_callback_uri->valuestring), + nf_id ? ogs_strdup(nf_id->valuestring) : NULL, + supported_features ? ogs_strdup(supported_features->valuestring) : NULL ); return non_ue_n2_info_subscription_create_data_local_var; diff --git a/lib/sbi/openapi/model/non_ue_n2_info_subscription_created_data.c b/lib/sbi/openapi/model/non_ue_n2_info_subscription_created_data.c index fc9968ef2..94305621b 100644 --- a/lib/sbi/openapi/model/non_ue_n2_info_subscription_created_data.c +++ b/lib/sbi/openapi/model/non_ue_n2_info_subscription_created_data.c @@ -10,10 +10,9 @@ OpenAPI_non_ue_n2_info_subscription_created_data_t *OpenAPI_non_ue_n2_info_subsc OpenAPI_n2_information_class_e n2_information_class ) { - OpenAPI_non_ue_n2_info_subscription_created_data_t *non_ue_n2_info_subscription_created_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_non_ue_n2_info_subscription_created_data_t)); - if (!non_ue_n2_info_subscription_created_data_local_var) { - return NULL; - } + OpenAPI_non_ue_n2_info_subscription_created_data_t *non_ue_n2_info_subscription_created_data_local_var = ogs_malloc(sizeof(OpenAPI_non_ue_n2_info_subscription_created_data_t)); + ogs_assert(non_ue_n2_info_subscription_created_data_local_var); + non_ue_n2_info_subscription_created_data_local_var->n2_notify_subscription_id = n2_notify_subscription_id; non_ue_n2_info_subscription_created_data_local_var->supported_features = supported_features; non_ue_n2_info_subscription_created_data_local_var->n2_information_class = n2_information_class; @@ -100,8 +99,8 @@ OpenAPI_non_ue_n2_info_subscription_created_data_t *OpenAPI_non_ue_n2_info_subsc } non_ue_n2_info_subscription_created_data_local_var = OpenAPI_non_ue_n2_info_subscription_created_data_create ( - ogs_strdup_or_assert(n2_notify_subscription_id->valuestring), - supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, + ogs_strdup(n2_notify_subscription_id->valuestring), + supported_features ? ogs_strdup(supported_features->valuestring) : NULL, n2_information_class ? n2_information_classVariable : 0 ); diff --git a/lib/sbi/openapi/model/notif_condition.c b/lib/sbi/openapi/model/notif_condition.c index 0d392cc47..130f1e7ad 100644 --- a/lib/sbi/openapi/model/notif_condition.c +++ b/lib/sbi/openapi/model/notif_condition.c @@ -9,10 +9,9 @@ OpenAPI_notif_condition_t *OpenAPI_notif_condition_create( OpenAPI_list_t *unmonitored_attributes ) { - OpenAPI_notif_condition_t *notif_condition_local_var = OpenAPI_malloc(sizeof(OpenAPI_notif_condition_t)); - if (!notif_condition_local_var) { - return NULL; - } + OpenAPI_notif_condition_t *notif_condition_local_var = ogs_malloc(sizeof(OpenAPI_notif_condition_t)); + ogs_assert(notif_condition_local_var); + notif_condition_local_var->monitored_attributes = monitored_attributes; notif_condition_local_var->unmonitored_attributes = unmonitored_attributes; @@ -101,7 +100,7 @@ OpenAPI_notif_condition_t *OpenAPI_notif_condition_parseFromJSON(cJSON *notif_co ogs_error("OpenAPI_notif_condition_parseFromJSON() failed [monitored_attributes]"); goto end; } - OpenAPI_list_add(monitored_attributesList , ogs_strdup_or_assert(monitored_attributes_local->valuestring)); + OpenAPI_list_add(monitored_attributesList , ogs_strdup(monitored_attributes_local->valuestring)); } } @@ -121,7 +120,7 @@ OpenAPI_notif_condition_t *OpenAPI_notif_condition_parseFromJSON(cJSON *notif_co ogs_error("OpenAPI_notif_condition_parseFromJSON() failed [unmonitored_attributes]"); goto end; } - OpenAPI_list_add(unmonitored_attributesList , ogs_strdup_or_assert(unmonitored_attributes_local->valuestring)); + OpenAPI_list_add(unmonitored_attributesList , ogs_strdup(unmonitored_attributes_local->valuestring)); } } diff --git a/lib/sbi/openapi/model/notification_data.c b/lib/sbi/openapi/model/notification_data.c index 81a2edbd1..30c7808f6 100644 --- a/lib/sbi/openapi/model/notification_data.c +++ b/lib/sbi/openapi/model/notification_data.c @@ -12,10 +12,9 @@ OpenAPI_notification_data_t *OpenAPI_notification_data_create( OpenAPI_condition_event_type_e condition_event ) { - OpenAPI_notification_data_t *notification_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_notification_data_t)); - if (!notification_data_local_var) { - return NULL; - } + OpenAPI_notification_data_t *notification_data_local_var = ogs_malloc(sizeof(OpenAPI_notification_data_t)); + ogs_assert(notification_data_local_var); + notification_data_local_var->event = event; notification_data_local_var->nf_instance_uri = nf_instance_uri; notification_data_local_var->nf_profile = nf_profile; @@ -174,7 +173,7 @@ OpenAPI_notification_data_t *OpenAPI_notification_data_parseFromJSON(cJSON *noti notification_data_local_var = OpenAPI_notification_data_create ( eventVariable, - ogs_strdup_or_assert(nf_instance_uri->valuestring), + ogs_strdup(nf_instance_uri->valuestring), nf_profile ? nf_profile_local_nonprim : NULL, profile_changes ? profile_changesList : NULL, condition_event ? condition_eventVariable : 0 diff --git a/lib/sbi/openapi/model/notification_item.c b/lib/sbi/openapi/model/notification_item.c index 50179b2af..0c2e1a81b 100644 --- a/lib/sbi/openapi/model/notification_item.c +++ b/lib/sbi/openapi/model/notification_item.c @@ -9,10 +9,9 @@ OpenAPI_notification_item_t *OpenAPI_notification_item_create( OpenAPI_list_t *notif_items ) { - OpenAPI_notification_item_t *notification_item_local_var = OpenAPI_malloc(sizeof(OpenAPI_notification_item_t)); - if (!notification_item_local_var) { - return NULL; - } + OpenAPI_notification_item_t *notification_item_local_var = ogs_malloc(sizeof(OpenAPI_notification_item_t)); + ogs_assert(notification_item_local_var); + notification_item_local_var->resource_id = resource_id; notification_item_local_var->notif_items = notif_items; @@ -110,7 +109,7 @@ OpenAPI_notification_item_t *OpenAPI_notification_item_parseFromJSON(cJSON *noti } notification_item_local_var = OpenAPI_notification_item_create ( - ogs_strdup_or_assert(resource_id->valuestring), + ogs_strdup(resource_id->valuestring), notif_itemsList ); diff --git a/lib/sbi/openapi/model/notify_item.c b/lib/sbi/openapi/model/notify_item.c index a62526751..408f8c5af 100644 --- a/lib/sbi/openapi/model/notify_item.c +++ b/lib/sbi/openapi/model/notify_item.c @@ -9,10 +9,9 @@ OpenAPI_notify_item_t *OpenAPI_notify_item_create( OpenAPI_list_t *changes ) { - OpenAPI_notify_item_t *notify_item_local_var = OpenAPI_malloc(sizeof(OpenAPI_notify_item_t)); - if (!notify_item_local_var) { - return NULL; - } + OpenAPI_notify_item_t *notify_item_local_var = ogs_malloc(sizeof(OpenAPI_notify_item_t)); + ogs_assert(notify_item_local_var); + notify_item_local_var->resource_id = resource_id; notify_item_local_var->changes = changes; @@ -110,7 +109,7 @@ OpenAPI_notify_item_t *OpenAPI_notify_item_parseFromJSON(cJSON *notify_itemJSON) } notify_item_local_var = OpenAPI_notify_item_create ( - ogs_strdup_or_assert(resource_id->valuestring), + ogs_strdup(resource_id->valuestring), changesList ); diff --git a/lib/sbi/openapi/model/npn_access_info.c b/lib/sbi/openapi/model/npn_access_info.c index 48cac145c..6508a332c 100644 --- a/lib/sbi/openapi/model/npn_access_info.c +++ b/lib/sbi/openapi/model/npn_access_info.c @@ -8,10 +8,9 @@ OpenAPI_npn_access_info_t *OpenAPI_npn_access_info_create( OpenAPI_list_t *cell_cag_info ) { - OpenAPI_npn_access_info_t *npn_access_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_npn_access_info_t)); - if (!npn_access_info_local_var) { - return NULL; - } + OpenAPI_npn_access_info_t *npn_access_info_local_var = ogs_malloc(sizeof(OpenAPI_npn_access_info_t)); + ogs_assert(npn_access_info_local_var); + npn_access_info_local_var->cell_cag_info = cell_cag_info; return npn_access_info_local_var; @@ -79,7 +78,7 @@ OpenAPI_npn_access_info_t *OpenAPI_npn_access_info_parseFromJSON(cJSON *npn_acce ogs_error("OpenAPI_npn_access_info_parseFromJSON() failed [cell_cag_info]"); goto end; } - OpenAPI_list_add(cell_cag_infoList , ogs_strdup_or_assert(cell_cag_info_local->valuestring)); + OpenAPI_list_add(cell_cag_infoList , ogs_strdup(cell_cag_info_local->valuestring)); } } diff --git a/lib/sbi/openapi/model/nr_location.c b/lib/sbi/openapi/model/nr_location.c index fb817eda6..2a95046b7 100644 --- a/lib/sbi/openapi/model/nr_location.c +++ b/lib/sbi/openapi/model/nr_location.c @@ -15,10 +15,9 @@ OpenAPI_nr_location_t *OpenAPI_nr_location_create( OpenAPI_global_ran_node_id_t *global_gnb_id ) { - OpenAPI_nr_location_t *nr_location_local_var = OpenAPI_malloc(sizeof(OpenAPI_nr_location_t)); - if (!nr_location_local_var) { - return NULL; - } + OpenAPI_nr_location_t *nr_location_local_var = ogs_malloc(sizeof(OpenAPI_nr_location_t)); + ogs_assert(nr_location_local_var); + nr_location_local_var->tai = tai; nr_location_local_var->ncgi = ncgi; nr_location_local_var->is_age_of_location_information = is_age_of_location_information; @@ -192,9 +191,9 @@ OpenAPI_nr_location_t *OpenAPI_nr_location_parseFromJSON(cJSON *nr_locationJSON) ncgi_local_nonprim, age_of_location_information ? true : false, age_of_location_information ? age_of_location_information->valuedouble : 0, - ue_location_timestamp ? ogs_strdup_or_assert(ue_location_timestamp->valuestring) : NULL, - geographical_information ? ogs_strdup_or_assert(geographical_information->valuestring) : NULL, - geodetic_information ? ogs_strdup_or_assert(geodetic_information->valuestring) : NULL, + ue_location_timestamp ? ogs_strdup(ue_location_timestamp->valuestring) : NULL, + geographical_information ? ogs_strdup(geographical_information->valuestring) : NULL, + geodetic_information ? ogs_strdup(geodetic_information->valuestring) : NULL, global_gnb_id ? global_gnb_id_local_nonprim : NULL ); diff --git a/lib/sbi/openapi/model/nr_v2x_auth.c b/lib/sbi/openapi/model/nr_v2x_auth.c index d8aa0426f..6dc64bbf9 100644 --- a/lib/sbi/openapi/model/nr_v2x_auth.c +++ b/lib/sbi/openapi/model/nr_v2x_auth.c @@ -9,10 +9,9 @@ OpenAPI_nr_v2x_auth_t *OpenAPI_nr_v2x_auth_create( OpenAPI_ue_auth_e pedestrian_ue_auth ) { - OpenAPI_nr_v2x_auth_t *nr_v2x_auth_local_var = OpenAPI_malloc(sizeof(OpenAPI_nr_v2x_auth_t)); - if (!nr_v2x_auth_local_var) { - return NULL; - } + OpenAPI_nr_v2x_auth_t *nr_v2x_auth_local_var = ogs_malloc(sizeof(OpenAPI_nr_v2x_auth_t)); + ogs_assert(nr_v2x_auth_local_var); + nr_v2x_auth_local_var->vehicle_ue_auth = vehicle_ue_auth; nr_v2x_auth_local_var->pedestrian_ue_auth = pedestrian_ue_auth; diff --git a/lib/sbi/openapi/model/nr_v2x_auth_1.c b/lib/sbi/openapi/model/nr_v2x_auth_1.c index b93b0c881..cd7df49b7 100644 --- a/lib/sbi/openapi/model/nr_v2x_auth_1.c +++ b/lib/sbi/openapi/model/nr_v2x_auth_1.c @@ -9,10 +9,9 @@ OpenAPI_nr_v2x_auth_1_t *OpenAPI_nr_v2x_auth_1_create( OpenAPI_ue_auth_e pedestrian_ue_auth ) { - OpenAPI_nr_v2x_auth_1_t *nr_v2x_auth_1_local_var = OpenAPI_malloc(sizeof(OpenAPI_nr_v2x_auth_1_t)); - if (!nr_v2x_auth_1_local_var) { - return NULL; - } + OpenAPI_nr_v2x_auth_1_t *nr_v2x_auth_1_local_var = ogs_malloc(sizeof(OpenAPI_nr_v2x_auth_1_t)); + ogs_assert(nr_v2x_auth_1_local_var); + nr_v2x_auth_1_local_var->vehicle_ue_auth = vehicle_ue_auth; nr_v2x_auth_1_local_var->pedestrian_ue_auth = pedestrian_ue_auth; diff --git a/lib/sbi/openapi/model/nrf_info.c b/lib/sbi/openapi/model/nrf_info.c index fe37da8e6..ebac32ea3 100644 --- a/lib/sbi/openapi/model/nrf_info.c +++ b/lib/sbi/openapi/model/nrf_info.c @@ -35,10 +35,9 @@ OpenAPI_nrf_info_t *OpenAPI_nrf_info_create( OpenAPI_list_t* served_scp_info_list ) { - OpenAPI_nrf_info_t *nrf_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_nrf_info_t)); - if (!nrf_info_local_var) { - return NULL; - } + OpenAPI_nrf_info_t *nrf_info_local_var = ogs_malloc(sizeof(OpenAPI_nrf_info_t)); + ogs_assert(nrf_info_local_var); + nrf_info_local_var->served_udr_info = served_udr_info; nrf_info_local_var->served_udr_info_list = served_udr_info_list; nrf_info_local_var->served_udm_info = served_udm_info; @@ -79,168 +78,196 @@ void OpenAPI_nrf_info_free(OpenAPI_nrf_info_t *nrf_info) OpenAPI_lnode_t *node; OpenAPI_list_for_each(nrf_info->served_udr_info, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_udr_info_free(localKeyValue->value); ogs_free(localKeyValue); } OpenAPI_list_free(nrf_info->served_udr_info); OpenAPI_list_for_each(nrf_info->served_udr_info_list, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); ogs_free(localKeyValue->value); ogs_free(localKeyValue); } OpenAPI_list_free(nrf_info->served_udr_info_list); OpenAPI_list_for_each(nrf_info->served_udm_info, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_udm_info_free(localKeyValue->value); ogs_free(localKeyValue); } OpenAPI_list_free(nrf_info->served_udm_info); OpenAPI_list_for_each(nrf_info->served_udm_info_list, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); ogs_free(localKeyValue->value); ogs_free(localKeyValue); } OpenAPI_list_free(nrf_info->served_udm_info_list); OpenAPI_list_for_each(nrf_info->served_ausf_info, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_ausf_info_free(localKeyValue->value); ogs_free(localKeyValue); } OpenAPI_list_free(nrf_info->served_ausf_info); OpenAPI_list_for_each(nrf_info->served_ausf_info_list, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); ogs_free(localKeyValue->value); ogs_free(localKeyValue); } OpenAPI_list_free(nrf_info->served_ausf_info_list); OpenAPI_list_for_each(nrf_info->served_amf_info, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_amf_info_free(localKeyValue->value); ogs_free(localKeyValue); } OpenAPI_list_free(nrf_info->served_amf_info); OpenAPI_list_for_each(nrf_info->served_amf_info_list, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); ogs_free(localKeyValue->value); ogs_free(localKeyValue); } OpenAPI_list_free(nrf_info->served_amf_info_list); OpenAPI_list_for_each(nrf_info->served_smf_info, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_smf_info_free(localKeyValue->value); ogs_free(localKeyValue); } OpenAPI_list_free(nrf_info->served_smf_info); OpenAPI_list_for_each(nrf_info->served_smf_info_list, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); ogs_free(localKeyValue->value); ogs_free(localKeyValue); } OpenAPI_list_free(nrf_info->served_smf_info_list); OpenAPI_list_for_each(nrf_info->served_upf_info, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_upf_info_free(localKeyValue->value); ogs_free(localKeyValue); } OpenAPI_list_free(nrf_info->served_upf_info); OpenAPI_list_for_each(nrf_info->served_upf_info_list, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); ogs_free(localKeyValue->value); ogs_free(localKeyValue); } OpenAPI_list_free(nrf_info->served_upf_info_list); OpenAPI_list_for_each(nrf_info->served_pcf_info, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_pcf_info_free(localKeyValue->value); ogs_free(localKeyValue); } OpenAPI_list_free(nrf_info->served_pcf_info); OpenAPI_list_for_each(nrf_info->served_pcf_info_list, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); ogs_free(localKeyValue->value); ogs_free(localKeyValue); } OpenAPI_list_free(nrf_info->served_pcf_info_list); OpenAPI_list_for_each(nrf_info->served_bsf_info, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_bsf_info_free(localKeyValue->value); ogs_free(localKeyValue); } OpenAPI_list_free(nrf_info->served_bsf_info); OpenAPI_list_for_each(nrf_info->served_bsf_info_list, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); ogs_free(localKeyValue->value); ogs_free(localKeyValue); } OpenAPI_list_free(nrf_info->served_bsf_info_list); OpenAPI_list_for_each(nrf_info->served_chf_info, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_chf_info_free(localKeyValue->value); ogs_free(localKeyValue); } OpenAPI_list_free(nrf_info->served_chf_info); OpenAPI_list_for_each(nrf_info->served_chf_info_list, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); ogs_free(localKeyValue->value); ogs_free(localKeyValue); } OpenAPI_list_free(nrf_info->served_chf_info_list); OpenAPI_list_for_each(nrf_info->served_nef_info, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_nef_info_free(localKeyValue->value); ogs_free(localKeyValue); } OpenAPI_list_free(nrf_info->served_nef_info); OpenAPI_list_for_each(nrf_info->served_nwdaf_info, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_nwdaf_info_free(localKeyValue->value); ogs_free(localKeyValue); } OpenAPI_list_free(nrf_info->served_nwdaf_info); OpenAPI_list_for_each(nrf_info->served_pcscf_info_list, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); ogs_free(localKeyValue->value); ogs_free(localKeyValue); } OpenAPI_list_free(nrf_info->served_pcscf_info_list); OpenAPI_list_for_each(nrf_info->served_gmlc_info, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_gmlc_info_free(localKeyValue->value); ogs_free(localKeyValue); } OpenAPI_list_free(nrf_info->served_gmlc_info); OpenAPI_list_for_each(nrf_info->served_lmf_info, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_lmf_info_free(localKeyValue->value); ogs_free(localKeyValue); } OpenAPI_list_free(nrf_info->served_lmf_info); OpenAPI_list_for_each(nrf_info->served_nf_info, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_nf_info_free(localKeyValue->value); ogs_free(localKeyValue); } OpenAPI_list_free(nrf_info->served_nf_info); OpenAPI_list_for_each(nrf_info->served_hss_info_list, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); ogs_free(localKeyValue->value); ogs_free(localKeyValue); } OpenAPI_list_free(nrf_info->served_hss_info_list); OpenAPI_list_for_each(nrf_info->served_udsf_info, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_udsf_info_free(localKeyValue->value); ogs_free(localKeyValue); } OpenAPI_list_free(nrf_info->served_udsf_info); OpenAPI_list_for_each(nrf_info->served_udsf_info_list, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); ogs_free(localKeyValue->value); ogs_free(localKeyValue); } OpenAPI_list_free(nrf_info->served_udsf_info_list); OpenAPI_list_for_each(nrf_info->served_scp_info_list, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_scp_info_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -828,9 +855,9 @@ OpenAPI_nrf_info_t *OpenAPI_nrf_info_parseFromJSON(cJSON *nrf_infoJSON) cJSON *localMapObject = served_udr_info_local_map; if (cJSON_IsObject(served_udr_info_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_udr_info_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_udr_info_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(served_udr_info_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_nrf_info_parseFromJSON() failed [served_udr_info]"); goto end; @@ -871,9 +898,9 @@ OpenAPI_nrf_info_t *OpenAPI_nrf_info_parseFromJSON(cJSON *nrf_infoJSON) cJSON *localMapObject = served_udm_info_local_map; if (cJSON_IsObject(served_udm_info_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_udm_info_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_udm_info_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(served_udm_info_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_nrf_info_parseFromJSON() failed [served_udm_info]"); goto end; @@ -914,9 +941,9 @@ OpenAPI_nrf_info_t *OpenAPI_nrf_info_parseFromJSON(cJSON *nrf_infoJSON) cJSON *localMapObject = served_ausf_info_local_map; if (cJSON_IsObject(served_ausf_info_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_ausf_info_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_ausf_info_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(served_ausf_info_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_nrf_info_parseFromJSON() failed [served_ausf_info]"); goto end; @@ -957,9 +984,9 @@ OpenAPI_nrf_info_t *OpenAPI_nrf_info_parseFromJSON(cJSON *nrf_infoJSON) cJSON *localMapObject = served_amf_info_local_map; if (cJSON_IsObject(served_amf_info_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_amf_info_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_amf_info_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(served_amf_info_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_nrf_info_parseFromJSON() failed [served_amf_info]"); goto end; @@ -1000,9 +1027,9 @@ OpenAPI_nrf_info_t *OpenAPI_nrf_info_parseFromJSON(cJSON *nrf_infoJSON) cJSON *localMapObject = served_smf_info_local_map; if (cJSON_IsObject(served_smf_info_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_smf_info_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_smf_info_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(served_smf_info_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_nrf_info_parseFromJSON() failed [served_smf_info]"); goto end; @@ -1043,9 +1070,9 @@ OpenAPI_nrf_info_t *OpenAPI_nrf_info_parseFromJSON(cJSON *nrf_infoJSON) cJSON *localMapObject = served_upf_info_local_map; if (cJSON_IsObject(served_upf_info_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_upf_info_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_upf_info_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(served_upf_info_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_nrf_info_parseFromJSON() failed [served_upf_info]"); goto end; @@ -1086,9 +1113,9 @@ OpenAPI_nrf_info_t *OpenAPI_nrf_info_parseFromJSON(cJSON *nrf_infoJSON) cJSON *localMapObject = served_pcf_info_local_map; if (cJSON_IsObject(served_pcf_info_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_pcf_info_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_pcf_info_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(served_pcf_info_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_nrf_info_parseFromJSON() failed [served_pcf_info]"); goto end; @@ -1129,9 +1156,9 @@ OpenAPI_nrf_info_t *OpenAPI_nrf_info_parseFromJSON(cJSON *nrf_infoJSON) cJSON *localMapObject = served_bsf_info_local_map; if (cJSON_IsObject(served_bsf_info_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_bsf_info_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_bsf_info_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(served_bsf_info_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_nrf_info_parseFromJSON() failed [served_bsf_info]"); goto end; @@ -1172,9 +1199,9 @@ OpenAPI_nrf_info_t *OpenAPI_nrf_info_parseFromJSON(cJSON *nrf_infoJSON) cJSON *localMapObject = served_chf_info_local_map; if (cJSON_IsObject(served_chf_info_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_chf_info_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_chf_info_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(served_chf_info_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_nrf_info_parseFromJSON() failed [served_chf_info]"); goto end; @@ -1215,9 +1242,9 @@ OpenAPI_nrf_info_t *OpenAPI_nrf_info_parseFromJSON(cJSON *nrf_infoJSON) cJSON *localMapObject = served_nef_info_local_map; if (cJSON_IsObject(served_nef_info_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_nef_info_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_nef_info_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(served_nef_info_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_nrf_info_parseFromJSON() failed [served_nef_info]"); goto end; @@ -1241,9 +1268,9 @@ OpenAPI_nrf_info_t *OpenAPI_nrf_info_parseFromJSON(cJSON *nrf_infoJSON) cJSON *localMapObject = served_nwdaf_info_local_map; if (cJSON_IsObject(served_nwdaf_info_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_nwdaf_info_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_nwdaf_info_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(served_nwdaf_info_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_nrf_info_parseFromJSON() failed [served_nwdaf_info]"); goto end; @@ -1284,9 +1311,9 @@ OpenAPI_nrf_info_t *OpenAPI_nrf_info_parseFromJSON(cJSON *nrf_infoJSON) cJSON *localMapObject = served_gmlc_info_local_map; if (cJSON_IsObject(served_gmlc_info_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_gmlc_info_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_gmlc_info_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(served_gmlc_info_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_nrf_info_parseFromJSON() failed [served_gmlc_info]"); goto end; @@ -1310,9 +1337,9 @@ OpenAPI_nrf_info_t *OpenAPI_nrf_info_parseFromJSON(cJSON *nrf_infoJSON) cJSON *localMapObject = served_lmf_info_local_map; if (cJSON_IsObject(served_lmf_info_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_lmf_info_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_lmf_info_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(served_lmf_info_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_nrf_info_parseFromJSON() failed [served_lmf_info]"); goto end; @@ -1336,9 +1363,9 @@ OpenAPI_nrf_info_t *OpenAPI_nrf_info_parseFromJSON(cJSON *nrf_infoJSON) cJSON *localMapObject = served_nf_info_local_map; if (cJSON_IsObject(served_nf_info_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_nf_info_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_nf_info_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(served_nf_info_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_nrf_info_parseFromJSON() failed [served_nf_info]"); goto end; @@ -1379,9 +1406,9 @@ OpenAPI_nrf_info_t *OpenAPI_nrf_info_parseFromJSON(cJSON *nrf_infoJSON) cJSON *localMapObject = served_udsf_info_local_map; if (cJSON_IsObject(served_udsf_info_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_udsf_info_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_udsf_info_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(served_udsf_info_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_nrf_info_parseFromJSON() failed [served_udsf_info]"); goto end; @@ -1422,9 +1449,9 @@ OpenAPI_nrf_info_t *OpenAPI_nrf_info_parseFromJSON(cJSON *nrf_infoJSON) cJSON *localMapObject = served_scp_info_list_local_map; if (cJSON_IsObject(served_scp_info_list_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_scp_info_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_scp_info_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(served_scp_info_list_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_nrf_info_parseFromJSON() failed [served_scp_info_list]"); goto end; diff --git a/lib/sbi/openapi/model/nrppa_information.c b/lib/sbi/openapi/model/nrppa_information.c index 6b92d0464..0bbaad769 100644 --- a/lib/sbi/openapi/model/nrppa_information.c +++ b/lib/sbi/openapi/model/nrppa_information.c @@ -10,10 +10,9 @@ OpenAPI_nrppa_information_t *OpenAPI_nrppa_information_create( char *service_instance_id ) { - OpenAPI_nrppa_information_t *nrppa_information_local_var = OpenAPI_malloc(sizeof(OpenAPI_nrppa_information_t)); - if (!nrppa_information_local_var) { - return NULL; - } + OpenAPI_nrppa_information_t *nrppa_information_local_var = ogs_malloc(sizeof(OpenAPI_nrppa_information_t)); + ogs_assert(nrppa_information_local_var); + nrppa_information_local_var->nf_id = nf_id; nrppa_information_local_var->nrppa_pdu = nrppa_pdu; nrppa_information_local_var->service_instance_id = service_instance_id; @@ -103,9 +102,9 @@ OpenAPI_nrppa_information_t *OpenAPI_nrppa_information_parseFromJSON(cJSON *nrpp } nrppa_information_local_var = OpenAPI_nrppa_information_create ( - ogs_strdup_or_assert(nf_id->valuestring), + ogs_strdup(nf_id->valuestring), nrppa_pdu_local_nonprim, - service_instance_id ? ogs_strdup_or_assert(service_instance_id->valuestring) : NULL + service_instance_id ? ogs_strdup(service_instance_id->valuestring) : NULL ); return nrppa_information_local_var; diff --git a/lib/sbi/openapi/model/nsi_information.c b/lib/sbi/openapi/model/nsi_information.c index eb24b9f34..04efbe6ea 100644 --- a/lib/sbi/openapi/model/nsi_information.c +++ b/lib/sbi/openapi/model/nsi_information.c @@ -11,10 +11,9 @@ OpenAPI_nsi_information_t *OpenAPI_nsi_information_create( char *nrf_access_token_uri ) { - OpenAPI_nsi_information_t *nsi_information_local_var = OpenAPI_malloc(sizeof(OpenAPI_nsi_information_t)); - if (!nsi_information_local_var) { - return NULL; - } + OpenAPI_nsi_information_t *nsi_information_local_var = ogs_malloc(sizeof(OpenAPI_nsi_information_t)); + ogs_assert(nsi_information_local_var); + nsi_information_local_var->nrf_id = nrf_id; nsi_information_local_var->nsi_id = nsi_id; nsi_information_local_var->nrf_nf_mgt_uri = nrf_nf_mgt_uri; @@ -118,10 +117,10 @@ OpenAPI_nsi_information_t *OpenAPI_nsi_information_parseFromJSON(cJSON *nsi_info } nsi_information_local_var = OpenAPI_nsi_information_create ( - ogs_strdup_or_assert(nrf_id->valuestring), - nsi_id ? ogs_strdup_or_assert(nsi_id->valuestring) : NULL, - nrf_nf_mgt_uri ? ogs_strdup_or_assert(nrf_nf_mgt_uri->valuestring) : NULL, - nrf_access_token_uri ? ogs_strdup_or_assert(nrf_access_token_uri->valuestring) : NULL + ogs_strdup(nrf_id->valuestring), + nsi_id ? ogs_strdup(nsi_id->valuestring) : NULL, + nrf_nf_mgt_uri ? ogs_strdup(nrf_nf_mgt_uri->valuestring) : NULL, + nrf_access_token_uri ? ogs_strdup(nrf_access_token_uri->valuestring) : NULL ); return nsi_information_local_var; diff --git a/lib/sbi/openapi/model/nssaa_status.c b/lib/sbi/openapi/model/nssaa_status.c index f527cd4bd..6a63b0fa1 100644 --- a/lib/sbi/openapi/model/nssaa_status.c +++ b/lib/sbi/openapi/model/nssaa_status.c @@ -9,10 +9,9 @@ OpenAPI_nssaa_status_t *OpenAPI_nssaa_status_create( OpenAPI_auth_status_e status ) { - OpenAPI_nssaa_status_t *nssaa_status_local_var = OpenAPI_malloc(sizeof(OpenAPI_nssaa_status_t)); - if (!nssaa_status_local_var) { - return NULL; - } + OpenAPI_nssaa_status_t *nssaa_status_local_var = ogs_malloc(sizeof(OpenAPI_nssaa_status_t)); + ogs_assert(nssaa_status_local_var); + nssaa_status_local_var->snssai = snssai; nssaa_status_local_var->status = status; diff --git a/lib/sbi/openapi/model/nssai.c b/lib/sbi/openapi/model/nssai.c index 7bd0454b8..c41098e1e 100644 --- a/lib/sbi/openapi/model/nssai.c +++ b/lib/sbi/openapi/model/nssai.c @@ -12,10 +12,9 @@ OpenAPI_nssai_t *OpenAPI_nssai_create( OpenAPI_list_t* additional_snssai_data ) { - OpenAPI_nssai_t *nssai_local_var = OpenAPI_malloc(sizeof(OpenAPI_nssai_t)); - if (!nssai_local_var) { - return NULL; - } + OpenAPI_nssai_t *nssai_local_var = ogs_malloc(sizeof(OpenAPI_nssai_t)); + ogs_assert(nssai_local_var); + nssai_local_var->supported_features = supported_features; nssai_local_var->default_single_nssais = default_single_nssais; nssai_local_var->single_nssais = single_nssais; @@ -43,6 +42,7 @@ void OpenAPI_nssai_free(OpenAPI_nssai_t *nssai) ogs_free(nssai->provisioning_time); OpenAPI_list_for_each(nssai->additional_snssai_data, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_additional_snssai_data_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -223,9 +223,9 @@ OpenAPI_nssai_t *OpenAPI_nssai_parseFromJSON(cJSON *nssaiJSON) cJSON *localMapObject = additional_snssai_data_local_map; if (cJSON_IsObject(additional_snssai_data_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_additional_snssai_data_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_additional_snssai_data_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(additional_snssai_data_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_nssai_parseFromJSON() failed [additional_snssai_data]"); goto end; @@ -235,10 +235,10 @@ OpenAPI_nssai_t *OpenAPI_nssai_parseFromJSON(cJSON *nssaiJSON) } nssai_local_var = OpenAPI_nssai_create ( - supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, + supported_features ? ogs_strdup(supported_features->valuestring) : NULL, default_single_nssaisList, single_nssais ? single_nssaisList : NULL, - provisioning_time ? ogs_strdup_or_assert(provisioning_time->valuestring) : NULL, + provisioning_time ? ogs_strdup(provisioning_time->valuestring) : NULL, additional_snssai_data ? additional_snssai_dataList : NULL ); diff --git a/lib/sbi/openapi/model/nssai_1.c b/lib/sbi/openapi/model/nssai_1.c index b83f361d0..5b62a60f2 100644 --- a/lib/sbi/openapi/model/nssai_1.c +++ b/lib/sbi/openapi/model/nssai_1.c @@ -12,10 +12,9 @@ OpenAPI_nssai_1_t *OpenAPI_nssai_1_create( OpenAPI_list_t* additional_snssai_data ) { - OpenAPI_nssai_1_t *nssai_1_local_var = OpenAPI_malloc(sizeof(OpenAPI_nssai_1_t)); - if (!nssai_1_local_var) { - return NULL; - } + OpenAPI_nssai_1_t *nssai_1_local_var = ogs_malloc(sizeof(OpenAPI_nssai_1_t)); + ogs_assert(nssai_1_local_var); + nssai_1_local_var->supported_features = supported_features; nssai_1_local_var->default_single_nssais = default_single_nssais; nssai_1_local_var->single_nssais = single_nssais; @@ -43,6 +42,7 @@ void OpenAPI_nssai_1_free(OpenAPI_nssai_1_t *nssai_1) ogs_free(nssai_1->provisioning_time); OpenAPI_list_for_each(nssai_1->additional_snssai_data, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_additional_snssai_data_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -223,9 +223,9 @@ OpenAPI_nssai_1_t *OpenAPI_nssai_1_parseFromJSON(cJSON *nssai_1JSON) cJSON *localMapObject = additional_snssai_data_local_map; if (cJSON_IsObject(additional_snssai_data_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_additional_snssai_data_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_additional_snssai_data_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(additional_snssai_data_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_nssai_1_parseFromJSON() failed [additional_snssai_data]"); goto end; @@ -235,10 +235,10 @@ OpenAPI_nssai_1_t *OpenAPI_nssai_1_parseFromJSON(cJSON *nssai_1JSON) } nssai_1_local_var = OpenAPI_nssai_1_create ( - supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, + supported_features ? ogs_strdup(supported_features->valuestring) : NULL, default_single_nssaisList, single_nssais ? single_nssaisList : NULL, - provisioning_time ? ogs_strdup_or_assert(provisioning_time->valuestring) : NULL, + provisioning_time ? ogs_strdup(provisioning_time->valuestring) : NULL, additional_snssai_data ? additional_snssai_dataList : NULL ); diff --git a/lib/sbi/openapi/model/nssai_ack_data.c b/lib/sbi/openapi/model/nssai_ack_data.c index 3024a0321..feb7f1ebb 100644 --- a/lib/sbi/openapi/model/nssai_ack_data.c +++ b/lib/sbi/openapi/model/nssai_ack_data.c @@ -9,10 +9,9 @@ OpenAPI_nssai_ack_data_t *OpenAPI_nssai_ack_data_create( OpenAPI_ue_update_status_e ue_update_status ) { - OpenAPI_nssai_ack_data_t *nssai_ack_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_nssai_ack_data_t)); - if (!nssai_ack_data_local_var) { - return NULL; - } + OpenAPI_nssai_ack_data_t *nssai_ack_data_local_var = ogs_malloc(sizeof(OpenAPI_nssai_ack_data_t)); + ogs_assert(nssai_ack_data_local_var); + nssai_ack_data_local_var->provisioning_time = provisioning_time; nssai_ack_data_local_var->ue_update_status = ue_update_status; @@ -81,7 +80,7 @@ OpenAPI_nssai_ack_data_t *OpenAPI_nssai_ack_data_parseFromJSON(cJSON *nssai_ack_ ue_update_statusVariable = OpenAPI_ue_update_status_FromString(ue_update_status->valuestring); nssai_ack_data_local_var = OpenAPI_nssai_ack_data_create ( - ogs_strdup_or_assert(provisioning_time->valuestring), + ogs_strdup(provisioning_time->valuestring), ue_update_statusVariable ); diff --git a/lib/sbi/openapi/model/nssai_mapping.c b/lib/sbi/openapi/model/nssai_mapping.c index a7273d0e3..7988c94cb 100644 --- a/lib/sbi/openapi/model/nssai_mapping.c +++ b/lib/sbi/openapi/model/nssai_mapping.c @@ -9,10 +9,9 @@ OpenAPI_nssai_mapping_t *OpenAPI_nssai_mapping_create( OpenAPI_snssai_t *h_snssai ) { - OpenAPI_nssai_mapping_t *nssai_mapping_local_var = OpenAPI_malloc(sizeof(OpenAPI_nssai_mapping_t)); - if (!nssai_mapping_local_var) { - return NULL; - } + OpenAPI_nssai_mapping_t *nssai_mapping_local_var = ogs_malloc(sizeof(OpenAPI_nssai_mapping_t)); + ogs_assert(nssai_mapping_local_var); + nssai_mapping_local_var->mapped_snssai = mapped_snssai; nssai_mapping_local_var->h_snssai = h_snssai; diff --git a/lib/sbi/openapi/model/nwdaf_cond.c b/lib/sbi/openapi/model/nwdaf_cond.c index 06089ba7f..ee37b7fb5 100644 --- a/lib/sbi/openapi/model/nwdaf_cond.c +++ b/lib/sbi/openapi/model/nwdaf_cond.c @@ -35,10 +35,9 @@ OpenAPI_nwdaf_cond_t *OpenAPI_nwdaf_cond_create( OpenAPI_list_t *tai_range_list ) { - OpenAPI_nwdaf_cond_t *nwdaf_cond_local_var = OpenAPI_malloc(sizeof(OpenAPI_nwdaf_cond_t)); - if (!nwdaf_cond_local_var) { - return NULL; - } + OpenAPI_nwdaf_cond_t *nwdaf_cond_local_var = ogs_malloc(sizeof(OpenAPI_nwdaf_cond_t)); + ogs_assert(nwdaf_cond_local_var); + nwdaf_cond_local_var->condition_type = condition_type; nwdaf_cond_local_var->analytics_ids = analytics_ids; nwdaf_cond_local_var->snssai_list = snssai_list; @@ -200,7 +199,7 @@ OpenAPI_nwdaf_cond_t *OpenAPI_nwdaf_cond_parseFromJSON(cJSON *nwdaf_condJSON) ogs_error("OpenAPI_nwdaf_cond_parseFromJSON() failed [analytics_ids]"); goto end; } - OpenAPI_list_add(analytics_idsList , ogs_strdup_or_assert(analytics_ids_local->valuestring)); + OpenAPI_list_add(analytics_idsList , ogs_strdup(analytics_ids_local->valuestring)); } } diff --git a/lib/sbi/openapi/model/nwdaf_event.c b/lib/sbi/openapi/model/nwdaf_event.c index 0ef18dd53..2faf81759 100644 --- a/lib/sbi/openapi/model/nwdaf_event.c +++ b/lib/sbi/openapi/model/nwdaf_event.c @@ -7,10 +7,9 @@ OpenAPI_nwdaf_event_t *OpenAPI_nwdaf_event_create( ) { - OpenAPI_nwdaf_event_t *nwdaf_event_local_var = OpenAPI_malloc(sizeof(OpenAPI_nwdaf_event_t)); - if (!nwdaf_event_local_var) { - return NULL; - } + OpenAPI_nwdaf_event_t *nwdaf_event_local_var = ogs_malloc(sizeof(OpenAPI_nwdaf_event_t)); + ogs_assert(nwdaf_event_local_var); + return nwdaf_event_local_var; } diff --git a/lib/sbi/openapi/model/nwdaf_info.c b/lib/sbi/openapi/model/nwdaf_info.c index 29bb88f9b..e1e180acd 100644 --- a/lib/sbi/openapi/model/nwdaf_info.c +++ b/lib/sbi/openapi/model/nwdaf_info.c @@ -11,10 +11,9 @@ OpenAPI_nwdaf_info_t *OpenAPI_nwdaf_info_create( OpenAPI_list_t *tai_range_list ) { - OpenAPI_nwdaf_info_t *nwdaf_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_nwdaf_info_t)); - if (!nwdaf_info_local_var) { - return NULL; - } + OpenAPI_nwdaf_info_t *nwdaf_info_local_var = ogs_malloc(sizeof(OpenAPI_nwdaf_info_t)); + ogs_assert(nwdaf_info_local_var); + nwdaf_info_local_var->event_ids = event_ids; nwdaf_info_local_var->nwdaf_events = nwdaf_events; nwdaf_info_local_var->tai_list = tai_list; diff --git a/lib/sbi/openapi/model/odb_data.c b/lib/sbi/openapi/model/odb_data.c index 3aa91df26..708edfec6 100644 --- a/lib/sbi/openapi/model/odb_data.c +++ b/lib/sbi/openapi/model/odb_data.c @@ -8,10 +8,9 @@ OpenAPI_odb_data_t *OpenAPI_odb_data_create( OpenAPI_roaming_odb_e roaming_odb ) { - OpenAPI_odb_data_t *odb_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_odb_data_t)); - if (!odb_data_local_var) { - return NULL; - } + OpenAPI_odb_data_t *odb_data_local_var = ogs_malloc(sizeof(OpenAPI_odb_data_t)); + ogs_assert(odb_data_local_var); + odb_data_local_var->roaming_odb = roaming_odb; return odb_data_local_var; diff --git a/lib/sbi/openapi/model/operator_specific_data_container.c b/lib/sbi/openapi/model/operator_specific_data_container.c index e3e602855..d3210ab7d 100644 --- a/lib/sbi/openapi/model/operator_specific_data_container.c +++ b/lib/sbi/openapi/model/operator_specific_data_container.c @@ -11,10 +11,9 @@ OpenAPI_operator_specific_data_container_t *OpenAPI_operator_specific_data_conta char *supported_features ) { - OpenAPI_operator_specific_data_container_t *operator_specific_data_container_local_var = OpenAPI_malloc(sizeof(OpenAPI_operator_specific_data_container_t)); - if (!operator_specific_data_container_local_var) { - return NULL; - } + OpenAPI_operator_specific_data_container_t *operator_specific_data_container_local_var = ogs_malloc(sizeof(OpenAPI_operator_specific_data_container_t)); + ogs_assert(operator_specific_data_container_local_var); + operator_specific_data_container_local_var->data_type = data_type; operator_specific_data_container_local_var->data_type_definition = data_type_definition; operator_specific_data_container_local_var->value = value; @@ -118,10 +117,10 @@ OpenAPI_operator_specific_data_container_t *OpenAPI_operator_specific_data_conta } operator_specific_data_container_local_var = OpenAPI_operator_specific_data_container_create ( - ogs_strdup_or_assert(data_type->valuestring), - data_type_definition ? ogs_strdup_or_assert(data_type_definition->valuestring) : NULL, - ogs_strdup_or_assert(value->valuestring), - supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL + ogs_strdup(data_type->valuestring), + data_type_definition ? ogs_strdup(data_type_definition->valuestring) : NULL, + ogs_strdup(value->valuestring), + supported_features ? ogs_strdup(supported_features->valuestring) : NULL ); return operator_specific_data_container_local_var; diff --git a/lib/sbi/openapi/model/options_response.c b/lib/sbi/openapi/model/options_response.c index 2e92e36ec..2a0b22ba8 100644 --- a/lib/sbi/openapi/model/options_response.c +++ b/lib/sbi/openapi/model/options_response.c @@ -8,10 +8,9 @@ OpenAPI_options_response_t *OpenAPI_options_response_create( char *supported_features ) { - OpenAPI_options_response_t *options_response_local_var = OpenAPI_malloc(sizeof(OpenAPI_options_response_t)); - if (!options_response_local_var) { - return NULL; - } + OpenAPI_options_response_t *options_response_local_var = ogs_malloc(sizeof(OpenAPI_options_response_t)); + ogs_assert(options_response_local_var); + options_response_local_var->supported_features = supported_features; return options_response_local_var; @@ -61,7 +60,7 @@ OpenAPI_options_response_t *OpenAPI_options_response_parseFromJSON(cJSON *option } options_response_local_var = OpenAPI_options_response_create ( - supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL + supported_features ? ogs_strdup(supported_features->valuestring) : NULL ); return options_response_local_var; diff --git a/lib/sbi/openapi/model/out_of_credit_information.c b/lib/sbi/openapi/model/out_of_credit_information.c index 865e34701..3a79db198 100644 --- a/lib/sbi/openapi/model/out_of_credit_information.c +++ b/lib/sbi/openapi/model/out_of_credit_information.c @@ -9,10 +9,9 @@ OpenAPI_out_of_credit_information_t *OpenAPI_out_of_credit_information_create( OpenAPI_list_t *flows ) { - OpenAPI_out_of_credit_information_t *out_of_credit_information_local_var = OpenAPI_malloc(sizeof(OpenAPI_out_of_credit_information_t)); - if (!out_of_credit_information_local_var) { - return NULL; - } + OpenAPI_out_of_credit_information_t *out_of_credit_information_local_var = ogs_malloc(sizeof(OpenAPI_out_of_credit_information_t)); + ogs_assert(out_of_credit_information_local_var); + out_of_credit_information_local_var->fin_unit_act = fin_unit_act; out_of_credit_information_local_var->flows = flows; diff --git a/lib/sbi/openapi/model/packet_filter_info.c b/lib/sbi/openapi/model/packet_filter_info.c index bc7dcd650..846911626 100644 --- a/lib/sbi/openapi/model/packet_filter_info.c +++ b/lib/sbi/openapi/model/packet_filter_info.c @@ -13,10 +13,9 @@ OpenAPI_packet_filter_info_t *OpenAPI_packet_filter_info_create( OpenAPI_flow_direction_e flow_direction ) { - OpenAPI_packet_filter_info_t *packet_filter_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_packet_filter_info_t)); - if (!packet_filter_info_local_var) { - return NULL; - } + OpenAPI_packet_filter_info_t *packet_filter_info_local_var = ogs_malloc(sizeof(OpenAPI_packet_filter_info_t)); + ogs_assert(packet_filter_info_local_var); + packet_filter_info_local_var->pack_filt_id = pack_filt_id; packet_filter_info_local_var->pack_filt_cont = pack_filt_cont; packet_filter_info_local_var->tos_traffic_class = tos_traffic_class; @@ -157,11 +156,11 @@ OpenAPI_packet_filter_info_t *OpenAPI_packet_filter_info_parseFromJSON(cJSON *pa } packet_filter_info_local_var = OpenAPI_packet_filter_info_create ( - pack_filt_id ? ogs_strdup_or_assert(pack_filt_id->valuestring) : NULL, - pack_filt_cont ? ogs_strdup_or_assert(pack_filt_cont->valuestring) : NULL, - tos_traffic_class ? ogs_strdup_or_assert(tos_traffic_class->valuestring) : NULL, - spi ? ogs_strdup_or_assert(spi->valuestring) : NULL, - flow_label ? ogs_strdup_or_assert(flow_label->valuestring) : NULL, + pack_filt_id ? ogs_strdup(pack_filt_id->valuestring) : NULL, + pack_filt_cont ? ogs_strdup(pack_filt_cont->valuestring) : NULL, + tos_traffic_class ? ogs_strdup(tos_traffic_class->valuestring) : NULL, + spi ? ogs_strdup(spi->valuestring) : NULL, + flow_label ? ogs_strdup(flow_label->valuestring) : NULL, flow_direction ? flow_directionVariable : 0 ); diff --git a/lib/sbi/openapi/model/parameter_combination.c b/lib/sbi/openapi/model/parameter_combination.c index 557c92350..06aba7257 100644 --- a/lib/sbi/openapi/model/parameter_combination.c +++ b/lib/sbi/openapi/model/parameter_combination.c @@ -10,10 +10,9 @@ OpenAPI_parameter_combination_t *OpenAPI_parameter_combination_create( OpenAPI_snssai_t *snssai ) { - OpenAPI_parameter_combination_t *parameter_combination_local_var = OpenAPI_malloc(sizeof(OpenAPI_parameter_combination_t)); - if (!parameter_combination_local_var) { - return NULL; - } + OpenAPI_parameter_combination_t *parameter_combination_local_var = ogs_malloc(sizeof(OpenAPI_parameter_combination_t)); + ogs_assert(parameter_combination_local_var); + parameter_combination_local_var->supi = supi; parameter_combination_local_var->dnn = dnn; parameter_combination_local_var->snssai = snssai; @@ -103,8 +102,8 @@ OpenAPI_parameter_combination_t *OpenAPI_parameter_combination_parseFromJSON(cJS } parameter_combination_local_var = OpenAPI_parameter_combination_create ( - supi ? ogs_strdup_or_assert(supi->valuestring) : NULL, - dnn ? ogs_strdup_or_assert(dnn->valuestring) : NULL, + supi ? ogs_strdup(supi->valuestring) : NULL, + dnn ? ogs_strdup(dnn->valuestring) : NULL, snssai ? snssai_local_nonprim : NULL ); diff --git a/lib/sbi/openapi/model/partial_record_method.c b/lib/sbi/openapi/model/partial_record_method.c index b522d2297..b37bc29d3 100644 --- a/lib/sbi/openapi/model/partial_record_method.c +++ b/lib/sbi/openapi/model/partial_record_method.c @@ -7,10 +7,9 @@ OpenAPI_partial_record_method_t *OpenAPI_partial_record_method_create( ) { - OpenAPI_partial_record_method_t *partial_record_method_local_var = OpenAPI_malloc(sizeof(OpenAPI_partial_record_method_t)); - if (!partial_record_method_local_var) { - return NULL; - } + OpenAPI_partial_record_method_t *partial_record_method_local_var = ogs_malloc(sizeof(OpenAPI_partial_record_method_t)); + ogs_assert(partial_record_method_local_var); + return partial_record_method_local_var; } diff --git a/lib/sbi/openapi/model/partial_success_report.c b/lib/sbi/openapi/model/partial_success_report.c index b44133233..ffbdff181 100644 --- a/lib/sbi/openapi/model/partial_success_report.c +++ b/lib/sbi/openapi/model/partial_success_report.c @@ -12,10 +12,9 @@ OpenAPI_partial_success_report_t *OpenAPI_partial_success_report_create( OpenAPI_list_t *policy_dec_failure_reports ) { - OpenAPI_partial_success_report_t *partial_success_report_local_var = OpenAPI_malloc(sizeof(OpenAPI_partial_success_report_t)); - if (!partial_success_report_local_var) { - return NULL; - } + OpenAPI_partial_success_report_t *partial_success_report_local_var = ogs_malloc(sizeof(OpenAPI_partial_success_report_t)); + ogs_assert(partial_success_report_local_var); + partial_success_report_local_var->failure_cause = failure_cause; partial_success_report_local_var->rule_reports = rule_reports; partial_success_report_local_var->sess_rule_reports = sess_rule_reports; diff --git a/lib/sbi/openapi/model/patch_result.c b/lib/sbi/openapi/model/patch_result.c index 02f5272cb..946fa863d 100644 --- a/lib/sbi/openapi/model/patch_result.c +++ b/lib/sbi/openapi/model/patch_result.c @@ -8,10 +8,9 @@ OpenAPI_patch_result_t *OpenAPI_patch_result_create( OpenAPI_list_t *report ) { - OpenAPI_patch_result_t *patch_result_local_var = OpenAPI_malloc(sizeof(OpenAPI_patch_result_t)); - if (!patch_result_local_var) { - return NULL; - } + OpenAPI_patch_result_t *patch_result_local_var = ogs_malloc(sizeof(OpenAPI_patch_result_t)); + ogs_assert(patch_result_local_var); + patch_result_local_var->report = report; return patch_result_local_var; diff --git a/lib/sbi/openapi/model/pc5_flow_bit_rates.c b/lib/sbi/openapi/model/pc5_flow_bit_rates.c index fdcf4b18a..0c7ccddfd 100644 --- a/lib/sbi/openapi/model/pc5_flow_bit_rates.c +++ b/lib/sbi/openapi/model/pc5_flow_bit_rates.c @@ -9,10 +9,9 @@ OpenAPI_pc5_flow_bit_rates_t *OpenAPI_pc5_flow_bit_rates_create( char *max_fbr ) { - OpenAPI_pc5_flow_bit_rates_t *pc5_flow_bit_rates_local_var = OpenAPI_malloc(sizeof(OpenAPI_pc5_flow_bit_rates_t)); - if (!pc5_flow_bit_rates_local_var) { - return NULL; - } + OpenAPI_pc5_flow_bit_rates_t *pc5_flow_bit_rates_local_var = ogs_malloc(sizeof(OpenAPI_pc5_flow_bit_rates_t)); + ogs_assert(pc5_flow_bit_rates_local_var); + pc5_flow_bit_rates_local_var->gua_fbr = gua_fbr; pc5_flow_bit_rates_local_var->max_fbr = max_fbr; @@ -80,8 +79,8 @@ OpenAPI_pc5_flow_bit_rates_t *OpenAPI_pc5_flow_bit_rates_parseFromJSON(cJSON *pc } pc5_flow_bit_rates_local_var = OpenAPI_pc5_flow_bit_rates_create ( - gua_fbr ? ogs_strdup_or_assert(gua_fbr->valuestring) : NULL, - max_fbr ? ogs_strdup_or_assert(max_fbr->valuestring) : NULL + gua_fbr ? ogs_strdup(gua_fbr->valuestring) : NULL, + max_fbr ? ogs_strdup(max_fbr->valuestring) : NULL ); return pc5_flow_bit_rates_local_var; diff --git a/lib/sbi/openapi/model/pc5_qo_s_para.c b/lib/sbi/openapi/model/pc5_qo_s_para.c index 68b84cfdf..4a73ff35f 100644 --- a/lib/sbi/openapi/model/pc5_qo_s_para.c +++ b/lib/sbi/openapi/model/pc5_qo_s_para.c @@ -9,10 +9,9 @@ OpenAPI_pc5_qo_s_para_t *OpenAPI_pc5_qo_s_para_create( char *pc5_link_ambr ) { - OpenAPI_pc5_qo_s_para_t *pc5_qo_s_para_local_var = OpenAPI_malloc(sizeof(OpenAPI_pc5_qo_s_para_t)); - if (!pc5_qo_s_para_local_var) { - return NULL; - } + OpenAPI_pc5_qo_s_para_t *pc5_qo_s_para_local_var = ogs_malloc(sizeof(OpenAPI_pc5_qo_s_para_t)); + ogs_assert(pc5_qo_s_para_local_var); + pc5_qo_s_para_local_var->pc5_qos_flow_list = pc5_qos_flow_list; pc5_qo_s_para_local_var->pc5_link_ambr = pc5_link_ambr; @@ -111,7 +110,7 @@ OpenAPI_pc5_qo_s_para_t *OpenAPI_pc5_qo_s_para_parseFromJSON(cJSON *pc5_qo_s_par pc5_qo_s_para_local_var = OpenAPI_pc5_qo_s_para_create ( pc5_qos_flow_listList, - pc5_link_ambr ? ogs_strdup_or_assert(pc5_link_ambr->valuestring) : NULL + pc5_link_ambr ? ogs_strdup(pc5_link_ambr->valuestring) : NULL ); return pc5_qo_s_para_local_var; diff --git a/lib/sbi/openapi/model/pc5_qos_flow_item.c b/lib/sbi/openapi/model/pc5_qos_flow_item.c index 226306b0f..78499f4e6 100644 --- a/lib/sbi/openapi/model/pc5_qos_flow_item.c +++ b/lib/sbi/openapi/model/pc5_qos_flow_item.c @@ -11,10 +11,9 @@ OpenAPI_pc5_qos_flow_item_t *OpenAPI_pc5_qos_flow_item_create( int range ) { - OpenAPI_pc5_qos_flow_item_t *pc5_qos_flow_item_local_var = OpenAPI_malloc(sizeof(OpenAPI_pc5_qos_flow_item_t)); - if (!pc5_qos_flow_item_local_var) { - return NULL; - } + OpenAPI_pc5_qos_flow_item_t *pc5_qos_flow_item_local_var = ogs_malloc(sizeof(OpenAPI_pc5_qos_flow_item_t)); + ogs_assert(pc5_qos_flow_item_local_var); + pc5_qos_flow_item_local_var->pqi = pqi; pc5_qos_flow_item_local_var->pc5_flow_bit_rates = pc5_flow_bit_rates; pc5_qos_flow_item_local_var->is_range = is_range; diff --git a/lib/sbi/openapi/model/pcc_rule.c b/lib/sbi/openapi/model/pcc_rule.c index 3afa8c5ea..f56c4bfd7 100644 --- a/lib/sbi/openapi/model/pcc_rule.c +++ b/lib/sbi/openapi/model/pcc_rule.c @@ -35,10 +35,9 @@ OpenAPI_pcc_rule_t *OpenAPI_pcc_rule_create( int dis_ue_notif ) { - OpenAPI_pcc_rule_t *pcc_rule_local_var = OpenAPI_malloc(sizeof(OpenAPI_pcc_rule_t)); - if (!pcc_rule_local_var) { - return NULL; - } + OpenAPI_pcc_rule_t *pcc_rule_local_var = ogs_malloc(sizeof(OpenAPI_pcc_rule_t)); + ogs_assert(pcc_rule_local_var); + pcc_rule_local_var->flow_infos = flow_infos; pcc_rule_local_var->app_id = app_id; pcc_rule_local_var->app_descriptor = app_descriptor; @@ -514,7 +513,7 @@ OpenAPI_pcc_rule_t *OpenAPI_pcc_rule_parseFromJSON(cJSON *pcc_ruleJSON) ogs_error("OpenAPI_pcc_rule_parseFromJSON() failed [ref_qos_data]"); goto end; } - OpenAPI_list_add(ref_qos_dataList , ogs_strdup_or_assert(ref_qos_data_local->valuestring)); + OpenAPI_list_add(ref_qos_dataList , ogs_strdup(ref_qos_data_local->valuestring)); } } @@ -534,7 +533,7 @@ OpenAPI_pcc_rule_t *OpenAPI_pcc_rule_parseFromJSON(cJSON *pcc_ruleJSON) ogs_error("OpenAPI_pcc_rule_parseFromJSON() failed [ref_alt_qos_params]"); goto end; } - OpenAPI_list_add(ref_alt_qos_paramsList , ogs_strdup_or_assert(ref_alt_qos_params_local->valuestring)); + OpenAPI_list_add(ref_alt_qos_paramsList , ogs_strdup(ref_alt_qos_params_local->valuestring)); } } @@ -554,7 +553,7 @@ OpenAPI_pcc_rule_t *OpenAPI_pcc_rule_parseFromJSON(cJSON *pcc_ruleJSON) ogs_error("OpenAPI_pcc_rule_parseFromJSON() failed [ref_tc_data]"); goto end; } - OpenAPI_list_add(ref_tc_dataList , ogs_strdup_or_assert(ref_tc_data_local->valuestring)); + OpenAPI_list_add(ref_tc_dataList , ogs_strdup(ref_tc_data_local->valuestring)); } } @@ -574,7 +573,7 @@ OpenAPI_pcc_rule_t *OpenAPI_pcc_rule_parseFromJSON(cJSON *pcc_ruleJSON) ogs_error("OpenAPI_pcc_rule_parseFromJSON() failed [ref_chg_data]"); goto end; } - OpenAPI_list_add(ref_chg_dataList , ogs_strdup_or_assert(ref_chg_data_local->valuestring)); + OpenAPI_list_add(ref_chg_dataList , ogs_strdup(ref_chg_data_local->valuestring)); } } @@ -594,7 +593,7 @@ OpenAPI_pcc_rule_t *OpenAPI_pcc_rule_parseFromJSON(cJSON *pcc_ruleJSON) ogs_error("OpenAPI_pcc_rule_parseFromJSON() failed [ref_chg_n3g_data]"); goto end; } - OpenAPI_list_add(ref_chg_n3g_dataList , ogs_strdup_or_assert(ref_chg_n3g_data_local->valuestring)); + OpenAPI_list_add(ref_chg_n3g_dataList , ogs_strdup(ref_chg_n3g_data_local->valuestring)); } } @@ -614,7 +613,7 @@ OpenAPI_pcc_rule_t *OpenAPI_pcc_rule_parseFromJSON(cJSON *pcc_ruleJSON) ogs_error("OpenAPI_pcc_rule_parseFromJSON() failed [ref_um_data]"); goto end; } - OpenAPI_list_add(ref_um_dataList , ogs_strdup_or_assert(ref_um_data_local->valuestring)); + OpenAPI_list_add(ref_um_dataList , ogs_strdup(ref_um_data_local->valuestring)); } } @@ -634,7 +633,7 @@ OpenAPI_pcc_rule_t *OpenAPI_pcc_rule_parseFromJSON(cJSON *pcc_ruleJSON) ogs_error("OpenAPI_pcc_rule_parseFromJSON() failed [ref_um_n3g_data]"); goto end; } - OpenAPI_list_add(ref_um_n3g_dataList , ogs_strdup_or_assert(ref_um_n3g_data_local->valuestring)); + OpenAPI_list_add(ref_um_n3g_dataList , ogs_strdup(ref_um_n3g_data_local->valuestring)); } } @@ -663,7 +662,7 @@ OpenAPI_pcc_rule_t *OpenAPI_pcc_rule_parseFromJSON(cJSON *pcc_ruleJSON) ogs_error("OpenAPI_pcc_rule_parseFromJSON() failed [ref_qos_mon]"); goto end; } - OpenAPI_list_add(ref_qos_monList , ogs_strdup_or_assert(ref_qos_mon_local->valuestring)); + OpenAPI_list_add(ref_qos_monList , ogs_strdup(ref_qos_mon_local->valuestring)); } } @@ -715,11 +714,11 @@ OpenAPI_pcc_rule_t *OpenAPI_pcc_rule_parseFromJSON(cJSON *pcc_ruleJSON) pcc_rule_local_var = OpenAPI_pcc_rule_create ( flow_infos ? flow_infosList : NULL, - app_id ? ogs_strdup_or_assert(app_id->valuestring) : NULL, + app_id ? ogs_strdup(app_id->valuestring) : NULL, app_descriptor ? app_descriptor->valueint : 0, cont_ver ? true : false, cont_ver ? cont_ver->valuedouble : 0, - ogs_strdup_or_assert(pcc_rule_id->valuestring), + ogs_strdup(pcc_rule_id->valuestring), precedence ? true : false, precedence ? precedence->valuedouble : 0, af_sig_protocol ? af_sig_protocolVariable : 0, @@ -732,7 +731,7 @@ OpenAPI_pcc_rule_t *OpenAPI_pcc_rule_parseFromJSON(cJSON *pcc_ruleJSON) ref_chg_n3g_data ? ref_chg_n3g_dataList : NULL, ref_um_data ? ref_um_dataList : NULL, ref_um_n3g_data ? ref_um_n3g_dataList : NULL, - ref_cond_data ? ogs_strdup_or_assert(ref_cond_data->valuestring) : NULL, + ref_cond_data ? ogs_strdup(ref_cond_data->valuestring) : NULL, ref_qos_mon ? ref_qos_monList : NULL, addr_preser_ind ? true : false, addr_preser_ind ? addr_preser_ind->valueint : 0, diff --git a/lib/sbi/openapi/model/pcf_binding.c b/lib/sbi/openapi/model/pcf_binding.c index 94c8dc05c..373948fbb 100644 --- a/lib/sbi/openapi/model/pcf_binding.c +++ b/lib/sbi/openapi/model/pcf_binding.c @@ -31,10 +31,9 @@ OpenAPI_pcf_binding_t *OpenAPI_pcf_binding_create( OpenAPI_list_t *ipv6_frame_route_list ) { - OpenAPI_pcf_binding_t *pcf_binding_local_var = OpenAPI_malloc(sizeof(OpenAPI_pcf_binding_t)); - if (!pcf_binding_local_var) { - return NULL; - } + OpenAPI_pcf_binding_t *pcf_binding_local_var = ogs_malloc(sizeof(OpenAPI_pcf_binding_t)); + ogs_assert(pcf_binding_local_var); + pcf_binding_local_var->supi = supi; pcf_binding_local_var->gpsi = gpsi; pcf_binding_local_var->ipv4_addr = ipv4_addr; @@ -420,7 +419,7 @@ OpenAPI_pcf_binding_t *OpenAPI_pcf_binding_parseFromJSON(cJSON *pcf_bindingJSON) ogs_error("OpenAPI_pcf_binding_parseFromJSON() failed [add_ipv6_prefixes]"); goto end; } - OpenAPI_list_add(add_ipv6_prefixesList , ogs_strdup_or_assert(add_ipv6_prefixes_local->valuestring)); + OpenAPI_list_add(add_ipv6_prefixesList , ogs_strdup(add_ipv6_prefixes_local->valuestring)); } } @@ -458,7 +457,7 @@ OpenAPI_pcf_binding_t *OpenAPI_pcf_binding_parseFromJSON(cJSON *pcf_bindingJSON) ogs_error("OpenAPI_pcf_binding_parseFromJSON() failed [add_mac_addrs]"); goto end; } - OpenAPI_list_add(add_mac_addrsList , ogs_strdup_or_assert(add_mac_addrs_local->valuestring)); + OpenAPI_list_add(add_mac_addrsList , ogs_strdup(add_mac_addrs_local->valuestring)); } } @@ -634,7 +633,7 @@ OpenAPI_pcf_binding_t *OpenAPI_pcf_binding_parseFromJSON(cJSON *pcf_bindingJSON) ogs_error("OpenAPI_pcf_binding_parseFromJSON() failed [ipv4_frame_route_list]"); goto end; } - OpenAPI_list_add(ipv4_frame_route_listList , ogs_strdup_or_assert(ipv4_frame_route_list_local->valuestring)); + OpenAPI_list_add(ipv4_frame_route_listList , ogs_strdup(ipv4_frame_route_list_local->valuestring)); } } @@ -654,31 +653,31 @@ OpenAPI_pcf_binding_t *OpenAPI_pcf_binding_parseFromJSON(cJSON *pcf_bindingJSON) ogs_error("OpenAPI_pcf_binding_parseFromJSON() failed [ipv6_frame_route_list]"); goto end; } - OpenAPI_list_add(ipv6_frame_route_listList , ogs_strdup_or_assert(ipv6_frame_route_list_local->valuestring)); + OpenAPI_list_add(ipv6_frame_route_listList , ogs_strdup(ipv6_frame_route_list_local->valuestring)); } } pcf_binding_local_var = OpenAPI_pcf_binding_create ( - supi ? ogs_strdup_or_assert(supi->valuestring) : NULL, - gpsi ? ogs_strdup_or_assert(gpsi->valuestring) : NULL, - ipv4_addr ? ogs_strdup_or_assert(ipv4_addr->valuestring) : NULL, - ipv6_prefix ? ogs_strdup_or_assert(ipv6_prefix->valuestring) : NULL, + supi ? ogs_strdup(supi->valuestring) : NULL, + gpsi ? ogs_strdup(gpsi->valuestring) : NULL, + ipv4_addr ? ogs_strdup(ipv4_addr->valuestring) : NULL, + ipv6_prefix ? ogs_strdup(ipv6_prefix->valuestring) : NULL, add_ipv6_prefixes ? add_ipv6_prefixesList : NULL, - ip_domain ? ogs_strdup_or_assert(ip_domain->valuestring) : NULL, - mac_addr48 ? ogs_strdup_or_assert(mac_addr48->valuestring) : NULL, + ip_domain ? ogs_strdup(ip_domain->valuestring) : NULL, + mac_addr48 ? ogs_strdup(mac_addr48->valuestring) : NULL, add_mac_addrs ? add_mac_addrsList : NULL, - ogs_strdup_or_assert(dnn->valuestring), - pcf_fqdn ? ogs_strdup_or_assert(pcf_fqdn->valuestring) : NULL, + ogs_strdup(dnn->valuestring), + pcf_fqdn ? ogs_strdup(pcf_fqdn->valuestring) : NULL, pcf_ip_end_points ? pcf_ip_end_pointsList : NULL, - pcf_diam_host ? ogs_strdup_or_assert(pcf_diam_host->valuestring) : NULL, - pcf_diam_realm ? ogs_strdup_or_assert(pcf_diam_realm->valuestring) : NULL, - pcf_sm_fqdn ? ogs_strdup_or_assert(pcf_sm_fqdn->valuestring) : NULL, + pcf_diam_host ? ogs_strdup(pcf_diam_host->valuestring) : NULL, + pcf_diam_realm ? ogs_strdup(pcf_diam_realm->valuestring) : NULL, + pcf_sm_fqdn ? ogs_strdup(pcf_sm_fqdn->valuestring) : NULL, pcf_sm_ip_end_points ? pcf_sm_ip_end_pointsList : NULL, snssai_local_nonprim, - supp_feat ? ogs_strdup_or_assert(supp_feat->valuestring) : NULL, - pcf_id ? ogs_strdup_or_assert(pcf_id->valuestring) : NULL, - pcf_set_id ? ogs_strdup_or_assert(pcf_set_id->valuestring) : NULL, - recovery_time ? ogs_strdup_or_assert(recovery_time->valuestring) : NULL, + supp_feat ? ogs_strdup(supp_feat->valuestring) : NULL, + pcf_id ? ogs_strdup(pcf_id->valuestring) : NULL, + pcf_set_id ? ogs_strdup(pcf_set_id->valuestring) : NULL, + recovery_time ? ogs_strdup(recovery_time->valuestring) : NULL, para_com ? para_com_local_nonprim : NULL, bind_level ? bind_levelVariable : 0, ipv4_frame_route_list ? ipv4_frame_route_listList : NULL, diff --git a/lib/sbi/openapi/model/pcf_binding_patch.c b/lib/sbi/openapi/model/pcf_binding_patch.c index 077744b2d..efe22eb33 100644 --- a/lib/sbi/openapi/model/pcf_binding_patch.c +++ b/lib/sbi/openapi/model/pcf_binding_patch.c @@ -18,10 +18,9 @@ OpenAPI_pcf_binding_patch_t *OpenAPI_pcf_binding_patch_create( char *pcf_diam_realm ) { - OpenAPI_pcf_binding_patch_t *pcf_binding_patch_local_var = OpenAPI_malloc(sizeof(OpenAPI_pcf_binding_patch_t)); - if (!pcf_binding_patch_local_var) { - return NULL; - } + OpenAPI_pcf_binding_patch_t *pcf_binding_patch_local_var = ogs_malloc(sizeof(OpenAPI_pcf_binding_patch_t)); + ogs_assert(pcf_binding_patch_local_var); + pcf_binding_patch_local_var->ipv4_addr = ipv4_addr; pcf_binding_patch_local_var->ip_domain = ip_domain; pcf_binding_patch_local_var->ipv6_prefix = ipv6_prefix; @@ -234,7 +233,7 @@ OpenAPI_pcf_binding_patch_t *OpenAPI_pcf_binding_patch_parseFromJSON(cJSON *pcf_ ogs_error("OpenAPI_pcf_binding_patch_parseFromJSON() failed [add_ipv6_prefixes]"); goto end; } - OpenAPI_list_add(add_ipv6_prefixesList , ogs_strdup_or_assert(add_ipv6_prefixes_local->valuestring)); + OpenAPI_list_add(add_ipv6_prefixesList , ogs_strdup(add_ipv6_prefixes_local->valuestring)); } } @@ -263,7 +262,7 @@ OpenAPI_pcf_binding_patch_t *OpenAPI_pcf_binding_patch_parseFromJSON(cJSON *pcf_ ogs_error("OpenAPI_pcf_binding_patch_parseFromJSON() failed [add_mac_addrs]"); goto end; } - OpenAPI_list_add(add_mac_addrsList , ogs_strdup_or_assert(add_mac_addrs_local->valuestring)); + OpenAPI_list_add(add_mac_addrsList , ogs_strdup(add_mac_addrs_local->valuestring)); } } @@ -327,17 +326,17 @@ OpenAPI_pcf_binding_patch_t *OpenAPI_pcf_binding_patch_parseFromJSON(cJSON *pcf_ } pcf_binding_patch_local_var = OpenAPI_pcf_binding_patch_create ( - ipv4_addr ? ogs_strdup_or_assert(ipv4_addr->valuestring) : NULL, - ip_domain ? ogs_strdup_or_assert(ip_domain->valuestring) : NULL, - ipv6_prefix ? ogs_strdup_or_assert(ipv6_prefix->valuestring) : NULL, + ipv4_addr ? ogs_strdup(ipv4_addr->valuestring) : NULL, + ip_domain ? ogs_strdup(ip_domain->valuestring) : NULL, + ipv6_prefix ? ogs_strdup(ipv6_prefix->valuestring) : NULL, add_ipv6_prefixes ? add_ipv6_prefixesList : NULL, - mac_addr48 ? ogs_strdup_or_assert(mac_addr48->valuestring) : NULL, + mac_addr48 ? ogs_strdup(mac_addr48->valuestring) : NULL, add_mac_addrs ? add_mac_addrsList : NULL, - pcf_id ? ogs_strdup_or_assert(pcf_id->valuestring) : NULL, - pcf_fqdn ? ogs_strdup_or_assert(pcf_fqdn->valuestring) : NULL, + pcf_id ? ogs_strdup(pcf_id->valuestring) : NULL, + pcf_fqdn ? ogs_strdup(pcf_fqdn->valuestring) : NULL, pcf_ip_end_points ? pcf_ip_end_pointsList : NULL, - pcf_diam_host ? ogs_strdup_or_assert(pcf_diam_host->valuestring) : NULL, - pcf_diam_realm ? ogs_strdup_or_assert(pcf_diam_realm->valuestring) : NULL + pcf_diam_host ? ogs_strdup(pcf_diam_host->valuestring) : NULL, + pcf_diam_realm ? ogs_strdup(pcf_diam_realm->valuestring) : NULL ); return pcf_binding_patch_local_var; diff --git a/lib/sbi/openapi/model/pcf_info.c b/lib/sbi/openapi/model/pcf_info.c index 6796619fe..277da9d1d 100644 --- a/lib/sbi/openapi/model/pcf_info.c +++ b/lib/sbi/openapi/model/pcf_info.c @@ -15,10 +15,9 @@ OpenAPI_pcf_info_t *OpenAPI_pcf_info_create( int v2x_support_ind ) { - OpenAPI_pcf_info_t *pcf_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_pcf_info_t)); - if (!pcf_info_local_var) { - return NULL; - } + OpenAPI_pcf_info_t *pcf_info_local_var = ogs_malloc(sizeof(OpenAPI_pcf_info_t)); + ogs_assert(pcf_info_local_var); + pcf_info_local_var->group_id = group_id; pcf_info_local_var->dnn_list = dnn_list; pcf_info_local_var->supi_ranges = supi_ranges; @@ -181,7 +180,7 @@ OpenAPI_pcf_info_t *OpenAPI_pcf_info_parseFromJSON(cJSON *pcf_infoJSON) ogs_error("OpenAPI_pcf_info_parseFromJSON() failed [dnn_list]"); goto end; } - OpenAPI_list_add(dnn_listList , ogs_strdup_or_assert(dnn_list_local->valuestring)); + OpenAPI_list_add(dnn_listList , ogs_strdup(dnn_list_local->valuestring)); } } @@ -259,12 +258,12 @@ OpenAPI_pcf_info_t *OpenAPI_pcf_info_parseFromJSON(cJSON *pcf_infoJSON) } pcf_info_local_var = OpenAPI_pcf_info_create ( - group_id ? ogs_strdup_or_assert(group_id->valuestring) : NULL, + group_id ? ogs_strdup(group_id->valuestring) : NULL, dnn_list ? dnn_listList : NULL, supi_ranges ? supi_rangesList : NULL, gpsi_ranges ? gpsi_rangesList : NULL, - rx_diam_host ? ogs_strdup_or_assert(rx_diam_host->valuestring) : NULL, - rx_diam_realm ? ogs_strdup_or_assert(rx_diam_realm->valuestring) : NULL, + rx_diam_host ? ogs_strdup(rx_diam_host->valuestring) : NULL, + rx_diam_realm ? ogs_strdup(rx_diam_realm->valuestring) : NULL, v2x_support_ind ? true : false, v2x_support_ind ? v2x_support_ind->valueint : 0 ); diff --git a/lib/sbi/openapi/model/pcscf_info.c b/lib/sbi/openapi/model/pcscf_info.c index 564ccb6d9..a9726ac15 100644 --- a/lib/sbi/openapi/model/pcscf_info.c +++ b/lib/sbi/openapi/model/pcscf_info.c @@ -14,10 +14,9 @@ OpenAPI_pcscf_info_t *OpenAPI_pcscf_info_create( OpenAPI_list_t *served_ipv6_prefix_ranges ) { - OpenAPI_pcscf_info_t *pcscf_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_pcscf_info_t)); - if (!pcscf_info_local_var) { - return NULL; - } + OpenAPI_pcscf_info_t *pcscf_info_local_var = ogs_malloc(sizeof(OpenAPI_pcscf_info_t)); + ogs_assert(pcscf_info_local_var); + pcscf_info_local_var->access_type = access_type; pcscf_info_local_var->dnn_list = dnn_list; pcscf_info_local_var->gm_fqdn = gm_fqdn; @@ -225,7 +224,7 @@ OpenAPI_pcscf_info_t *OpenAPI_pcscf_info_parseFromJSON(cJSON *pcscf_infoJSON) ogs_error("OpenAPI_pcscf_info_parseFromJSON() failed [dnn_list]"); goto end; } - OpenAPI_list_add(dnn_listList , ogs_strdup_or_assert(dnn_list_local->valuestring)); + OpenAPI_list_add(dnn_listList , ogs_strdup(dnn_list_local->valuestring)); } } @@ -254,7 +253,7 @@ OpenAPI_pcscf_info_t *OpenAPI_pcscf_info_parseFromJSON(cJSON *pcscf_infoJSON) ogs_error("OpenAPI_pcscf_info_parseFromJSON() failed [gm_ipv4_addresses]"); goto end; } - OpenAPI_list_add(gm_ipv4_addressesList , ogs_strdup_or_assert(gm_ipv4_addresses_local->valuestring)); + OpenAPI_list_add(gm_ipv4_addressesList , ogs_strdup(gm_ipv4_addresses_local->valuestring)); } } @@ -274,7 +273,7 @@ OpenAPI_pcscf_info_t *OpenAPI_pcscf_info_parseFromJSON(cJSON *pcscf_infoJSON) ogs_error("OpenAPI_pcscf_info_parseFromJSON() failed [gm_ipv6_addresses]"); goto end; } - OpenAPI_list_add(gm_ipv6_addressesList , ogs_strdup_or_assert(gm_ipv6_addresses_local->valuestring)); + OpenAPI_list_add(gm_ipv6_addressesList , ogs_strdup(gm_ipv6_addresses_local->valuestring)); } } @@ -327,7 +326,7 @@ OpenAPI_pcscf_info_t *OpenAPI_pcscf_info_parseFromJSON(cJSON *pcscf_infoJSON) pcscf_info_local_var = OpenAPI_pcscf_info_create ( access_type ? access_typeList : NULL, dnn_list ? dnn_listList : NULL, - gm_fqdn ? ogs_strdup_or_assert(gm_fqdn->valuestring) : NULL, + gm_fqdn ? ogs_strdup(gm_fqdn->valuestring) : NULL, gm_ipv4_addresses ? gm_ipv4_addressesList : NULL, gm_ipv6_addresses ? gm_ipv6_addressesList : NULL, served_ipv4_address_ranges ? served_ipv4_address_rangesList : NULL, diff --git a/lib/sbi/openapi/model/pcscf_restoration_notification.c b/lib/sbi/openapi/model/pcscf_restoration_notification.c index c669b3fe7..ecf39577d 100644 --- a/lib/sbi/openapi/model/pcscf_restoration_notification.c +++ b/lib/sbi/openapi/model/pcscf_restoration_notification.c @@ -8,10 +8,9 @@ OpenAPI_pcscf_restoration_notification_t *OpenAPI_pcscf_restoration_notification char *supi ) { - OpenAPI_pcscf_restoration_notification_t *pcscf_restoration_notification_local_var = OpenAPI_malloc(sizeof(OpenAPI_pcscf_restoration_notification_t)); - if (!pcscf_restoration_notification_local_var) { - return NULL; - } + OpenAPI_pcscf_restoration_notification_t *pcscf_restoration_notification_local_var = ogs_malloc(sizeof(OpenAPI_pcscf_restoration_notification_t)); + ogs_assert(pcscf_restoration_notification_local_var); + pcscf_restoration_notification_local_var->supi = supi; return pcscf_restoration_notification_local_var; @@ -61,7 +60,7 @@ OpenAPI_pcscf_restoration_notification_t *OpenAPI_pcscf_restoration_notification } pcscf_restoration_notification_local_var = OpenAPI_pcscf_restoration_notification_create ( - ogs_strdup_or_assert(supi->valuestring) + ogs_strdup(supi->valuestring) ); return pcscf_restoration_notification_local_var; diff --git a/lib/sbi/openapi/model/pcscf_restoration_request_data.c b/lib/sbi/openapi/model/pcscf_restoration_request_data.c index 7db3c2578..8b7328dec 100644 --- a/lib/sbi/openapi/model/pcscf_restoration_request_data.c +++ b/lib/sbi/openapi/model/pcscf_restoration_request_data.c @@ -13,10 +13,9 @@ OpenAPI_pcscf_restoration_request_data_t *OpenAPI_pcscf_restoration_request_data char *ue_ipv6 ) { - OpenAPI_pcscf_restoration_request_data_t *pcscf_restoration_request_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_pcscf_restoration_request_data_t)); - if (!pcscf_restoration_request_data_local_var) { - return NULL; - } + OpenAPI_pcscf_restoration_request_data_t *pcscf_restoration_request_data_local_var = ogs_malloc(sizeof(OpenAPI_pcscf_restoration_request_data_t)); + ogs_assert(pcscf_restoration_request_data_local_var); + pcscf_restoration_request_data_local_var->dnn = dnn; pcscf_restoration_request_data_local_var->ip_domain = ip_domain; pcscf_restoration_request_data_local_var->slice_info = slice_info; @@ -160,12 +159,12 @@ OpenAPI_pcscf_restoration_request_data_t *OpenAPI_pcscf_restoration_request_data } pcscf_restoration_request_data_local_var = OpenAPI_pcscf_restoration_request_data_create ( - dnn ? ogs_strdup_or_assert(dnn->valuestring) : NULL, - ip_domain ? ogs_strdup_or_assert(ip_domain->valuestring) : NULL, + dnn ? ogs_strdup(dnn->valuestring) : NULL, + ip_domain ? ogs_strdup(ip_domain->valuestring) : NULL, slice_info ? slice_info_local_nonprim : NULL, - supi ? ogs_strdup_or_assert(supi->valuestring) : NULL, - ue_ipv4 ? ogs_strdup_or_assert(ue_ipv4->valuestring) : NULL, - ue_ipv6 ? ogs_strdup_or_assert(ue_ipv6->valuestring) : NULL + supi ? ogs_strdup(supi->valuestring) : NULL, + ue_ipv4 ? ogs_strdup(ue_ipv4->valuestring) : NULL, + ue_ipv6 ? ogs_strdup(ue_ipv6->valuestring) : NULL ); return pcscf_restoration_request_data_local_var; diff --git a/lib/sbi/openapi/model/pdu_session.c b/lib/sbi/openapi/model/pdu_session.c index b1dbc78c2..3a1b0fd4c 100644 --- a/lib/sbi/openapi/model/pdu_session.c +++ b/lib/sbi/openapi/model/pdu_session.c @@ -11,10 +11,9 @@ OpenAPI_pdu_session_t *OpenAPI_pdu_session_create( OpenAPI_snssai_t *single_nssai ) { - OpenAPI_pdu_session_t *pdu_session_local_var = OpenAPI_malloc(sizeof(OpenAPI_pdu_session_t)); - if (!pdu_session_local_var) { - return NULL; - } + OpenAPI_pdu_session_t *pdu_session_local_var = ogs_malloc(sizeof(OpenAPI_pdu_session_t)); + ogs_assert(pdu_session_local_var); + pdu_session_local_var->dnn = dnn; pdu_session_local_var->smf_instance_id = smf_instance_id; pdu_session_local_var->plmn_id = plmn_id; @@ -126,8 +125,8 @@ OpenAPI_pdu_session_t *OpenAPI_pdu_session_parseFromJSON(cJSON *pdu_sessionJSON) } pdu_session_local_var = OpenAPI_pdu_session_create ( - ogs_strdup_or_assert(dnn->valuestring), - ogs_strdup_or_assert(smf_instance_id->valuestring), + ogs_strdup(dnn->valuestring), + ogs_strdup(smf_instance_id->valuestring), plmn_id_local_nonprim, single_nssai ? single_nssai_local_nonprim : NULL ); diff --git a/lib/sbi/openapi/model/pdu_session_1.c b/lib/sbi/openapi/model/pdu_session_1.c index c197d0ec8..ae44be18b 100644 --- a/lib/sbi/openapi/model/pdu_session_1.c +++ b/lib/sbi/openapi/model/pdu_session_1.c @@ -11,10 +11,9 @@ OpenAPI_pdu_session_1_t *OpenAPI_pdu_session_1_create( OpenAPI_snssai_t *single_nssai ) { - OpenAPI_pdu_session_1_t *pdu_session_1_local_var = OpenAPI_malloc(sizeof(OpenAPI_pdu_session_1_t)); - if (!pdu_session_1_local_var) { - return NULL; - } + OpenAPI_pdu_session_1_t *pdu_session_1_local_var = ogs_malloc(sizeof(OpenAPI_pdu_session_1_t)); + ogs_assert(pdu_session_1_local_var); + pdu_session_1_local_var->dnn = dnn; pdu_session_1_local_var->smf_instance_id = smf_instance_id; pdu_session_1_local_var->plmn_id = plmn_id; @@ -126,8 +125,8 @@ OpenAPI_pdu_session_1_t *OpenAPI_pdu_session_1_parseFromJSON(cJSON *pdu_session_ } pdu_session_1_local_var = OpenAPI_pdu_session_1_create ( - ogs_strdup_or_assert(dnn->valuestring), - ogs_strdup_or_assert(smf_instance_id->valuestring), + ogs_strdup(dnn->valuestring), + ogs_strdup(smf_instance_id->valuestring), plmn_id_local_nonprim, single_nssai ? single_nssai_local_nonprim : NULL ); diff --git a/lib/sbi/openapi/model/pdu_session_context.c b/lib/sbi/openapi/model/pdu_session_context.c index 91ee61f8b..4c879128e 100644 --- a/lib/sbi/openapi/model/pdu_session_context.c +++ b/lib/sbi/openapi/model/pdu_session_context.c @@ -32,10 +32,9 @@ OpenAPI_pdu_session_context_t *OpenAPI_pdu_session_context_create( OpenAPI_cn_assisted_ran_para_t *cn_assisted_ran_para ) { - OpenAPI_pdu_session_context_t *pdu_session_context_local_var = OpenAPI_malloc(sizeof(OpenAPI_pdu_session_context_t)); - if (!pdu_session_context_local_var) { - return NULL; - } + OpenAPI_pdu_session_context_t *pdu_session_context_local_var = ogs_malloc(sizeof(OpenAPI_pdu_session_context_t)); + ogs_assert(pdu_session_context_local_var); + pdu_session_context_local_var->pdu_session_id = pdu_session_id; pdu_session_context_local_var->sm_context_ref = sm_context_ref; pdu_session_context_local_var->s_nssai = s_nssai; @@ -543,27 +542,27 @@ OpenAPI_pdu_session_context_t *OpenAPI_pdu_session_context_parseFromJSON(cJSON * pdu_session_context_local_var = OpenAPI_pdu_session_context_create ( pdu_session_id->valuedouble, - ogs_strdup_or_assert(sm_context_ref->valuestring), + ogs_strdup(sm_context_ref->valuestring), s_nssai_local_nonprim, - ogs_strdup_or_assert(dnn->valuestring), - selected_dnn ? ogs_strdup_or_assert(selected_dnn->valuestring) : NULL, + ogs_strdup(dnn->valuestring), + selected_dnn ? ogs_strdup(selected_dnn->valuestring) : NULL, access_typeVariable, additional_access_type ? additional_access_typeVariable : 0, allocated_ebi_list ? allocated_ebi_listList : NULL, - hsmf_id ? ogs_strdup_or_assert(hsmf_id->valuestring) : NULL, - hsmf_set_id ? ogs_strdup_or_assert(hsmf_set_id->valuestring) : NULL, - hsmf_service_set_id ? ogs_strdup_or_assert(hsmf_service_set_id->valuestring) : NULL, + hsmf_id ? ogs_strdup(hsmf_id->valuestring) : NULL, + hsmf_set_id ? ogs_strdup(hsmf_set_id->valuestring) : NULL, + hsmf_service_set_id ? ogs_strdup(hsmf_service_set_id->valuestring) : NULL, smf_binding ? smf_bindingVariable : 0, - vsmf_id ? ogs_strdup_or_assert(vsmf_id->valuestring) : NULL, - vsmf_set_id ? ogs_strdup_or_assert(vsmf_set_id->valuestring) : NULL, - vsmf_service_set_id ? ogs_strdup_or_assert(vsmf_service_set_id->valuestring) : NULL, + vsmf_id ? ogs_strdup(vsmf_id->valuestring) : NULL, + vsmf_set_id ? ogs_strdup(vsmf_set_id->valuestring) : NULL, + vsmf_service_set_id ? ogs_strdup(vsmf_service_set_id->valuestring) : NULL, vsmf_binding ? vsmf_bindingVariable : 0, - ismf_id ? ogs_strdup_or_assert(ismf_id->valuestring) : NULL, - ismf_set_id ? ogs_strdup_or_assert(ismf_set_id->valuestring) : NULL, - ismf_service_set_id ? ogs_strdup_or_assert(ismf_service_set_id->valuestring) : NULL, + ismf_id ? ogs_strdup(ismf_id->valuestring) : NULL, + ismf_set_id ? ogs_strdup(ismf_set_id->valuestring) : NULL, + ismf_service_set_id ? ogs_strdup(ismf_service_set_id->valuestring) : NULL, ismf_binding ? ismf_bindingVariable : 0, - ns_instance ? ogs_strdup_or_assert(ns_instance->valuestring) : NULL, - smf_service_instance_id ? ogs_strdup_or_assert(smf_service_instance_id->valuestring) : NULL, + ns_instance ? ogs_strdup(ns_instance->valuestring) : NULL, + smf_service_instance_id ? ogs_strdup(smf_service_instance_id->valuestring) : NULL, ma_pdu_session ? true : false, ma_pdu_session ? ma_pdu_session->valueint : 0, cn_assisted_ran_para ? cn_assisted_ran_para_local_nonprim : NULL diff --git a/lib/sbi/openapi/model/pdu_session_create_data.c b/lib/sbi/openapi/model/pdu_session_create_data.c index ec5e6ca9d..a93c54518 100644 --- a/lib/sbi/openapi/model/pdu_session_create_data.c +++ b/lib/sbi/openapi/model/pdu_session_create_data.c @@ -81,10 +81,9 @@ OpenAPI_pdu_session_create_data_t *OpenAPI_pdu_session_create_data_create( OpenAPI_vplmn_qos_t *vplmn_qos ) { - OpenAPI_pdu_session_create_data_t *pdu_session_create_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_pdu_session_create_data_t)); - if (!pdu_session_create_data_local_var) { - return NULL; - } + OpenAPI_pdu_session_create_data_t *pdu_session_create_data_local_var = ogs_malloc(sizeof(OpenAPI_pdu_session_create_data_t)); + ogs_assert(pdu_session_create_data_local_var); + pdu_session_create_data_local_var->supi = supi; pdu_session_create_data_local_var->is_unauthenticated_supi = is_unauthenticated_supi; pdu_session_create_data_local_var->unauthenticated_supi = unauthenticated_supi; @@ -1322,7 +1321,7 @@ OpenAPI_pdu_session_create_data_t *OpenAPI_pdu_session_create_data_parseFromJSON ogs_error("OpenAPI_pdu_session_create_data_parseFromJSON() failed [dnai_list]"); goto end; } - OpenAPI_list_add(dnai_listList , ogs_strdup_or_assert(dnai_list_local->valuestring)); + OpenAPI_list_add(dnai_listList , ogs_strdup(dnai_list_local->valuestring)); } } @@ -1398,23 +1397,23 @@ OpenAPI_pdu_session_create_data_t *OpenAPI_pdu_session_create_data_parseFromJSON } pdu_session_create_data_local_var = OpenAPI_pdu_session_create_data_create ( - supi ? ogs_strdup_or_assert(supi->valuestring) : NULL, + supi ? ogs_strdup(supi->valuestring) : NULL, unauthenticated_supi ? true : false, unauthenticated_supi ? unauthenticated_supi->valueint : 0, - pei ? ogs_strdup_or_assert(pei->valuestring) : NULL, + pei ? ogs_strdup(pei->valuestring) : NULL, pdu_session_id ? true : false, pdu_session_id ? pdu_session_id->valuedouble : 0, - ogs_strdup_or_assert(dnn->valuestring), - selected_dnn ? ogs_strdup_or_assert(selected_dnn->valuestring) : NULL, + ogs_strdup(dnn->valuestring), + selected_dnn ? ogs_strdup(selected_dnn->valuestring) : NULL, s_nssai ? s_nssai_local_nonprim : NULL, - vsmf_id ? ogs_strdup_or_assert(vsmf_id->valuestring) : NULL, - ismf_id ? ogs_strdup_or_assert(ismf_id->valuestring) : NULL, + vsmf_id ? ogs_strdup(vsmf_id->valuestring) : NULL, + ismf_id ? ogs_strdup(ismf_id->valuestring) : NULL, serving_network_local_nonprim, request_type ? request_typeVariable : 0, eps_bearer_id ? eps_bearer_idList : NULL, pgw_s8c_fteid ? pgw_s8c_fteid->valueint : 0, - vsmf_pdu_session_uri ? ogs_strdup_or_assert(vsmf_pdu_session_uri->valuestring) : NULL, - ismf_pdu_session_uri ? ogs_strdup_or_assert(ismf_pdu_session_uri->valuestring) : NULL, + vsmf_pdu_session_uri ? ogs_strdup(vsmf_pdu_session_uri->valuestring) : NULL, + ismf_pdu_session_uri ? ogs_strdup(ismf_pdu_session_uri->valuestring) : NULL, vcn_tunnel_info ? vcn_tunnel_info_local_nonprim : NULL, icn_tunnel_info ? icn_tunnel_info_local_nonprim : NULL, n9_forwarding_tunnel_info ? n9_forwarding_tunnel_info_local_nonprim : NULL, @@ -1423,33 +1422,33 @@ OpenAPI_pdu_session_create_data_t *OpenAPI_pdu_session_create_data_parseFromJSON additional_an_type ? additional_an_typeVariable : 0, rat_type ? rat_typeVariable : 0, ue_location ? ue_location_local_nonprim : NULL, - ue_time_zone ? ogs_strdup_or_assert(ue_time_zone->valuestring) : NULL, + ue_time_zone ? ogs_strdup(ue_time_zone->valuestring) : NULL, add_ue_location ? add_ue_location_local_nonprim : NULL, - gpsi ? ogs_strdup_or_assert(gpsi->valuestring) : NULL, + gpsi ? ogs_strdup(gpsi->valuestring) : NULL, n1_sm_info_from_ue ? n1_sm_info_from_ue_local_nonprim : NULL, unknown_n1_sm_info ? unknown_n1_sm_info_local_nonprim : NULL, - supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, - h_pcf_id ? ogs_strdup_or_assert(h_pcf_id->valuestring) : NULL, - pcf_id ? ogs_strdup_or_assert(pcf_id->valuestring) : NULL, - pcf_group_id ? ogs_strdup_or_assert(pcf_group_id->valuestring) : NULL, - pcf_set_id ? ogs_strdup_or_assert(pcf_set_id->valuestring) : NULL, + supported_features ? ogs_strdup(supported_features->valuestring) : NULL, + h_pcf_id ? ogs_strdup(h_pcf_id->valuestring) : NULL, + pcf_id ? ogs_strdup(pcf_id->valuestring) : NULL, + pcf_group_id ? ogs_strdup(pcf_group_id->valuestring) : NULL, + pcf_set_id ? ogs_strdup(pcf_set_id->valuestring) : NULL, ho_preparation_indication ? true : false, ho_preparation_indication ? ho_preparation_indication->valueint : 0, sel_mode ? sel_modeVariable : 0, always_on_requested ? true : false, always_on_requested ? always_on_requested->valueint : 0, - udm_group_id ? ogs_strdup_or_assert(udm_group_id->valuestring) : NULL, - routing_indicator ? ogs_strdup_or_assert(routing_indicator->valuestring) : NULL, + udm_group_id ? ogs_strdup(udm_group_id->valuestring) : NULL, + routing_indicator ? ogs_strdup(routing_indicator->valuestring) : NULL, eps_interworking_ind ? eps_interworking_indVariable : 0, - v_smf_service_instance_id ? ogs_strdup_or_assert(v_smf_service_instance_id->valuestring) : NULL, - i_smf_service_instance_id ? ogs_strdup_or_assert(i_smf_service_instance_id->valuestring) : NULL, - recovery_time ? ogs_strdup_or_assert(recovery_time->valuestring) : NULL, + v_smf_service_instance_id ? ogs_strdup(v_smf_service_instance_id->valuestring) : NULL, + i_smf_service_instance_id ? ogs_strdup(i_smf_service_instance_id->valuestring) : NULL, + recovery_time ? ogs_strdup(recovery_time->valuestring) : NULL, roaming_charging_profile ? roaming_charging_profile_local_nonprim : NULL, - charging_id ? ogs_strdup_or_assert(charging_id->valuestring) : NULL, + charging_id ? ogs_strdup(charging_id->valuestring) : NULL, old_pdu_session_id ? true : false, old_pdu_session_id ? old_pdu_session_id->valuedouble : 0, - eps_bearer_ctx_status ? ogs_strdup_or_assert(eps_bearer_ctx_status->valuestring) : NULL, - amf_nf_id ? ogs_strdup_or_assert(amf_nf_id->valuestring) : NULL, + eps_bearer_ctx_status ? ogs_strdup(eps_bearer_ctx_status->valuestring) : NULL, + amf_nf_id ? ogs_strdup(amf_nf_id->valuestring) : NULL, guami ? guami_local_nonprim : NULL, max_integrity_protected_data_rate_ul ? max_integrity_protected_data_rate_ulVariable : 0, max_integrity_protected_data_rate_dl ? max_integrity_protected_data_rate_dlVariable : 0, diff --git a/lib/sbi/openapi/model/pdu_session_create_error.c b/lib/sbi/openapi/model/pdu_session_create_error.c index 5a68a4988..2c4e5effa 100644 --- a/lib/sbi/openapi/model/pdu_session_create_error.c +++ b/lib/sbi/openapi/model/pdu_session_create_error.c @@ -13,10 +13,9 @@ OpenAPI_pdu_session_create_error_t *OpenAPI_pdu_session_create_error_create( char *recovery_time ) { - OpenAPI_pdu_session_create_error_t *pdu_session_create_error_local_var = OpenAPI_malloc(sizeof(OpenAPI_pdu_session_create_error_t)); - if (!pdu_session_create_error_local_var) { - return NULL; - } + OpenAPI_pdu_session_create_error_t *pdu_session_create_error_local_var = ogs_malloc(sizeof(OpenAPI_pdu_session_create_error_t)); + ogs_assert(pdu_session_create_error_local_var); + pdu_session_create_error_local_var->error = error; pdu_session_create_error_local_var->n1sm_cause = n1sm_cause; pdu_session_create_error_local_var->n1_sm_info_to_ue = n1_sm_info_to_ue; @@ -147,11 +146,11 @@ OpenAPI_pdu_session_create_error_t *OpenAPI_pdu_session_create_error_parseFromJS pdu_session_create_error_local_var = OpenAPI_pdu_session_create_error_create ( error_local_nonprim, - n1sm_cause ? ogs_strdup_or_assert(n1sm_cause->valuestring) : NULL, + n1sm_cause ? ogs_strdup(n1sm_cause->valuestring) : NULL, n1_sm_info_to_ue ? n1_sm_info_to_ue_local_nonprim : NULL, back_off_timer ? true : false, back_off_timer ? back_off_timer->valuedouble : 0, - recovery_time ? ogs_strdup_or_assert(recovery_time->valuestring) : NULL + recovery_time ? ogs_strdup(recovery_time->valuestring) : NULL ); return pdu_session_create_error_local_var; diff --git a/lib/sbi/openapi/model/pdu_session_created_data.c b/lib/sbi/openapi/model/pdu_session_created_data.c index bdcedb560..f4de8487a 100644 --- a/lib/sbi/openapi/model/pdu_session_created_data.c +++ b/lib/sbi/openapi/model/pdu_session_created_data.c @@ -52,10 +52,9 @@ OpenAPI_pdu_session_created_data_t *OpenAPI_pdu_session_created_data_create( OpenAPI_redundant_pdu_session_information_t *redundant_pdu_session_info ) { - OpenAPI_pdu_session_created_data_t *pdu_session_created_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_pdu_session_created_data_t)); - if (!pdu_session_created_data_local_var) { - return NULL; - } + OpenAPI_pdu_session_created_data_t *pdu_session_created_data_local_var = ogs_malloc(sizeof(OpenAPI_pdu_session_created_data_t)); + ogs_assert(pdu_session_created_data_local_var); + pdu_session_created_data_local_var->pdu_session_type = pdu_session_type; pdu_session_created_data_local_var->ssc_mode = ssc_mode; pdu_session_created_data_local_var->hcn_tunnel_info = hcn_tunnel_info; @@ -801,7 +800,7 @@ OpenAPI_pdu_session_created_data_t *OpenAPI_pdu_session_created_data_parseFromJS ogs_error("OpenAPI_pdu_session_created_data_parseFromJSON() failed [dnai_list]"); goto end; } - OpenAPI_list_add(dnai_listList , ogs_strdup_or_assert(dnai_list_local->valuestring)); + OpenAPI_list_add(dnai_listList , ogs_strdup(dnai_list_local->valuestring)); } } @@ -884,46 +883,46 @@ OpenAPI_pdu_session_created_data_t *OpenAPI_pdu_session_created_data_parseFromJS pdu_session_created_data_local_var = OpenAPI_pdu_session_created_data_create ( pdu_session_typeVariable, - ogs_strdup_or_assert(ssc_mode->valuestring), + ogs_strdup(ssc_mode->valuestring), hcn_tunnel_info ? hcn_tunnel_info_local_nonprim : NULL, cn_tunnel_info ? cn_tunnel_info_local_nonprim : NULL, additional_cn_tunnel_info ? additional_cn_tunnel_info_local_nonprim : NULL, session_ambr ? session_ambr_local_nonprim : NULL, qos_flows_setup_list ? qos_flows_setup_listList : NULL, - h_smf_instance_id ? ogs_strdup_or_assert(h_smf_instance_id->valuestring) : NULL, - smf_instance_id ? ogs_strdup_or_assert(smf_instance_id->valuestring) : NULL, + h_smf_instance_id ? ogs_strdup(h_smf_instance_id->valuestring) : NULL, + smf_instance_id ? ogs_strdup(smf_instance_id->valuestring) : NULL, pdu_session_id ? true : false, pdu_session_id ? pdu_session_id->valuedouble : 0, s_nssai ? s_nssai_local_nonprim : NULL, enable_pause_charging ? true : false, enable_pause_charging ? enable_pause_charging->valueint : 0, - ue_ipv4_address ? ogs_strdup_or_assert(ue_ipv4_address->valuestring) : NULL, - ue_ipv6_prefix ? ogs_strdup_or_assert(ue_ipv6_prefix->valuestring) : NULL, + ue_ipv4_address ? ogs_strdup(ue_ipv4_address->valuestring) : NULL, + ue_ipv6_prefix ? ogs_strdup(ue_ipv6_prefix->valuestring) : NULL, n1_sm_info_to_ue ? n1_sm_info_to_ue_local_nonprim : NULL, eps_pdn_cnx_info ? eps_pdn_cnx_info_local_nonprim : NULL, eps_bearer_info ? eps_bearer_infoList : NULL, - supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, + supported_features ? ogs_strdup(supported_features->valuestring) : NULL, max_integrity_protected_data_rate ? max_integrity_protected_data_rateVariable : 0, max_integrity_protected_data_rate_dl ? max_integrity_protected_data_rate_dlVariable : 0, always_on_granted ? true : false, always_on_granted ? always_on_granted->valueint : 0, - gpsi ? ogs_strdup_or_assert(gpsi->valuestring) : NULL, + gpsi ? ogs_strdup(gpsi->valuestring) : NULL, up_security ? up_security_local_nonprim : NULL, roaming_charging_profile ? roaming_charging_profile_local_nonprim : NULL, - h_smf_service_instance_id ? ogs_strdup_or_assert(h_smf_service_instance_id->valuestring) : NULL, - smf_service_instance_id ? ogs_strdup_or_assert(smf_service_instance_id->valuestring) : NULL, - recovery_time ? ogs_strdup_or_assert(recovery_time->valuestring) : NULL, + h_smf_service_instance_id ? ogs_strdup(h_smf_service_instance_id->valuestring) : NULL, + smf_service_instance_id ? ogs_strdup(smf_service_instance_id->valuestring) : NULL, + recovery_time ? ogs_strdup(recovery_time->valuestring) : NULL, dnai_list ? dnai_listList : NULL, ipv6_multi_homing_ind ? true : false, ipv6_multi_homing_ind ? ipv6_multi_homing_ind->valueint : 0, ma_accepted_ind ? true : false, ma_accepted_ind ? ma_accepted_ind->valueint : 0, - home_provided_charging_id ? ogs_strdup_or_assert(home_provided_charging_id->valuestring) : NULL, + home_provided_charging_id ? ogs_strdup(home_provided_charging_id->valuestring) : NULL, nef_ext_buf_support_ind ? true : false, nef_ext_buf_support_ind ? nef_ext_buf_support_ind->valueint : 0, small_data_rate_control_enabled ? true : false, small_data_rate_control_enabled ? small_data_rate_control_enabled->valueint : 0, - ue_ipv6_interface_id ? ogs_strdup_or_assert(ue_ipv6_interface_id->valuestring) : NULL, + ue_ipv6_interface_id ? ogs_strdup(ue_ipv6_interface_id->valuestring) : NULL, ipv6_index ? true : false, ipv6_index ? ipv6_index->valuedouble : 0, dn_aaa_address ? dn_aaa_address_local_nonprim : NULL, diff --git a/lib/sbi/openapi/model/pdu_session_management_data.c b/lib/sbi/openapi/model/pdu_session_management_data.c index f75010e8a..bd4f92230 100644 --- a/lib/sbi/openapi/model/pdu_session_management_data.c +++ b/lib/sbi/openapi/model/pdu_session_management_data.c @@ -22,10 +22,9 @@ OpenAPI_pdu_session_management_data_t *OpenAPI_pdu_session_management_data_creat char *supp_feat ) { - OpenAPI_pdu_session_management_data_t *pdu_session_management_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_pdu_session_management_data_t)); - if (!pdu_session_management_data_local_var) { - return NULL; - } + OpenAPI_pdu_session_management_data_t *pdu_session_management_data_local_var = ogs_malloc(sizeof(OpenAPI_pdu_session_management_data_t)); + ogs_assert(pdu_session_management_data_local_var); + pdu_session_management_data_local_var->pdu_session_status = pdu_session_status; pdu_session_management_data_local_var->pdu_session_status_ts = pdu_session_status_ts; pdu_session_management_data_local_var->dnai = dnai; @@ -318,7 +317,7 @@ OpenAPI_pdu_session_management_data_t *OpenAPI_pdu_session_management_data_parse ogs_error("OpenAPI_pdu_session_management_data_parseFromJSON() failed [ipv6_prefix]"); goto end; } - OpenAPI_list_add(ipv6_prefixList , ogs_strdup_or_assert(ipv6_prefix_local->valuestring)); + OpenAPI_list_add(ipv6_prefixList , ogs_strdup(ipv6_prefix_local->valuestring)); } } @@ -338,7 +337,7 @@ OpenAPI_pdu_session_management_data_t *OpenAPI_pdu_session_management_data_parse ogs_error("OpenAPI_pdu_session_management_data_parseFromJSON() failed [ipv6_addrs]"); goto end; } - OpenAPI_list_add(ipv6_addrsList , ogs_strdup_or_assert(ipv6_addrs_local->valuestring)); + OpenAPI_list_add(ipv6_addrsList , ogs_strdup(ipv6_addrs_local->valuestring)); } } @@ -391,20 +390,20 @@ OpenAPI_pdu_session_management_data_t *OpenAPI_pdu_session_management_data_parse pdu_session_management_data_local_var = OpenAPI_pdu_session_management_data_create ( pdu_session_status ? pdu_session_status_local_nonprim : NULL, - pdu_session_status_ts ? ogs_strdup_or_assert(pdu_session_status_ts->valuestring) : NULL, - dnai ? ogs_strdup_or_assert(dnai->valuestring) : NULL, - dnai_ts ? ogs_strdup_or_assert(dnai_ts->valuestring) : NULL, + pdu_session_status_ts ? ogs_strdup(pdu_session_status_ts->valuestring) : NULL, + dnai ? ogs_strdup(dnai->valuestring) : NULL, + dnai_ts ? ogs_strdup(dnai_ts->valuestring) : NULL, n6_traffic_routing_info ? n6_traffic_routing_infoList : NULL, - n6_traffic_routing_info_ts ? ogs_strdup_or_assert(n6_traffic_routing_info_ts->valuestring) : NULL, - ipv4_addr ? ogs_strdup_or_assert(ipv4_addr->valuestring) : NULL, + n6_traffic_routing_info_ts ? ogs_strdup(n6_traffic_routing_info_ts->valuestring) : NULL, + ipv4_addr ? ogs_strdup(ipv4_addr->valuestring) : NULL, ipv6_prefix ? ipv6_prefixList : NULL, ipv6_addrs ? ipv6_addrsList : NULL, pdu_sess_type ? pdu_sess_typeVariable : 0, - ip_addr_ts ? ogs_strdup_or_assert(ip_addr_ts->valuestring) : NULL, - dnn ? ogs_strdup_or_assert(dnn->valuestring) : NULL, + ip_addr_ts ? ogs_strdup(ip_addr_ts->valuestring) : NULL, + dnn ? ogs_strdup(dnn->valuestring) : NULL, pdu_session_id ? true : false, pdu_session_id ? pdu_session_id->valuedouble : 0, - supp_feat ? ogs_strdup_or_assert(supp_feat->valuestring) : NULL + supp_feat ? ogs_strdup(supp_feat->valuestring) : NULL ); return pdu_session_management_data_local_var; diff --git a/lib/sbi/openapi/model/pdu_session_notify_item.c b/lib/sbi/openapi/model/pdu_session_notify_item.c index 1c1bb312d..04f97c8d7 100644 --- a/lib/sbi/openapi/model/pdu_session_notify_item.c +++ b/lib/sbi/openapi/model/pdu_session_notify_item.c @@ -8,10 +8,9 @@ OpenAPI_pdu_session_notify_item_t *OpenAPI_pdu_session_notify_item_create( OpenAPI_notification_cause_e notification_cause ) { - OpenAPI_pdu_session_notify_item_t *pdu_session_notify_item_local_var = OpenAPI_malloc(sizeof(OpenAPI_pdu_session_notify_item_t)); - if (!pdu_session_notify_item_local_var) { - return NULL; - } + OpenAPI_pdu_session_notify_item_t *pdu_session_notify_item_local_var = ogs_malloc(sizeof(OpenAPI_pdu_session_notify_item_t)); + ogs_assert(pdu_session_notify_item_local_var); + pdu_session_notify_item_local_var->notification_cause = notification_cause; return pdu_session_notify_item_local_var; diff --git a/lib/sbi/openapi/model/pdu_session_status.c b/lib/sbi/openapi/model/pdu_session_status.c index 3db924d72..f15c13ea7 100644 --- a/lib/sbi/openapi/model/pdu_session_status.c +++ b/lib/sbi/openapi/model/pdu_session_status.c @@ -7,10 +7,9 @@ OpenAPI_pdu_session_status_t *OpenAPI_pdu_session_status_create( ) { - OpenAPI_pdu_session_status_t *pdu_session_status_local_var = OpenAPI_malloc(sizeof(OpenAPI_pdu_session_status_t)); - if (!pdu_session_status_local_var) { - return NULL; - } + OpenAPI_pdu_session_status_t *pdu_session_status_local_var = ogs_malloc(sizeof(OpenAPI_pdu_session_status_t)); + ogs_assert(pdu_session_status_local_var); + return pdu_session_status_local_var; } diff --git a/lib/sbi/openapi/model/pdu_session_status_cfg.c b/lib/sbi/openapi/model/pdu_session_status_cfg.c index 6443a3384..895918f25 100644 --- a/lib/sbi/openapi/model/pdu_session_status_cfg.c +++ b/lib/sbi/openapi/model/pdu_session_status_cfg.c @@ -8,10 +8,9 @@ OpenAPI_pdu_session_status_cfg_t *OpenAPI_pdu_session_status_cfg_create( char *dnn ) { - OpenAPI_pdu_session_status_cfg_t *pdu_session_status_cfg_local_var = OpenAPI_malloc(sizeof(OpenAPI_pdu_session_status_cfg_t)); - if (!pdu_session_status_cfg_local_var) { - return NULL; - } + OpenAPI_pdu_session_status_cfg_t *pdu_session_status_cfg_local_var = ogs_malloc(sizeof(OpenAPI_pdu_session_status_cfg_t)); + ogs_assert(pdu_session_status_cfg_local_var); + pdu_session_status_cfg_local_var->dnn = dnn; return pdu_session_status_cfg_local_var; @@ -61,7 +60,7 @@ OpenAPI_pdu_session_status_cfg_t *OpenAPI_pdu_session_status_cfg_parseFromJSON(c } pdu_session_status_cfg_local_var = OpenAPI_pdu_session_status_cfg_create ( - dnn ? ogs_strdup_or_assert(dnn->valuestring) : NULL + dnn ? ogs_strdup(dnn->valuestring) : NULL ); return pdu_session_status_cfg_local_var; diff --git a/lib/sbi/openapi/model/pdu_session_tsn_bridge.c b/lib/sbi/openapi/model/pdu_session_tsn_bridge.c index 7b6a17e6c..9ea5b359d 100644 --- a/lib/sbi/openapi/model/pdu_session_tsn_bridge.c +++ b/lib/sbi/openapi/model/pdu_session_tsn_bridge.c @@ -11,10 +11,9 @@ OpenAPI_pdu_session_tsn_bridge_t *OpenAPI_pdu_session_tsn_bridge_create( OpenAPI_list_t *tsn_port_man_cont_nwtts ) { - OpenAPI_pdu_session_tsn_bridge_t *pdu_session_tsn_bridge_local_var = OpenAPI_malloc(sizeof(OpenAPI_pdu_session_tsn_bridge_t)); - if (!pdu_session_tsn_bridge_local_var) { - return NULL; - } + OpenAPI_pdu_session_tsn_bridge_t *pdu_session_tsn_bridge_local_var = ogs_malloc(sizeof(OpenAPI_pdu_session_tsn_bridge_t)); + ogs_assert(pdu_session_tsn_bridge_local_var); + pdu_session_tsn_bridge_local_var->tsn_bridge_info = tsn_bridge_info; pdu_session_tsn_bridge_local_var->tsn_bridge_man_cont = tsn_bridge_man_cont; pdu_session_tsn_bridge_local_var->tsn_port_man_cont_dstt = tsn_port_man_cont_dstt; diff --git a/lib/sbi/openapi/model/pdu_session_types.c b/lib/sbi/openapi/model/pdu_session_types.c index 06a81491e..14e129250 100644 --- a/lib/sbi/openapi/model/pdu_session_types.c +++ b/lib/sbi/openapi/model/pdu_session_types.c @@ -9,10 +9,9 @@ OpenAPI_pdu_session_types_t *OpenAPI_pdu_session_types_create( OpenAPI_list_t *allowed_session_types ) { - OpenAPI_pdu_session_types_t *pdu_session_types_local_var = OpenAPI_malloc(sizeof(OpenAPI_pdu_session_types_t)); - if (!pdu_session_types_local_var) { - return NULL; - } + OpenAPI_pdu_session_types_t *pdu_session_types_local_var = ogs_malloc(sizeof(OpenAPI_pdu_session_types_t)); + ogs_assert(pdu_session_types_local_var); + pdu_session_types_local_var->default_session_type = default_session_type; pdu_session_types_local_var->allowed_session_types = allowed_session_types; diff --git a/lib/sbi/openapi/model/pdu_session_types_1.c b/lib/sbi/openapi/model/pdu_session_types_1.c index 97ae12fb4..8d1eb5815 100644 --- a/lib/sbi/openapi/model/pdu_session_types_1.c +++ b/lib/sbi/openapi/model/pdu_session_types_1.c @@ -9,10 +9,9 @@ OpenAPI_pdu_session_types_1_t *OpenAPI_pdu_session_types_1_create( OpenAPI_list_t *allowed_session_types ) { - OpenAPI_pdu_session_types_1_t *pdu_session_types_1_local_var = OpenAPI_malloc(sizeof(OpenAPI_pdu_session_types_1_t)); - if (!pdu_session_types_1_local_var) { - return NULL; - } + OpenAPI_pdu_session_types_1_t *pdu_session_types_1_local_var = ogs_malloc(sizeof(OpenAPI_pdu_session_types_1_t)); + ogs_assert(pdu_session_types_1_local_var); + pdu_session_types_1_local_var->default_session_type = default_session_type; pdu_session_types_1_local_var->allowed_session_types = allowed_session_types; diff --git a/lib/sbi/openapi/model/pei_update_info.c b/lib/sbi/openapi/model/pei_update_info.c index 43b6d6415..339a1db83 100644 --- a/lib/sbi/openapi/model/pei_update_info.c +++ b/lib/sbi/openapi/model/pei_update_info.c @@ -8,10 +8,9 @@ OpenAPI_pei_update_info_t *OpenAPI_pei_update_info_create( char *pei ) { - OpenAPI_pei_update_info_t *pei_update_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_pei_update_info_t)); - if (!pei_update_info_local_var) { - return NULL; - } + OpenAPI_pei_update_info_t *pei_update_info_local_var = ogs_malloc(sizeof(OpenAPI_pei_update_info_t)); + ogs_assert(pei_update_info_local_var); + pei_update_info_local_var->pei = pei; return pei_update_info_local_var; @@ -61,7 +60,7 @@ OpenAPI_pei_update_info_t *OpenAPI_pei_update_info_parseFromJSON(cJSON *pei_upda } pei_update_info_local_var = OpenAPI_pei_update_info_create ( - ogs_strdup_or_assert(pei->valuestring) + ogs_strdup(pei->valuestring) ); return pei_update_info_local_var; diff --git a/lib/sbi/openapi/model/periodicity.c b/lib/sbi/openapi/model/periodicity.c index 04f631a87..5af84a287 100644 --- a/lib/sbi/openapi/model/periodicity.c +++ b/lib/sbi/openapi/model/periodicity.c @@ -7,10 +7,9 @@ OpenAPI_periodicity_t *OpenAPI_periodicity_create( ) { - OpenAPI_periodicity_t *periodicity_local_var = OpenAPI_malloc(sizeof(OpenAPI_periodicity_t)); - if (!periodicity_local_var) { - return NULL; - } + OpenAPI_periodicity_t *periodicity_local_var = ogs_malloc(sizeof(OpenAPI_periodicity_t)); + ogs_assert(periodicity_local_var); + return periodicity_local_var; } diff --git a/lib/sbi/openapi/model/pfd_change_notification.c b/lib/sbi/openapi/model/pfd_change_notification.c index a3b2a2b26..74ee2dadf 100644 --- a/lib/sbi/openapi/model/pfd_change_notification.c +++ b/lib/sbi/openapi/model/pfd_change_notification.c @@ -13,10 +13,9 @@ OpenAPI_pfd_change_notification_t *OpenAPI_pfd_change_notification_create( OpenAPI_list_t *pfds ) { - OpenAPI_pfd_change_notification_t *pfd_change_notification_local_var = OpenAPI_malloc(sizeof(OpenAPI_pfd_change_notification_t)); - if (!pfd_change_notification_local_var) { - return NULL; - } + OpenAPI_pfd_change_notification_t *pfd_change_notification_local_var = ogs_malloc(sizeof(OpenAPI_pfd_change_notification_t)); + ogs_assert(pfd_change_notification_local_var); + pfd_change_notification_local_var->application_id = application_id; pfd_change_notification_local_var->is_removal_flag = is_removal_flag; pfd_change_notification_local_var->removal_flag = removal_flag; @@ -150,7 +149,7 @@ OpenAPI_pfd_change_notification_t *OpenAPI_pfd_change_notification_parseFromJSON } pfd_change_notification_local_var = OpenAPI_pfd_change_notification_create ( - ogs_strdup_or_assert(application_id->valuestring), + ogs_strdup(application_id->valuestring), removal_flag ? true : false, removal_flag ? removal_flag->valueint : 0, partial_flag ? true : false, diff --git a/lib/sbi/openapi/model/pfd_content.c b/lib/sbi/openapi/model/pfd_content.c index 7a6f0bbd0..80e707c80 100644 --- a/lib/sbi/openapi/model/pfd_content.c +++ b/lib/sbi/openapi/model/pfd_content.c @@ -12,10 +12,9 @@ OpenAPI_pfd_content_t *OpenAPI_pfd_content_create( OpenAPI_domain_name_protocol_t *dn_protocol ) { - OpenAPI_pfd_content_t *pfd_content_local_var = OpenAPI_malloc(sizeof(OpenAPI_pfd_content_t)); - if (!pfd_content_local_var) { - return NULL; - } + OpenAPI_pfd_content_t *pfd_content_local_var = ogs_malloc(sizeof(OpenAPI_pfd_content_t)); + ogs_assert(pfd_content_local_var); + pfd_content_local_var->pfd_id = pfd_id; pfd_content_local_var->flow_descriptions = flow_descriptions; pfd_content_local_var->urls = urls; @@ -158,7 +157,7 @@ OpenAPI_pfd_content_t *OpenAPI_pfd_content_parseFromJSON(cJSON *pfd_contentJSON) ogs_error("OpenAPI_pfd_content_parseFromJSON() failed [flow_descriptions]"); goto end; } - OpenAPI_list_add(flow_descriptionsList , ogs_strdup_or_assert(flow_descriptions_local->valuestring)); + OpenAPI_list_add(flow_descriptionsList , ogs_strdup(flow_descriptions_local->valuestring)); } } @@ -178,7 +177,7 @@ OpenAPI_pfd_content_t *OpenAPI_pfd_content_parseFromJSON(cJSON *pfd_contentJSON) ogs_error("OpenAPI_pfd_content_parseFromJSON() failed [urls]"); goto end; } - OpenAPI_list_add(urlsList , ogs_strdup_or_assert(urls_local->valuestring)); + OpenAPI_list_add(urlsList , ogs_strdup(urls_local->valuestring)); } } @@ -198,7 +197,7 @@ OpenAPI_pfd_content_t *OpenAPI_pfd_content_parseFromJSON(cJSON *pfd_contentJSON) ogs_error("OpenAPI_pfd_content_parseFromJSON() failed [domain_names]"); goto end; } - OpenAPI_list_add(domain_namesList , ogs_strdup_or_assert(domain_names_local->valuestring)); + OpenAPI_list_add(domain_namesList , ogs_strdup(domain_names_local->valuestring)); } } @@ -210,7 +209,7 @@ OpenAPI_pfd_content_t *OpenAPI_pfd_content_parseFromJSON(cJSON *pfd_contentJSON) } pfd_content_local_var = OpenAPI_pfd_content_create ( - pfd_id ? ogs_strdup_or_assert(pfd_id->valuestring) : NULL, + pfd_id ? ogs_strdup(pfd_id->valuestring) : NULL, flow_descriptions ? flow_descriptionsList : NULL, urls ? urlsList : NULL, domain_names ? domain_namesList : NULL, diff --git a/lib/sbi/openapi/model/pfd_data.c b/lib/sbi/openapi/model/pfd_data.c index 2b2bbe023..f5d0f47d4 100644 --- a/lib/sbi/openapi/model/pfd_data.c +++ b/lib/sbi/openapi/model/pfd_data.c @@ -9,10 +9,9 @@ OpenAPI_pfd_data_t *OpenAPI_pfd_data_create( OpenAPI_list_t *af_ids ) { - OpenAPI_pfd_data_t *pfd_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_pfd_data_t)); - if (!pfd_data_local_var) { - return NULL; - } + OpenAPI_pfd_data_t *pfd_data_local_var = ogs_malloc(sizeof(OpenAPI_pfd_data_t)); + ogs_assert(pfd_data_local_var); + pfd_data_local_var->app_ids = app_ids; pfd_data_local_var->af_ids = af_ids; @@ -101,7 +100,7 @@ OpenAPI_pfd_data_t *OpenAPI_pfd_data_parseFromJSON(cJSON *pfd_dataJSON) ogs_error("OpenAPI_pfd_data_parseFromJSON() failed [app_ids]"); goto end; } - OpenAPI_list_add(app_idsList , ogs_strdup_or_assert(app_ids_local->valuestring)); + OpenAPI_list_add(app_idsList , ogs_strdup(app_ids_local->valuestring)); } } @@ -121,7 +120,7 @@ OpenAPI_pfd_data_t *OpenAPI_pfd_data_parseFromJSON(cJSON *pfd_dataJSON) ogs_error("OpenAPI_pfd_data_parseFromJSON() failed [af_ids]"); goto end; } - OpenAPI_list_add(af_idsList , ogs_strdup_or_assert(af_ids_local->valuestring)); + OpenAPI_list_add(af_idsList , ogs_strdup(af_ids_local->valuestring)); } } diff --git a/lib/sbi/openapi/model/pfd_data_for_app.c b/lib/sbi/openapi/model/pfd_data_for_app.c index f4990cee9..7918ae8a2 100644 --- a/lib/sbi/openapi/model/pfd_data_for_app.c +++ b/lib/sbi/openapi/model/pfd_data_for_app.c @@ -10,10 +10,9 @@ OpenAPI_pfd_data_for_app_t *OpenAPI_pfd_data_for_app_create( char *caching_time ) { - OpenAPI_pfd_data_for_app_t *pfd_data_for_app_local_var = OpenAPI_malloc(sizeof(OpenAPI_pfd_data_for_app_t)); - if (!pfd_data_for_app_local_var) { - return NULL; - } + OpenAPI_pfd_data_for_app_t *pfd_data_for_app_local_var = ogs_malloc(sizeof(OpenAPI_pfd_data_for_app_t)); + ogs_assert(pfd_data_for_app_local_var); + pfd_data_for_app_local_var->application_id = application_id; pfd_data_for_app_local_var->pfds = pfds; pfd_data_for_app_local_var->caching_time = caching_time; @@ -129,9 +128,9 @@ OpenAPI_pfd_data_for_app_t *OpenAPI_pfd_data_for_app_parseFromJSON(cJSON *pfd_da } pfd_data_for_app_local_var = OpenAPI_pfd_data_for_app_create ( - ogs_strdup_or_assert(application_id->valuestring), + ogs_strdup(application_id->valuestring), pfdsList, - caching_time ? ogs_strdup_or_assert(caching_time->valuestring) : NULL + caching_time ? ogs_strdup(caching_time->valuestring) : NULL ); return pfd_data_for_app_local_var; diff --git a/lib/sbi/openapi/model/pfd_data_for_app_ext.c b/lib/sbi/openapi/model/pfd_data_for_app_ext.c index 72293fc8e..72d30f516 100644 --- a/lib/sbi/openapi/model/pfd_data_for_app_ext.c +++ b/lib/sbi/openapi/model/pfd_data_for_app_ext.c @@ -11,10 +11,9 @@ OpenAPI_pfd_data_for_app_ext_t *OpenAPI_pfd_data_for_app_ext_create( char *supp_feat ) { - OpenAPI_pfd_data_for_app_ext_t *pfd_data_for_app_ext_local_var = OpenAPI_malloc(sizeof(OpenAPI_pfd_data_for_app_ext_t)); - if (!pfd_data_for_app_ext_local_var) { - return NULL; - } + OpenAPI_pfd_data_for_app_ext_t *pfd_data_for_app_ext_local_var = ogs_malloc(sizeof(OpenAPI_pfd_data_for_app_ext_t)); + ogs_assert(pfd_data_for_app_ext_local_var); + pfd_data_for_app_ext_local_var->application_id = application_id; pfd_data_for_app_ext_local_var->pfds = pfds; pfd_data_for_app_ext_local_var->caching_time = caching_time; @@ -148,10 +147,10 @@ OpenAPI_pfd_data_for_app_ext_t *OpenAPI_pfd_data_for_app_ext_parseFromJSON(cJSON } pfd_data_for_app_ext_local_var = OpenAPI_pfd_data_for_app_ext_create ( - ogs_strdup_or_assert(application_id->valuestring), + ogs_strdup(application_id->valuestring), pfdsList, - caching_time ? ogs_strdup_or_assert(caching_time->valuestring) : NULL, - supp_feat ? ogs_strdup_or_assert(supp_feat->valuestring) : NULL + caching_time ? ogs_strdup(caching_time->valuestring) : NULL, + supp_feat ? ogs_strdup(supp_feat->valuestring) : NULL ); return pfd_data_for_app_ext_local_var; diff --git a/lib/sbi/openapi/model/pfd_data_for_app_ext_all_of.c b/lib/sbi/openapi/model/pfd_data_for_app_ext_all_of.c index e858b5ab7..6a2358b6c 100644 --- a/lib/sbi/openapi/model/pfd_data_for_app_ext_all_of.c +++ b/lib/sbi/openapi/model/pfd_data_for_app_ext_all_of.c @@ -8,10 +8,9 @@ OpenAPI_pfd_data_for_app_ext_all_of_t *OpenAPI_pfd_data_for_app_ext_all_of_creat char *supp_feat ) { - OpenAPI_pfd_data_for_app_ext_all_of_t *pfd_data_for_app_ext_all_of_local_var = OpenAPI_malloc(sizeof(OpenAPI_pfd_data_for_app_ext_all_of_t)); - if (!pfd_data_for_app_ext_all_of_local_var) { - return NULL; - } + OpenAPI_pfd_data_for_app_ext_all_of_t *pfd_data_for_app_ext_all_of_local_var = ogs_malloc(sizeof(OpenAPI_pfd_data_for_app_ext_all_of_t)); + ogs_assert(pfd_data_for_app_ext_all_of_local_var); + pfd_data_for_app_ext_all_of_local_var->supp_feat = supp_feat; return pfd_data_for_app_ext_all_of_local_var; @@ -61,7 +60,7 @@ OpenAPI_pfd_data_for_app_ext_all_of_t *OpenAPI_pfd_data_for_app_ext_all_of_parse } pfd_data_for_app_ext_all_of_local_var = OpenAPI_pfd_data_for_app_ext_all_of_create ( - supp_feat ? ogs_strdup_or_assert(supp_feat->valuestring) : NULL + supp_feat ? ogs_strdup(supp_feat->valuestring) : NULL ); return pfd_data_for_app_ext_all_of_local_var; diff --git a/lib/sbi/openapi/model/pgw_info.c b/lib/sbi/openapi/model/pgw_info.c index 41dd68d2c..32f6aae98 100644 --- a/lib/sbi/openapi/model/pgw_info.c +++ b/lib/sbi/openapi/model/pgw_info.c @@ -12,10 +12,9 @@ OpenAPI_pgw_info_t *OpenAPI_pgw_info_create( int epdg_ind ) { - OpenAPI_pgw_info_t *pgw_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_pgw_info_t)); - if (!pgw_info_local_var) { - return NULL; - } + OpenAPI_pgw_info_t *pgw_info_local_var = ogs_malloc(sizeof(OpenAPI_pgw_info_t)); + ogs_assert(pgw_info_local_var); + pgw_info_local_var->dnn = dnn; pgw_info_local_var->pgw_fqdn = pgw_fqdn; pgw_info_local_var->plmn_id = plmn_id; @@ -123,8 +122,8 @@ OpenAPI_pgw_info_t *OpenAPI_pgw_info_parseFromJSON(cJSON *pgw_infoJSON) } pgw_info_local_var = OpenAPI_pgw_info_create ( - ogs_strdup_or_assert(dnn->valuestring), - ogs_strdup_or_assert(pgw_fqdn->valuestring), + ogs_strdup(dnn->valuestring), + ogs_strdup(pgw_fqdn->valuestring), plmn_id ? plmn_id_local_nonprim : NULL, epdg_ind ? true : false, epdg_ind ? epdg_ind->valueint : 0 diff --git a/lib/sbi/openapi/model/pgw_info_1.c b/lib/sbi/openapi/model/pgw_info_1.c index 943b13739..708d2ccf7 100644 --- a/lib/sbi/openapi/model/pgw_info_1.c +++ b/lib/sbi/openapi/model/pgw_info_1.c @@ -12,10 +12,9 @@ OpenAPI_pgw_info_1_t *OpenAPI_pgw_info_1_create( int epdg_ind ) { - OpenAPI_pgw_info_1_t *pgw_info_1_local_var = OpenAPI_malloc(sizeof(OpenAPI_pgw_info_1_t)); - if (!pgw_info_1_local_var) { - return NULL; - } + OpenAPI_pgw_info_1_t *pgw_info_1_local_var = ogs_malloc(sizeof(OpenAPI_pgw_info_1_t)); + ogs_assert(pgw_info_1_local_var); + pgw_info_1_local_var->dnn = dnn; pgw_info_1_local_var->pgw_fqdn = pgw_fqdn; pgw_info_1_local_var->plmn_id = plmn_id; @@ -123,8 +122,8 @@ OpenAPI_pgw_info_1_t *OpenAPI_pgw_info_1_parseFromJSON(cJSON *pgw_info_1JSON) } pgw_info_1_local_var = OpenAPI_pgw_info_1_create ( - ogs_strdup_or_assert(dnn->valuestring), - ogs_strdup_or_assert(pgw_fqdn->valuestring), + ogs_strdup(dnn->valuestring), + ogs_strdup(pgw_fqdn->valuestring), plmn_id ? plmn_id_local_nonprim : NULL, epdg_ind ? true : false, epdg_ind ? epdg_ind->valueint : 0 diff --git a/lib/sbi/openapi/model/plmn_ec_info.c b/lib/sbi/openapi/model/plmn_ec_info.c index 1f5d887a1..2a2b43787 100644 --- a/lib/sbi/openapi/model/plmn_ec_info.c +++ b/lib/sbi/openapi/model/plmn_ec_info.c @@ -11,10 +11,9 @@ OpenAPI_plmn_ec_info_t *OpenAPI_plmn_ec_info_create( int ec_restriction_data_nb ) { - OpenAPI_plmn_ec_info_t *plmn_ec_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_plmn_ec_info_t)); - if (!plmn_ec_info_local_var) { - return NULL; - } + OpenAPI_plmn_ec_info_t *plmn_ec_info_local_var = ogs_malloc(sizeof(OpenAPI_plmn_ec_info_t)); + ogs_assert(plmn_ec_info_local_var); + plmn_ec_info_local_var->plmn_id = plmn_id; plmn_ec_info_local_var->ec_restriction_data_wb = ec_restriction_data_wb; plmn_ec_info_local_var->is_ec_restriction_data_nb = is_ec_restriction_data_nb; diff --git a/lib/sbi/openapi/model/plmn_id.c b/lib/sbi/openapi/model/plmn_id.c index 6140450a2..bc975cdb7 100644 --- a/lib/sbi/openapi/model/plmn_id.c +++ b/lib/sbi/openapi/model/plmn_id.c @@ -9,10 +9,9 @@ OpenAPI_plmn_id_t *OpenAPI_plmn_id_create( char *mnc ) { - OpenAPI_plmn_id_t *plmn_id_local_var = OpenAPI_malloc(sizeof(OpenAPI_plmn_id_t)); - if (!plmn_id_local_var) { - return NULL; - } + OpenAPI_plmn_id_t *plmn_id_local_var = ogs_malloc(sizeof(OpenAPI_plmn_id_t)); + ogs_assert(plmn_id_local_var); + plmn_id_local_var->mcc = mcc; plmn_id_local_var->mnc = mnc; @@ -80,8 +79,8 @@ OpenAPI_plmn_id_t *OpenAPI_plmn_id_parseFromJSON(cJSON *plmn_idJSON) } plmn_id_local_var = OpenAPI_plmn_id_create ( - ogs_strdup_or_assert(mcc->valuestring), - ogs_strdup_or_assert(mnc->valuestring) + ogs_strdup(mcc->valuestring), + ogs_strdup(mnc->valuestring) ); return plmn_id_local_var; diff --git a/lib/sbi/openapi/model/plmn_id_1.c b/lib/sbi/openapi/model/plmn_id_1.c index 63b69ff07..c56fe2d37 100644 --- a/lib/sbi/openapi/model/plmn_id_1.c +++ b/lib/sbi/openapi/model/plmn_id_1.c @@ -9,10 +9,9 @@ OpenAPI_plmn_id_1_t *OpenAPI_plmn_id_1_create( char *mnc ) { - OpenAPI_plmn_id_1_t *plmn_id_1_local_var = OpenAPI_malloc(sizeof(OpenAPI_plmn_id_1_t)); - if (!plmn_id_1_local_var) { - return NULL; - } + OpenAPI_plmn_id_1_t *plmn_id_1_local_var = ogs_malloc(sizeof(OpenAPI_plmn_id_1_t)); + ogs_assert(plmn_id_1_local_var); + plmn_id_1_local_var->mcc = mcc; plmn_id_1_local_var->mnc = mnc; @@ -80,8 +79,8 @@ OpenAPI_plmn_id_1_t *OpenAPI_plmn_id_1_parseFromJSON(cJSON *plmn_id_1JSON) } plmn_id_1_local_var = OpenAPI_plmn_id_1_create ( - ogs_strdup_or_assert(mcc->valuestring), - ogs_strdup_or_assert(mnc->valuestring) + ogs_strdup(mcc->valuestring), + ogs_strdup(mnc->valuestring) ); return plmn_id_1_local_var; diff --git a/lib/sbi/openapi/model/plmn_id_nid.c b/lib/sbi/openapi/model/plmn_id_nid.c index 98b6585d3..bd8f2c349 100644 --- a/lib/sbi/openapi/model/plmn_id_nid.c +++ b/lib/sbi/openapi/model/plmn_id_nid.c @@ -10,10 +10,9 @@ OpenAPI_plmn_id_nid_t *OpenAPI_plmn_id_nid_create( char *nid ) { - OpenAPI_plmn_id_nid_t *plmn_id_nid_local_var = OpenAPI_malloc(sizeof(OpenAPI_plmn_id_nid_t)); - if (!plmn_id_nid_local_var) { - return NULL; - } + OpenAPI_plmn_id_nid_t *plmn_id_nid_local_var = ogs_malloc(sizeof(OpenAPI_plmn_id_nid_t)); + ogs_assert(plmn_id_nid_local_var); + plmn_id_nid_local_var->mcc = mcc; plmn_id_nid_local_var->mnc = mnc; plmn_id_nid_local_var->nid = nid; @@ -99,9 +98,9 @@ OpenAPI_plmn_id_nid_t *OpenAPI_plmn_id_nid_parseFromJSON(cJSON *plmn_id_nidJSON) } plmn_id_nid_local_var = OpenAPI_plmn_id_nid_create ( - ogs_strdup_or_assert(mcc->valuestring), - ogs_strdup_or_assert(mnc->valuestring), - nid ? ogs_strdup_or_assert(nid->valuestring) : NULL + ogs_strdup(mcc->valuestring), + ogs_strdup(mnc->valuestring), + nid ? ogs_strdup(nid->valuestring) : NULL ); return plmn_id_nid_local_var; diff --git a/lib/sbi/openapi/model/plmn_id_nid_1.c b/lib/sbi/openapi/model/plmn_id_nid_1.c index 60244602e..7740dd13e 100644 --- a/lib/sbi/openapi/model/plmn_id_nid_1.c +++ b/lib/sbi/openapi/model/plmn_id_nid_1.c @@ -10,10 +10,9 @@ OpenAPI_plmn_id_nid_1_t *OpenAPI_plmn_id_nid_1_create( char *nid ) { - OpenAPI_plmn_id_nid_1_t *plmn_id_nid_1_local_var = OpenAPI_malloc(sizeof(OpenAPI_plmn_id_nid_1_t)); - if (!plmn_id_nid_1_local_var) { - return NULL; - } + OpenAPI_plmn_id_nid_1_t *plmn_id_nid_1_local_var = ogs_malloc(sizeof(OpenAPI_plmn_id_nid_1_t)); + ogs_assert(plmn_id_nid_1_local_var); + plmn_id_nid_1_local_var->mcc = mcc; plmn_id_nid_1_local_var->mnc = mnc; plmn_id_nid_1_local_var->nid = nid; @@ -99,9 +98,9 @@ OpenAPI_plmn_id_nid_1_t *OpenAPI_plmn_id_nid_1_parseFromJSON(cJSON *plmn_id_nid_ } plmn_id_nid_1_local_var = OpenAPI_plmn_id_nid_1_create ( - ogs_strdup_or_assert(mcc->valuestring), - ogs_strdup_or_assert(mnc->valuestring), - nid ? ogs_strdup_or_assert(nid->valuestring) : NULL + ogs_strdup(mcc->valuestring), + ogs_strdup(mnc->valuestring), + nid ? ogs_strdup(nid->valuestring) : NULL ); return plmn_id_nid_1_local_var; diff --git a/lib/sbi/openapi/model/plmn_operator_class.c b/lib/sbi/openapi/model/plmn_operator_class.c index e212f3a77..26ae98887 100644 --- a/lib/sbi/openapi/model/plmn_operator_class.c +++ b/lib/sbi/openapi/model/plmn_operator_class.c @@ -9,10 +9,9 @@ OpenAPI_plmn_operator_class_t *OpenAPI_plmn_operator_class_create( OpenAPI_list_t *lcs_client_ids ) { - OpenAPI_plmn_operator_class_t *plmn_operator_class_local_var = OpenAPI_malloc(sizeof(OpenAPI_plmn_operator_class_t)); - if (!plmn_operator_class_local_var) { - return NULL; - } + OpenAPI_plmn_operator_class_t *plmn_operator_class_local_var = ogs_malloc(sizeof(OpenAPI_plmn_operator_class_t)); + ogs_assert(plmn_operator_class_local_var); + plmn_operator_class_local_var->lcs_client_class = lcs_client_class; plmn_operator_class_local_var->lcs_client_ids = lcs_client_ids; @@ -100,7 +99,7 @@ OpenAPI_plmn_operator_class_t *OpenAPI_plmn_operator_class_parseFromJSON(cJSON * ogs_error("OpenAPI_plmn_operator_class_parseFromJSON() failed [lcs_client_ids]"); goto end; } - OpenAPI_list_add(lcs_client_idsList , ogs_strdup_or_assert(lcs_client_ids_local->valuestring)); + OpenAPI_list_add(lcs_client_idsList , ogs_strdup(lcs_client_ids_local->valuestring)); } plmn_operator_class_local_var = OpenAPI_plmn_operator_class_create ( diff --git a/lib/sbi/openapi/model/plmn_operator_class_1.c b/lib/sbi/openapi/model/plmn_operator_class_1.c index f1720c262..eac441bff 100644 --- a/lib/sbi/openapi/model/plmn_operator_class_1.c +++ b/lib/sbi/openapi/model/plmn_operator_class_1.c @@ -9,10 +9,9 @@ OpenAPI_plmn_operator_class_1_t *OpenAPI_plmn_operator_class_1_create( OpenAPI_list_t *lcs_client_ids ) { - OpenAPI_plmn_operator_class_1_t *plmn_operator_class_1_local_var = OpenAPI_malloc(sizeof(OpenAPI_plmn_operator_class_1_t)); - if (!plmn_operator_class_1_local_var) { - return NULL; - } + OpenAPI_plmn_operator_class_1_t *plmn_operator_class_1_local_var = ogs_malloc(sizeof(OpenAPI_plmn_operator_class_1_t)); + ogs_assert(plmn_operator_class_1_local_var); + plmn_operator_class_1_local_var->lcs_client_class = lcs_client_class; plmn_operator_class_1_local_var->lcs_client_ids = lcs_client_ids; @@ -100,7 +99,7 @@ OpenAPI_plmn_operator_class_1_t *OpenAPI_plmn_operator_class_1_parseFromJSON(cJS ogs_error("OpenAPI_plmn_operator_class_1_parseFromJSON() failed [lcs_client_ids]"); goto end; } - OpenAPI_list_add(lcs_client_idsList , ogs_strdup_or_assert(lcs_client_ids_local->valuestring)); + OpenAPI_list_add(lcs_client_idsList , ogs_strdup(lcs_client_ids_local->valuestring)); } plmn_operator_class_1_local_var = OpenAPI_plmn_operator_class_1_create ( diff --git a/lib/sbi/openapi/model/plmn_range.c b/lib/sbi/openapi/model/plmn_range.c index dd64117aa..427abf524 100644 --- a/lib/sbi/openapi/model/plmn_range.c +++ b/lib/sbi/openapi/model/plmn_range.c @@ -10,10 +10,9 @@ OpenAPI_plmn_range_t *OpenAPI_plmn_range_create( char *pattern ) { - OpenAPI_plmn_range_t *plmn_range_local_var = OpenAPI_malloc(sizeof(OpenAPI_plmn_range_t)); - if (!plmn_range_local_var) { - return NULL; - } + OpenAPI_plmn_range_t *plmn_range_local_var = ogs_malloc(sizeof(OpenAPI_plmn_range_t)); + ogs_assert(plmn_range_local_var); + plmn_range_local_var->start = start; plmn_range_local_var->end = end; plmn_range_local_var->pattern = pattern; @@ -99,9 +98,9 @@ OpenAPI_plmn_range_t *OpenAPI_plmn_range_parseFromJSON(cJSON *plmn_rangeJSON) } plmn_range_local_var = OpenAPI_plmn_range_create ( - start ? ogs_strdup_or_assert(start->valuestring) : NULL, - end ? ogs_strdup_or_assert(end->valuestring) : NULL, - pattern ? ogs_strdup_or_assert(pattern->valuestring) : NULL + start ? ogs_strdup(start->valuestring) : NULL, + end ? ogs_strdup(end->valuestring) : NULL, + pattern ? ogs_strdup(pattern->valuestring) : NULL ); return plmn_range_local_var; diff --git a/lib/sbi/openapi/model/plmn_route_selection_descriptor.c b/lib/sbi/openapi/model/plmn_route_selection_descriptor.c index 26d90d80d..ca98ccf73 100644 --- a/lib/sbi/openapi/model/plmn_route_selection_descriptor.c +++ b/lib/sbi/openapi/model/plmn_route_selection_descriptor.c @@ -9,10 +9,9 @@ OpenAPI_plmn_route_selection_descriptor_t *OpenAPI_plmn_route_selection_descript OpenAPI_list_t *snssai_route_sel_descs ) { - OpenAPI_plmn_route_selection_descriptor_t *plmn_route_selection_descriptor_local_var = OpenAPI_malloc(sizeof(OpenAPI_plmn_route_selection_descriptor_t)); - if (!plmn_route_selection_descriptor_local_var) { - return NULL; - } + OpenAPI_plmn_route_selection_descriptor_t *plmn_route_selection_descriptor_local_var = ogs_malloc(sizeof(OpenAPI_plmn_route_selection_descriptor_t)); + ogs_assert(plmn_route_selection_descriptor_local_var); + plmn_route_selection_descriptor_local_var->serving_plmn = serving_plmn; plmn_route_selection_descriptor_local_var->snssai_route_sel_descs = snssai_route_sel_descs; diff --git a/lib/sbi/openapi/model/plmn_snssai.c b/lib/sbi/openapi/model/plmn_snssai.c index 8efac97dc..073bf06bb 100644 --- a/lib/sbi/openapi/model/plmn_snssai.c +++ b/lib/sbi/openapi/model/plmn_snssai.c @@ -10,10 +10,9 @@ OpenAPI_plmn_snssai_t *OpenAPI_plmn_snssai_create( char *nid ) { - OpenAPI_plmn_snssai_t *plmn_snssai_local_var = OpenAPI_malloc(sizeof(OpenAPI_plmn_snssai_t)); - if (!plmn_snssai_local_var) { - return NULL; - } + OpenAPI_plmn_snssai_t *plmn_snssai_local_var = ogs_malloc(sizeof(OpenAPI_plmn_snssai_t)); + ogs_assert(plmn_snssai_local_var); + plmn_snssai_local_var->plmn_id = plmn_id; plmn_snssai_local_var->s_nssai_list = s_nssai_list; plmn_snssai_local_var->nid = nid; @@ -135,7 +134,7 @@ OpenAPI_plmn_snssai_t *OpenAPI_plmn_snssai_parseFromJSON(cJSON *plmn_snssaiJSON) plmn_snssai_local_var = OpenAPI_plmn_snssai_create ( plmn_id_local_nonprim, s_nssai_listList, - nid ? ogs_strdup_or_assert(nid->valuestring) : NULL + nid ? ogs_strdup(nid->valuestring) : NULL ); return plmn_snssai_local_var; diff --git a/lib/sbi/openapi/model/point.c b/lib/sbi/openapi/model/point.c index ed16eb91f..94b398907 100644 --- a/lib/sbi/openapi/model/point.c +++ b/lib/sbi/openapi/model/point.c @@ -9,10 +9,9 @@ OpenAPI_point_t *OpenAPI_point_create( OpenAPI_geographical_coordinates_t *point ) { - OpenAPI_point_t *point_local_var = OpenAPI_malloc(sizeof(OpenAPI_point_t)); - if (!point_local_var) { - return NULL; - } + OpenAPI_point_t *point_local_var = ogs_malloc(sizeof(OpenAPI_point_t)); + ogs_assert(point_local_var); + point_local_var->shape = shape; point_local_var->point = point; diff --git a/lib/sbi/openapi/model/point_all_of.c b/lib/sbi/openapi/model/point_all_of.c index a1d22a601..393ee3556 100644 --- a/lib/sbi/openapi/model/point_all_of.c +++ b/lib/sbi/openapi/model/point_all_of.c @@ -8,10 +8,9 @@ OpenAPI_point_all_of_t *OpenAPI_point_all_of_create( OpenAPI_geographical_coordinates_t *point ) { - OpenAPI_point_all_of_t *point_all_of_local_var = OpenAPI_malloc(sizeof(OpenAPI_point_all_of_t)); - if (!point_all_of_local_var) { - return NULL; - } + OpenAPI_point_all_of_t *point_all_of_local_var = ogs_malloc(sizeof(OpenAPI_point_all_of_t)); + ogs_assert(point_all_of_local_var); + point_all_of_local_var->point = point; return point_all_of_local_var; diff --git a/lib/sbi/openapi/model/point_altitude.c b/lib/sbi/openapi/model/point_altitude.c index fe724ed6c..11bc0385f 100644 --- a/lib/sbi/openapi/model/point_altitude.c +++ b/lib/sbi/openapi/model/point_altitude.c @@ -10,10 +10,9 @@ OpenAPI_point_altitude_t *OpenAPI_point_altitude_create( double altitude ) { - OpenAPI_point_altitude_t *point_altitude_local_var = OpenAPI_malloc(sizeof(OpenAPI_point_altitude_t)); - if (!point_altitude_local_var) { - return NULL; - } + OpenAPI_point_altitude_t *point_altitude_local_var = ogs_malloc(sizeof(OpenAPI_point_altitude_t)); + ogs_assert(point_altitude_local_var); + point_altitude_local_var->shape = shape; point_altitude_local_var->point = point; point_altitude_local_var->altitude = altitude; diff --git a/lib/sbi/openapi/model/point_altitude_all_of.c b/lib/sbi/openapi/model/point_altitude_all_of.c index fa6bd3bfc..9af2e3c27 100644 --- a/lib/sbi/openapi/model/point_altitude_all_of.c +++ b/lib/sbi/openapi/model/point_altitude_all_of.c @@ -9,10 +9,9 @@ OpenAPI_point_altitude_all_of_t *OpenAPI_point_altitude_all_of_create( double altitude ) { - OpenAPI_point_altitude_all_of_t *point_altitude_all_of_local_var = OpenAPI_malloc(sizeof(OpenAPI_point_altitude_all_of_t)); - if (!point_altitude_all_of_local_var) { - return NULL; - } + OpenAPI_point_altitude_all_of_t *point_altitude_all_of_local_var = ogs_malloc(sizeof(OpenAPI_point_altitude_all_of_t)); + ogs_assert(point_altitude_all_of_local_var); + point_altitude_all_of_local_var->point = point; point_altitude_all_of_local_var->altitude = altitude; diff --git a/lib/sbi/openapi/model/point_altitude_uncertainty.c b/lib/sbi/openapi/model/point_altitude_uncertainty.c index e91ab0095..57072b713 100644 --- a/lib/sbi/openapi/model/point_altitude_uncertainty.c +++ b/lib/sbi/openapi/model/point_altitude_uncertainty.c @@ -13,10 +13,9 @@ OpenAPI_point_altitude_uncertainty_t *OpenAPI_point_altitude_uncertainty_create( int confidence ) { - OpenAPI_point_altitude_uncertainty_t *point_altitude_uncertainty_local_var = OpenAPI_malloc(sizeof(OpenAPI_point_altitude_uncertainty_t)); - if (!point_altitude_uncertainty_local_var) { - return NULL; - } + OpenAPI_point_altitude_uncertainty_t *point_altitude_uncertainty_local_var = ogs_malloc(sizeof(OpenAPI_point_altitude_uncertainty_t)); + ogs_assert(point_altitude_uncertainty_local_var); + point_altitude_uncertainty_local_var->shape = shape; point_altitude_uncertainty_local_var->point = point; point_altitude_uncertainty_local_var->altitude = altitude; diff --git a/lib/sbi/openapi/model/point_altitude_uncertainty_all_of.c b/lib/sbi/openapi/model/point_altitude_uncertainty_all_of.c index 046daf637..bf771a76b 100644 --- a/lib/sbi/openapi/model/point_altitude_uncertainty_all_of.c +++ b/lib/sbi/openapi/model/point_altitude_uncertainty_all_of.c @@ -12,10 +12,9 @@ OpenAPI_point_altitude_uncertainty_all_of_t *OpenAPI_point_altitude_uncertainty_ int confidence ) { - OpenAPI_point_altitude_uncertainty_all_of_t *point_altitude_uncertainty_all_of_local_var = OpenAPI_malloc(sizeof(OpenAPI_point_altitude_uncertainty_all_of_t)); - if (!point_altitude_uncertainty_all_of_local_var) { - return NULL; - } + OpenAPI_point_altitude_uncertainty_all_of_t *point_altitude_uncertainty_all_of_local_var = ogs_malloc(sizeof(OpenAPI_point_altitude_uncertainty_all_of_t)); + ogs_assert(point_altitude_uncertainty_all_of_local_var); + point_altitude_uncertainty_all_of_local_var->point = point; point_altitude_uncertainty_all_of_local_var->altitude = altitude; point_altitude_uncertainty_all_of_local_var->uncertainty_ellipse = uncertainty_ellipse; diff --git a/lib/sbi/openapi/model/point_uncertainty_circle.c b/lib/sbi/openapi/model/point_uncertainty_circle.c index d9d0b57fb..11c046bf2 100644 --- a/lib/sbi/openapi/model/point_uncertainty_circle.c +++ b/lib/sbi/openapi/model/point_uncertainty_circle.c @@ -10,10 +10,9 @@ OpenAPI_point_uncertainty_circle_t *OpenAPI_point_uncertainty_circle_create( float uncertainty ) { - OpenAPI_point_uncertainty_circle_t *point_uncertainty_circle_local_var = OpenAPI_malloc(sizeof(OpenAPI_point_uncertainty_circle_t)); - if (!point_uncertainty_circle_local_var) { - return NULL; - } + OpenAPI_point_uncertainty_circle_t *point_uncertainty_circle_local_var = ogs_malloc(sizeof(OpenAPI_point_uncertainty_circle_t)); + ogs_assert(point_uncertainty_circle_local_var); + point_uncertainty_circle_local_var->shape = shape; point_uncertainty_circle_local_var->point = point; point_uncertainty_circle_local_var->uncertainty = uncertainty; diff --git a/lib/sbi/openapi/model/point_uncertainty_circle_all_of.c b/lib/sbi/openapi/model/point_uncertainty_circle_all_of.c index 776d9272a..7cea3759e 100644 --- a/lib/sbi/openapi/model/point_uncertainty_circle_all_of.c +++ b/lib/sbi/openapi/model/point_uncertainty_circle_all_of.c @@ -9,10 +9,9 @@ OpenAPI_point_uncertainty_circle_all_of_t *OpenAPI_point_uncertainty_circle_all_ float uncertainty ) { - OpenAPI_point_uncertainty_circle_all_of_t *point_uncertainty_circle_all_of_local_var = OpenAPI_malloc(sizeof(OpenAPI_point_uncertainty_circle_all_of_t)); - if (!point_uncertainty_circle_all_of_local_var) { - return NULL; - } + OpenAPI_point_uncertainty_circle_all_of_t *point_uncertainty_circle_all_of_local_var = ogs_malloc(sizeof(OpenAPI_point_uncertainty_circle_all_of_t)); + ogs_assert(point_uncertainty_circle_all_of_local_var); + point_uncertainty_circle_all_of_local_var->point = point; point_uncertainty_circle_all_of_local_var->uncertainty = uncertainty; diff --git a/lib/sbi/openapi/model/point_uncertainty_ellipse.c b/lib/sbi/openapi/model/point_uncertainty_ellipse.c index e54813983..7be8573fb 100644 --- a/lib/sbi/openapi/model/point_uncertainty_ellipse.c +++ b/lib/sbi/openapi/model/point_uncertainty_ellipse.c @@ -11,10 +11,9 @@ OpenAPI_point_uncertainty_ellipse_t *OpenAPI_point_uncertainty_ellipse_create( int confidence ) { - OpenAPI_point_uncertainty_ellipse_t *point_uncertainty_ellipse_local_var = OpenAPI_malloc(sizeof(OpenAPI_point_uncertainty_ellipse_t)); - if (!point_uncertainty_ellipse_local_var) { - return NULL; - } + OpenAPI_point_uncertainty_ellipse_t *point_uncertainty_ellipse_local_var = ogs_malloc(sizeof(OpenAPI_point_uncertainty_ellipse_t)); + ogs_assert(point_uncertainty_ellipse_local_var); + point_uncertainty_ellipse_local_var->shape = shape; point_uncertainty_ellipse_local_var->point = point; point_uncertainty_ellipse_local_var->uncertainty_ellipse = uncertainty_ellipse; diff --git a/lib/sbi/openapi/model/point_uncertainty_ellipse_all_of.c b/lib/sbi/openapi/model/point_uncertainty_ellipse_all_of.c index 86809b10e..323ac70a2 100644 --- a/lib/sbi/openapi/model/point_uncertainty_ellipse_all_of.c +++ b/lib/sbi/openapi/model/point_uncertainty_ellipse_all_of.c @@ -10,10 +10,9 @@ OpenAPI_point_uncertainty_ellipse_all_of_t *OpenAPI_point_uncertainty_ellipse_al int confidence ) { - OpenAPI_point_uncertainty_ellipse_all_of_t *point_uncertainty_ellipse_all_of_local_var = OpenAPI_malloc(sizeof(OpenAPI_point_uncertainty_ellipse_all_of_t)); - if (!point_uncertainty_ellipse_all_of_local_var) { - return NULL; - } + OpenAPI_point_uncertainty_ellipse_all_of_t *point_uncertainty_ellipse_all_of_local_var = ogs_malloc(sizeof(OpenAPI_point_uncertainty_ellipse_all_of_t)); + ogs_assert(point_uncertainty_ellipse_all_of_local_var); + point_uncertainty_ellipse_all_of_local_var->point = point; point_uncertainty_ellipse_all_of_local_var->uncertainty_ellipse = uncertainty_ellipse; point_uncertainty_ellipse_all_of_local_var->confidence = confidence; diff --git a/lib/sbi/openapi/model/policy_association.c b/lib/sbi/openapi/model/policy_association.c index 87468335f..ece82e1fb 100644 --- a/lib/sbi/openapi/model/policy_association.c +++ b/lib/sbi/openapi/model/policy_association.c @@ -17,10 +17,9 @@ OpenAPI_policy_association_t *OpenAPI_policy_association_create( char *supp_feat ) { - OpenAPI_policy_association_t *policy_association_local_var = OpenAPI_malloc(sizeof(OpenAPI_policy_association_t)); - if (!policy_association_local_var) { - return NULL; - } + OpenAPI_policy_association_t *policy_association_local_var = ogs_malloc(sizeof(OpenAPI_policy_association_t)); + ogs_assert(policy_association_local_var); + policy_association_local_var->request = request; policy_association_local_var->triggers = triggers; policy_association_local_var->serv_area_res = serv_area_res; @@ -49,6 +48,7 @@ void OpenAPI_policy_association_free(OpenAPI_policy_association_t *policy_associ OpenAPI_ambr_free(policy_association->ue_ambr); OpenAPI_list_for_each(policy_association->pras, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_presence_info_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -270,9 +270,9 @@ OpenAPI_policy_association_t *OpenAPI_policy_association_parseFromJSON(cJSON *po cJSON *localMapObject = pras_local_map; if (cJSON_IsObject(pras_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_presence_info_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_presence_info_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(pras_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_policy_association_parseFromJSON() failed [pras]"); goto end; @@ -302,7 +302,7 @@ OpenAPI_policy_association_t *OpenAPI_policy_association_parseFromJSON(cJSON *po smf_sel_info ? smf_sel_info_local_nonprim : NULL, ue_ambr ? ue_ambr_local_nonprim : NULL, pras ? prasList : NULL, - ogs_strdup_or_assert(supp_feat->valuestring) + ogs_strdup(supp_feat->valuestring) ); return policy_association_local_var; diff --git a/lib/sbi/openapi/model/policy_association_request.c b/lib/sbi/openapi/model/policy_association_request.c index 4893dd3dc..c46c4d514 100644 --- a/lib/sbi/openapi/model/policy_association_request.c +++ b/lib/sbi/openapi/model/policy_association_request.c @@ -34,10 +34,9 @@ OpenAPI_policy_association_request_t *OpenAPI_policy_association_request_create( char *supp_feat ) { - OpenAPI_policy_association_request_t *policy_association_request_local_var = OpenAPI_malloc(sizeof(OpenAPI_policy_association_request_t)); - if (!policy_association_request_local_var) { - return NULL; - } + OpenAPI_policy_association_request_t *policy_association_request_local_var = ogs_malloc(sizeof(OpenAPI_policy_association_request_t)); + ogs_assert(policy_association_request_local_var); + policy_association_request_local_var->notification_uri = notification_uri; policy_association_request_local_var->alt_notif_ipv4_addrs = alt_notif_ipv4_addrs; policy_association_request_local_var->alt_notif_ipv6_addrs = alt_notif_ipv6_addrs; @@ -475,7 +474,7 @@ OpenAPI_policy_association_request_t *OpenAPI_policy_association_request_parseFr ogs_error("OpenAPI_policy_association_request_parseFromJSON() failed [alt_notif_ipv4_addrs]"); goto end; } - OpenAPI_list_add(alt_notif_ipv4_addrsList , ogs_strdup_or_assert(alt_notif_ipv4_addrs_local->valuestring)); + OpenAPI_list_add(alt_notif_ipv4_addrsList , ogs_strdup(alt_notif_ipv4_addrs_local->valuestring)); } } @@ -495,7 +494,7 @@ OpenAPI_policy_association_request_t *OpenAPI_policy_association_request_parseFr ogs_error("OpenAPI_policy_association_request_parseFromJSON() failed [alt_notif_ipv6_addrs]"); goto end; } - OpenAPI_list_add(alt_notif_ipv6_addrsList , ogs_strdup_or_assert(alt_notif_ipv6_addrs_local->valuestring)); + OpenAPI_list_add(alt_notif_ipv6_addrsList , ogs_strdup(alt_notif_ipv6_addrs_local->valuestring)); } } @@ -515,7 +514,7 @@ OpenAPI_policy_association_request_t *OpenAPI_policy_association_request_parseFr ogs_error("OpenAPI_policy_association_request_parseFromJSON() failed [alt_notif_fqdns]"); goto end; } - OpenAPI_list_add(alt_notif_fqdnsList , ogs_strdup_or_assert(alt_notif_fqdns_local->valuestring)); + OpenAPI_list_add(alt_notif_fqdnsList , ogs_strdup(alt_notif_fqdns_local->valuestring)); } } @@ -653,7 +652,7 @@ OpenAPI_policy_association_request_t *OpenAPI_policy_association_request_parseFr ogs_error("OpenAPI_policy_association_request_parseFromJSON() failed [group_ids]"); goto end; } - OpenAPI_list_add(group_idsList , ogs_strdup_or_assert(group_ids_local->valuestring)); + OpenAPI_list_add(group_idsList , ogs_strdup(group_ids_local->valuestring)); } } @@ -791,17 +790,17 @@ OpenAPI_policy_association_request_t *OpenAPI_policy_association_request_parseFr } policy_association_request_local_var = OpenAPI_policy_association_request_create ( - ogs_strdup_or_assert(notification_uri->valuestring), + ogs_strdup(notification_uri->valuestring), alt_notif_ipv4_addrs ? alt_notif_ipv4_addrsList : NULL, alt_notif_ipv6_addrs ? alt_notif_ipv6_addrsList : NULL, alt_notif_fqdns ? alt_notif_fqdnsList : NULL, - ogs_strdup_or_assert(supi->valuestring), - gpsi ? ogs_strdup_or_assert(gpsi->valuestring) : NULL, + ogs_strdup(supi->valuestring), + gpsi ? ogs_strdup(gpsi->valuestring) : NULL, access_type ? access_typeVariable : 0, access_types ? access_typesList : NULL, - pei ? ogs_strdup_or_assert(pei->valuestring) : NULL, + pei ? ogs_strdup(pei->valuestring) : NULL, user_loc ? user_loc_local_nonprim : NULL, - time_zone ? ogs_strdup_or_assert(time_zone->valuestring) : NULL, + time_zone ? ogs_strdup(time_zone->valuestring) : NULL, serving_plmn ? serving_plmn_local_nonprim : NULL, rat_type ? rat_typeVariable : 0, rat_types ? rat_typesList : NULL, @@ -815,9 +814,9 @@ OpenAPI_policy_association_request_t *OpenAPI_policy_association_request_parseFr mapping_snssais ? mapping_snssaisList : NULL, n3g_allowed_snssais ? n3g_allowed_snssaisList : NULL, guami ? guami_local_nonprim : NULL, - service_name ? ogs_strdup_or_assert(service_name->valuestring) : NULL, + service_name ? ogs_strdup(service_name->valuestring) : NULL, trace_req ? trace_req_local_nonprim : NULL, - ogs_strdup_or_assert(supp_feat->valuestring) + ogs_strdup(supp_feat->valuestring) ); return policy_association_request_local_var; diff --git a/lib/sbi/openapi/model/policy_association_update_request.c b/lib/sbi/openapi/model/policy_association_update_request.c index d73a670eb..e039f30f0 100644 --- a/lib/sbi/openapi/model/policy_association_update_request.c +++ b/lib/sbi/openapi/model/policy_association_update_request.c @@ -27,10 +27,9 @@ OpenAPI_policy_association_update_request_t *OpenAPI_policy_association_update_r OpenAPI_guami_t *guami ) { - OpenAPI_policy_association_update_request_t *policy_association_update_request_local_var = OpenAPI_malloc(sizeof(OpenAPI_policy_association_update_request_t)); - if (!policy_association_update_request_local_var) { - return NULL; - } + OpenAPI_policy_association_update_request_t *policy_association_update_request_local_var = ogs_malloc(sizeof(OpenAPI_policy_association_update_request_t)); + ogs_assert(policy_association_update_request_local_var); + policy_association_update_request_local_var->notification_uri = notification_uri; policy_association_update_request_local_var->alt_notif_ipv4_addrs = alt_notif_ipv4_addrs; policy_association_update_request_local_var->alt_notif_ipv6_addrs = alt_notif_ipv6_addrs; @@ -81,6 +80,7 @@ void OpenAPI_policy_association_update_request_free(OpenAPI_policy_association_u OpenAPI_ambr_free(policy_association_update_request->ue_ambr); OpenAPI_list_for_each(policy_association_update_request->pra_statuses, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_presence_info_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -428,7 +428,7 @@ OpenAPI_policy_association_update_request_t *OpenAPI_policy_association_update_r ogs_error("OpenAPI_policy_association_update_request_parseFromJSON() failed [alt_notif_ipv4_addrs]"); goto end; } - OpenAPI_list_add(alt_notif_ipv4_addrsList , ogs_strdup_or_assert(alt_notif_ipv4_addrs_local->valuestring)); + OpenAPI_list_add(alt_notif_ipv4_addrsList , ogs_strdup(alt_notif_ipv4_addrs_local->valuestring)); } } @@ -448,7 +448,7 @@ OpenAPI_policy_association_update_request_t *OpenAPI_policy_association_update_r ogs_error("OpenAPI_policy_association_update_request_parseFromJSON() failed [alt_notif_ipv6_addrs]"); goto end; } - OpenAPI_list_add(alt_notif_ipv6_addrsList , ogs_strdup_or_assert(alt_notif_ipv6_addrs_local->valuestring)); + OpenAPI_list_add(alt_notif_ipv6_addrsList , ogs_strdup(alt_notif_ipv6_addrs_local->valuestring)); } } @@ -468,7 +468,7 @@ OpenAPI_policy_association_update_request_t *OpenAPI_policy_association_update_r ogs_error("OpenAPI_policy_association_update_request_parseFromJSON() failed [alt_notif_fqdns]"); goto end; } - OpenAPI_list_add(alt_notif_fqdnsList , ogs_strdup_or_assert(alt_notif_fqdns_local->valuestring)); + OpenAPI_list_add(alt_notif_fqdnsList , ogs_strdup(alt_notif_fqdns_local->valuestring)); } } @@ -546,9 +546,9 @@ OpenAPI_policy_association_update_request_t *OpenAPI_policy_association_update_r cJSON *localMapObject = pra_statuses_local_map; if (cJSON_IsObject(pra_statuses_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_presence_info_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_presence_info_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(pra_statuses_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_policy_association_update_request_parseFromJSON() failed [pra_statuses]"); goto end; @@ -692,7 +692,7 @@ OpenAPI_policy_association_update_request_t *OpenAPI_policy_association_update_r } policy_association_update_request_local_var = OpenAPI_policy_association_update_request_create ( - notification_uri ? ogs_strdup_or_assert(notification_uri->valuestring) : NULL, + notification_uri ? ogs_strdup(notification_uri->valuestring) : NULL, alt_notif_ipv4_addrs ? alt_notif_ipv4_addrsList : NULL, alt_notif_ipv6_addrs ? alt_notif_ipv6_addrsList : NULL, alt_notif_fqdns ? alt_notif_fqdnsList : NULL, diff --git a/lib/sbi/openapi/model/policy_data_change_notification.c b/lib/sbi/openapi/model/policy_data_change_notification.c index 7237076e0..33e89b1f3 100644 --- a/lib/sbi/openapi/model/policy_data_change_notification.c +++ b/lib/sbi/openapi/model/policy_data_change_notification.c @@ -24,10 +24,9 @@ OpenAPI_policy_data_change_notification_t *OpenAPI_policy_data_change_notificati OpenAPI_list_t *reported_fragments ) { - OpenAPI_policy_data_change_notification_t *policy_data_change_notification_local_var = OpenAPI_malloc(sizeof(OpenAPI_policy_data_change_notification_t)); - if (!policy_data_change_notification_local_var) { - return NULL; - } + OpenAPI_policy_data_change_notification_t *policy_data_change_notification_local_var = ogs_malloc(sizeof(OpenAPI_policy_data_change_notification_t)); + ogs_assert(policy_data_change_notification_local_var); + policy_data_change_notification_local_var->am_policy_data = am_policy_data; policy_data_change_notification_local_var->ue_policy_set = ue_policy_set; policy_data_change_notification_local_var->plmn_ue_policy_set = plmn_ue_policy_set; @@ -65,6 +64,7 @@ void OpenAPI_policy_data_change_notification_free(OpenAPI_policy_data_change_not OpenAPI_operator_specific_data_container_free(policy_data_change_notification->op_spec_data); OpenAPI_list_for_each(policy_data_change_notification->op_spec_data_map, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_operator_specific_data_container_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -385,9 +385,9 @@ OpenAPI_policy_data_change_notification_t *OpenAPI_policy_data_change_notificati cJSON *localMapObject = op_spec_data_map_local_map; if (cJSON_IsObject(op_spec_data_map_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_operator_specific_data_container_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_operator_specific_data_container_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(op_spec_data_map_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_policy_data_change_notification_parseFromJSON() failed [op_spec_data_map]"); goto end; @@ -455,7 +455,7 @@ OpenAPI_policy_data_change_notification_t *OpenAPI_policy_data_change_notificati ogs_error("OpenAPI_policy_data_change_notification_parseFromJSON() failed [del_resources]"); goto end; } - OpenAPI_list_add(del_resourcesList , ogs_strdup_or_assert(del_resources_local->valuestring)); + OpenAPI_list_add(del_resourcesList , ogs_strdup(del_resources_local->valuestring)); } } @@ -501,13 +501,13 @@ OpenAPI_policy_data_change_notification_t *OpenAPI_policy_data_change_notificati bdt_data ? bdt_data_local_nonprim : NULL, op_spec_data ? op_spec_data_local_nonprim : NULL, op_spec_data_map ? op_spec_data_mapList : NULL, - ue_id ? ogs_strdup_or_assert(ue_id->valuestring) : NULL, - sponsor_id ? ogs_strdup_or_assert(sponsor_id->valuestring) : NULL, - bdt_ref_id ? ogs_strdup_or_assert(bdt_ref_id->valuestring) : NULL, - usage_mon_id ? ogs_strdup_or_assert(usage_mon_id->valuestring) : NULL, + ue_id ? ogs_strdup(ue_id->valuestring) : NULL, + sponsor_id ? ogs_strdup(sponsor_id->valuestring) : NULL, + bdt_ref_id ? ogs_strdup(bdt_ref_id->valuestring) : NULL, + usage_mon_id ? ogs_strdup(usage_mon_id->valuestring) : NULL, plmn_id ? plmn_id_local_nonprim : NULL, del_resources ? del_resourcesList : NULL, - notif_id ? ogs_strdup_or_assert(notif_id->valuestring) : NULL, + notif_id ? ogs_strdup(notif_id->valuestring) : NULL, reported_fragments ? reported_fragmentsList : NULL ); diff --git a/lib/sbi/openapi/model/policy_data_subscription.c b/lib/sbi/openapi/model/policy_data_subscription.c index 717e8da13..3c76e66f0 100644 --- a/lib/sbi/openapi/model/policy_data_subscription.c +++ b/lib/sbi/openapi/model/policy_data_subscription.c @@ -13,10 +13,9 @@ OpenAPI_policy_data_subscription_t *OpenAPI_policy_data_subscription_create( char *supported_features ) { - OpenAPI_policy_data_subscription_t *policy_data_subscription_local_var = OpenAPI_malloc(sizeof(OpenAPI_policy_data_subscription_t)); - if (!policy_data_subscription_local_var) { - return NULL; - } + OpenAPI_policy_data_subscription_t *policy_data_subscription_local_var = ogs_malloc(sizeof(OpenAPI_policy_data_subscription_t)); + ogs_assert(policy_data_subscription_local_var); + policy_data_subscription_local_var->notification_uri = notification_uri; policy_data_subscription_local_var->notif_id = notif_id; policy_data_subscription_local_var->monitored_resource_uris = monitored_resource_uris; @@ -164,7 +163,7 @@ OpenAPI_policy_data_subscription_t *OpenAPI_policy_data_subscription_parseFromJS ogs_error("OpenAPI_policy_data_subscription_parseFromJSON() failed [monitored_resource_uris]"); goto end; } - OpenAPI_list_add(monitored_resource_urisList , ogs_strdup_or_assert(monitored_resource_uris_local->valuestring)); + OpenAPI_list_add(monitored_resource_urisList , ogs_strdup(monitored_resource_uris_local->valuestring)); } cJSON *mon_res_items = cJSON_GetObjectItemCaseSensitive(policy_data_subscriptionJSON, "monResItems"); @@ -209,12 +208,12 @@ OpenAPI_policy_data_subscription_t *OpenAPI_policy_data_subscription_parseFromJS } policy_data_subscription_local_var = OpenAPI_policy_data_subscription_create ( - ogs_strdup_or_assert(notification_uri->valuestring), - notif_id ? ogs_strdup_or_assert(notif_id->valuestring) : NULL, + ogs_strdup(notification_uri->valuestring), + notif_id ? ogs_strdup(notif_id->valuestring) : NULL, monitored_resource_urisList, mon_res_items ? mon_res_itemsList : NULL, - expiry ? ogs_strdup_or_assert(expiry->valuestring) : NULL, - supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL + expiry ? ogs_strdup(expiry->valuestring) : NULL, + supported_features ? ogs_strdup(supported_features->valuestring) : NULL ); return policy_data_subscription_local_var; diff --git a/lib/sbi/openapi/model/policy_update.c b/lib/sbi/openapi/model/policy_update.c index 2e8734aaf..e31d0c549 100644 --- a/lib/sbi/openapi/model/policy_update.c +++ b/lib/sbi/openapi/model/policy_update.c @@ -16,10 +16,9 @@ OpenAPI_policy_update_t *OpenAPI_policy_update_create( OpenAPI_list_t* pras ) { - OpenAPI_policy_update_t *policy_update_local_var = OpenAPI_malloc(sizeof(OpenAPI_policy_update_t)); - if (!policy_update_local_var) { - return NULL; - } + OpenAPI_policy_update_t *policy_update_local_var = ogs_malloc(sizeof(OpenAPI_policy_update_t)); + ogs_assert(policy_update_local_var); + policy_update_local_var->resource_uri = resource_uri; policy_update_local_var->triggers = triggers; policy_update_local_var->serv_area_res = serv_area_res; @@ -47,6 +46,7 @@ void OpenAPI_policy_update_free(OpenAPI_policy_update_t *policy_update) OpenAPI_ambr_free(policy_update->ue_ambr); OpenAPI_list_for_each(policy_update->pras, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_presence_info_rm_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -258,9 +258,9 @@ OpenAPI_policy_update_t *OpenAPI_policy_update_parseFromJSON(cJSON *policy_updat cJSON *localMapObject = pras_local_map; if (cJSON_IsObject(pras_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_presence_info_rm_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_presence_info_rm_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(pras_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_policy_update_parseFromJSON() failed [pras]"); goto end; @@ -270,7 +270,7 @@ OpenAPI_policy_update_t *OpenAPI_policy_update_parseFromJSON(cJSON *policy_updat } policy_update_local_var = OpenAPI_policy_update_create ( - ogs_strdup_or_assert(resource_uri->valuestring), + ogs_strdup(resource_uri->valuestring), triggers ? triggersList : NULL, serv_area_res ? serv_area_res_local_nonprim : NULL, wl_serv_area_res ? wl_serv_area_res_local_nonprim : NULL, diff --git a/lib/sbi/openapi/model/polygon.c b/lib/sbi/openapi/model/polygon.c index a13ebd234..3e243bb05 100644 --- a/lib/sbi/openapi/model/polygon.c +++ b/lib/sbi/openapi/model/polygon.c @@ -9,10 +9,9 @@ OpenAPI_polygon_t *OpenAPI_polygon_create( OpenAPI_list_t *point_list ) { - OpenAPI_polygon_t *polygon_local_var = OpenAPI_malloc(sizeof(OpenAPI_polygon_t)); - if (!polygon_local_var) { - return NULL; - } + OpenAPI_polygon_t *polygon_local_var = ogs_malloc(sizeof(OpenAPI_polygon_t)); + ogs_assert(polygon_local_var); + polygon_local_var->shape = shape; polygon_local_var->point_list = point_list; diff --git a/lib/sbi/openapi/model/polygon_all_of.c b/lib/sbi/openapi/model/polygon_all_of.c index 5f6131d78..ff1fe63ee 100644 --- a/lib/sbi/openapi/model/polygon_all_of.c +++ b/lib/sbi/openapi/model/polygon_all_of.c @@ -8,10 +8,9 @@ OpenAPI_polygon_all_of_t *OpenAPI_polygon_all_of_create( OpenAPI_list_t *point_list ) { - OpenAPI_polygon_all_of_t *polygon_all_of_local_var = OpenAPI_malloc(sizeof(OpenAPI_polygon_all_of_t)); - if (!polygon_all_of_local_var) { - return NULL; - } + OpenAPI_polygon_all_of_t *polygon_all_of_local_var = ogs_malloc(sizeof(OpenAPI_polygon_all_of_t)); + ogs_assert(polygon_all_of_local_var); + polygon_all_of_local_var->point_list = point_list; return polygon_all_of_local_var; diff --git a/lib/sbi/openapi/model/port_management_container.c b/lib/sbi/openapi/model/port_management_container.c index 04fbb5b34..6cdc85135 100644 --- a/lib/sbi/openapi/model/port_management_container.c +++ b/lib/sbi/openapi/model/port_management_container.c @@ -9,10 +9,9 @@ OpenAPI_port_management_container_t *OpenAPI_port_management_container_create( int port_num ) { - OpenAPI_port_management_container_t *port_management_container_local_var = OpenAPI_malloc(sizeof(OpenAPI_port_management_container_t)); - if (!port_management_container_local_var) { - return NULL; - } + OpenAPI_port_management_container_t *port_management_container_local_var = ogs_malloc(sizeof(OpenAPI_port_management_container_t)); + ogs_assert(port_management_container_local_var); + port_management_container_local_var->port_man_cont = port_man_cont; port_management_container_local_var->port_num = port_num; diff --git a/lib/sbi/openapi/model/pp5g_vn_group_profile_data.c b/lib/sbi/openapi/model/pp5g_vn_group_profile_data.c index be74a17d1..7afb0496b 100644 --- a/lib/sbi/openapi/model/pp5g_vn_group_profile_data.c +++ b/lib/sbi/openapi/model/pp5g_vn_group_profile_data.c @@ -9,10 +9,9 @@ OpenAPI_pp5g_vn_group_profile_data_t *OpenAPI_pp5g_vn_group_profile_data_create( char *supported_features ) { - OpenAPI_pp5g_vn_group_profile_data_t *pp5g_vn_group_profile_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_pp5g_vn_group_profile_data_t)); - if (!pp5g_vn_group_profile_data_local_var) { - return NULL; - } + OpenAPI_pp5g_vn_group_profile_data_t *pp5g_vn_group_profile_data_local_var = ogs_malloc(sizeof(OpenAPI_pp5g_vn_group_profile_data_t)); + ogs_assert(pp5g_vn_group_profile_data_local_var); + pp5g_vn_group_profile_data_local_var->allowed_mtc_providers = allowed_mtc_providers; pp5g_vn_group_profile_data_local_var->supported_features = supported_features; @@ -27,6 +26,7 @@ void OpenAPI_pp5g_vn_group_profile_data_free(OpenAPI_pp5g_vn_group_profile_data_ OpenAPI_lnode_t *node; OpenAPI_list_for_each(pp5g_vn_group_profile_data->allowed_mtc_providers, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); ogs_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -102,7 +102,7 @@ OpenAPI_pp5g_vn_group_profile_data_t *OpenAPI_pp5g_vn_group_profile_data_parseFr pp5g_vn_group_profile_data_local_var = OpenAPI_pp5g_vn_group_profile_data_create ( allowed_mtc_providers ? allowed_mtc_providersList : NULL, - supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL + supported_features ? ogs_strdup(supported_features->valuestring) : NULL ); return pp5g_vn_group_profile_data_local_var; diff --git a/lib/sbi/openapi/model/pp_active_time.c b/lib/sbi/openapi/model/pp_active_time.c index 70c388d97..c2e0a5b68 100644 --- a/lib/sbi/openapi/model/pp_active_time.c +++ b/lib/sbi/openapi/model/pp_active_time.c @@ -12,10 +12,9 @@ OpenAPI_pp_active_time_t *OpenAPI_pp_active_time_create( char *mtc_provider_information ) { - OpenAPI_pp_active_time_t *pp_active_time_local_var = OpenAPI_malloc(sizeof(OpenAPI_pp_active_time_t)); - if (!pp_active_time_local_var) { - return NULL; - } + OpenAPI_pp_active_time_t *pp_active_time_local_var = ogs_malloc(sizeof(OpenAPI_pp_active_time_t)); + ogs_assert(pp_active_time_local_var); + pp_active_time_local_var->active_time = active_time; pp_active_time_local_var->af_instance_id = af_instance_id; pp_active_time_local_var->reference_id = reference_id; @@ -137,11 +136,11 @@ OpenAPI_pp_active_time_t *OpenAPI_pp_active_time_parseFromJSON(cJSON *pp_active_ pp_active_time_local_var = OpenAPI_pp_active_time_create ( active_time->valuedouble, - ogs_strdup_or_assert(af_instance_id->valuestring), + ogs_strdup(af_instance_id->valuestring), reference_id->valuedouble, - validity_time ? ogs_strdup_or_assert(validity_time->valuestring) : NULL, - mtc_provider_information ? ogs_strdup_or_assert(mtc_provider_information->valuestring) : NULL + validity_time ? ogs_strdup(validity_time->valuestring) : NULL, + mtc_provider_information ? ogs_strdup(mtc_provider_information->valuestring) : NULL ); return pp_active_time_local_var; diff --git a/lib/sbi/openapi/model/pp_data.c b/lib/sbi/openapi/model/pp_data.c index e18279ef3..ab63b75d9 100644 --- a/lib/sbi/openapi/model/pp_data.c +++ b/lib/sbi/openapi/model/pp_data.c @@ -15,10 +15,9 @@ OpenAPI_pp_data_t *OpenAPI_pp_data_create( OpenAPI_sor_info_t *sor_info ) { - OpenAPI_pp_data_t *pp_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_pp_data_t)); - if (!pp_data_local_var) { - return NULL; - } + OpenAPI_pp_data_t *pp_data_local_var = ogs_malloc(sizeof(OpenAPI_pp_data_t)); + ogs_assert(pp_data_local_var); + pp_data_local_var->communication_characteristics = communication_characteristics; pp_data_local_var->supported_features = supported_features; pp_data_local_var->expected_ue_behaviour_parameters = expected_ue_behaviour_parameters; @@ -219,11 +218,11 @@ OpenAPI_pp_data_t *OpenAPI_pp_data_parseFromJSON(cJSON *pp_dataJSON) pp_data_local_var = OpenAPI_pp_data_create ( communication_characteristics ? communication_characteristics_local_nonprim : NULL, - supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, + supported_features ? ogs_strdup(supported_features->valuestring) : NULL, expected_ue_behaviour_parameters ? expected_ue_behaviour_parameters_local_nonprim : NULL, ec_restriction ? ec_restriction_local_nonprim : NULL, acs_info ? acs_info_local_nonprim : NULL, - stn_sr ? ogs_strdup_or_assert(stn_sr->valuestring) : NULL, + stn_sr ? ogs_strdup(stn_sr->valuestring) : NULL, lcs_privacy ? lcs_privacy_local_nonprim : NULL, sor_info ? sor_info_local_nonprim : NULL ); diff --git a/lib/sbi/openapi/model/pp_dl_packet_count_ext.c b/lib/sbi/openapi/model/pp_dl_packet_count_ext.c index 5f0b9267f..b55fd8064 100644 --- a/lib/sbi/openapi/model/pp_dl_packet_count_ext.c +++ b/lib/sbi/openapi/model/pp_dl_packet_count_ext.c @@ -11,10 +11,9 @@ OpenAPI_pp_dl_packet_count_ext_t *OpenAPI_pp_dl_packet_count_ext_create( char *mtc_provider_information ) { - OpenAPI_pp_dl_packet_count_ext_t *pp_dl_packet_count_ext_local_var = OpenAPI_malloc(sizeof(OpenAPI_pp_dl_packet_count_ext_t)); - if (!pp_dl_packet_count_ext_local_var) { - return NULL; - } + OpenAPI_pp_dl_packet_count_ext_t *pp_dl_packet_count_ext_local_var = ogs_malloc(sizeof(OpenAPI_pp_dl_packet_count_ext_t)); + ogs_assert(pp_dl_packet_count_ext_local_var); + pp_dl_packet_count_ext_local_var->af_instance_id = af_instance_id; pp_dl_packet_count_ext_local_var->reference_id = reference_id; pp_dl_packet_count_ext_local_var->validity_time = validity_time; @@ -117,11 +116,11 @@ OpenAPI_pp_dl_packet_count_ext_t *OpenAPI_pp_dl_packet_count_ext_parseFromJSON(c } pp_dl_packet_count_ext_local_var = OpenAPI_pp_dl_packet_count_ext_create ( - ogs_strdup_or_assert(af_instance_id->valuestring), + ogs_strdup(af_instance_id->valuestring), reference_id->valuedouble, - validity_time ? ogs_strdup_or_assert(validity_time->valuestring) : NULL, - mtc_provider_information ? ogs_strdup_or_assert(mtc_provider_information->valuestring) : NULL + validity_time ? ogs_strdup(validity_time->valuestring) : NULL, + mtc_provider_information ? ogs_strdup(mtc_provider_information->valuestring) : NULL ); return pp_dl_packet_count_ext_local_var; diff --git a/lib/sbi/openapi/model/pp_maximum_latency.c b/lib/sbi/openapi/model/pp_maximum_latency.c index 3765c0dbe..f3f41c6ee 100644 --- a/lib/sbi/openapi/model/pp_maximum_latency.c +++ b/lib/sbi/openapi/model/pp_maximum_latency.c @@ -12,10 +12,9 @@ OpenAPI_pp_maximum_latency_t *OpenAPI_pp_maximum_latency_create( char *mtc_provider_information ) { - OpenAPI_pp_maximum_latency_t *pp_maximum_latency_local_var = OpenAPI_malloc(sizeof(OpenAPI_pp_maximum_latency_t)); - if (!pp_maximum_latency_local_var) { - return NULL; - } + OpenAPI_pp_maximum_latency_t *pp_maximum_latency_local_var = ogs_malloc(sizeof(OpenAPI_pp_maximum_latency_t)); + ogs_assert(pp_maximum_latency_local_var); + pp_maximum_latency_local_var->maximum_latency = maximum_latency; pp_maximum_latency_local_var->af_instance_id = af_instance_id; pp_maximum_latency_local_var->reference_id = reference_id; @@ -137,11 +136,11 @@ OpenAPI_pp_maximum_latency_t *OpenAPI_pp_maximum_latency_parseFromJSON(cJSON *pp pp_maximum_latency_local_var = OpenAPI_pp_maximum_latency_create ( maximum_latency->valuedouble, - ogs_strdup_or_assert(af_instance_id->valuestring), + ogs_strdup(af_instance_id->valuestring), reference_id->valuedouble, - validity_time ? ogs_strdup_or_assert(validity_time->valuestring) : NULL, - mtc_provider_information ? ogs_strdup_or_assert(mtc_provider_information->valuestring) : NULL + validity_time ? ogs_strdup(validity_time->valuestring) : NULL, + mtc_provider_information ? ogs_strdup(mtc_provider_information->valuestring) : NULL ); return pp_maximum_latency_local_var; diff --git a/lib/sbi/openapi/model/pp_maximum_response_time.c b/lib/sbi/openapi/model/pp_maximum_response_time.c index ab853ce82..ee548359b 100644 --- a/lib/sbi/openapi/model/pp_maximum_response_time.c +++ b/lib/sbi/openapi/model/pp_maximum_response_time.c @@ -12,10 +12,9 @@ OpenAPI_pp_maximum_response_time_t *OpenAPI_pp_maximum_response_time_create( char *mtc_provider_information ) { - OpenAPI_pp_maximum_response_time_t *pp_maximum_response_time_local_var = OpenAPI_malloc(sizeof(OpenAPI_pp_maximum_response_time_t)); - if (!pp_maximum_response_time_local_var) { - return NULL; - } + OpenAPI_pp_maximum_response_time_t *pp_maximum_response_time_local_var = ogs_malloc(sizeof(OpenAPI_pp_maximum_response_time_t)); + ogs_assert(pp_maximum_response_time_local_var); + pp_maximum_response_time_local_var->maximum_response_time = maximum_response_time; pp_maximum_response_time_local_var->af_instance_id = af_instance_id; pp_maximum_response_time_local_var->reference_id = reference_id; @@ -137,11 +136,11 @@ OpenAPI_pp_maximum_response_time_t *OpenAPI_pp_maximum_response_time_parseFromJS pp_maximum_response_time_local_var = OpenAPI_pp_maximum_response_time_create ( maximum_response_time->valuedouble, - ogs_strdup_or_assert(af_instance_id->valuestring), + ogs_strdup(af_instance_id->valuestring), reference_id->valuedouble, - validity_time ? ogs_strdup_or_assert(validity_time->valuestring) : NULL, - mtc_provider_information ? ogs_strdup_or_assert(mtc_provider_information->valuestring) : NULL + validity_time ? ogs_strdup(validity_time->valuestring) : NULL, + mtc_provider_information ? ogs_strdup(mtc_provider_information->valuestring) : NULL ); return pp_maximum_response_time_local_var; diff --git a/lib/sbi/openapi/model/pp_profile_data.c b/lib/sbi/openapi/model/pp_profile_data.c index 4f294fe6d..3feca81f8 100644 --- a/lib/sbi/openapi/model/pp_profile_data.c +++ b/lib/sbi/openapi/model/pp_profile_data.c @@ -9,10 +9,9 @@ OpenAPI_pp_profile_data_t *OpenAPI_pp_profile_data_create( char *supported_features ) { - OpenAPI_pp_profile_data_t *pp_profile_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_pp_profile_data_t)); - if (!pp_profile_data_local_var) { - return NULL; - } + OpenAPI_pp_profile_data_t *pp_profile_data_local_var = ogs_malloc(sizeof(OpenAPI_pp_profile_data_t)); + ogs_assert(pp_profile_data_local_var); + pp_profile_data_local_var->allowed_mtc_providers = allowed_mtc_providers; pp_profile_data_local_var->supported_features = supported_features; @@ -27,6 +26,7 @@ void OpenAPI_pp_profile_data_free(OpenAPI_pp_profile_data_t *pp_profile_data) OpenAPI_lnode_t *node; OpenAPI_list_for_each(pp_profile_data->allowed_mtc_providers, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); ogs_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -102,7 +102,7 @@ OpenAPI_pp_profile_data_t *OpenAPI_pp_profile_data_parseFromJSON(cJSON *pp_profi pp_profile_data_local_var = OpenAPI_pp_profile_data_create ( allowed_mtc_providers ? allowed_mtc_providersList : NULL, - supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL + supported_features ? ogs_strdup(supported_features->valuestring) : NULL ); return pp_profile_data_local_var; diff --git a/lib/sbi/openapi/model/pp_subs_reg_timer.c b/lib/sbi/openapi/model/pp_subs_reg_timer.c index 1468492b2..b83b3832a 100644 --- a/lib/sbi/openapi/model/pp_subs_reg_timer.c +++ b/lib/sbi/openapi/model/pp_subs_reg_timer.c @@ -12,10 +12,9 @@ OpenAPI_pp_subs_reg_timer_t *OpenAPI_pp_subs_reg_timer_create( char *mtc_provider_information ) { - OpenAPI_pp_subs_reg_timer_t *pp_subs_reg_timer_local_var = OpenAPI_malloc(sizeof(OpenAPI_pp_subs_reg_timer_t)); - if (!pp_subs_reg_timer_local_var) { - return NULL; - } + OpenAPI_pp_subs_reg_timer_t *pp_subs_reg_timer_local_var = ogs_malloc(sizeof(OpenAPI_pp_subs_reg_timer_t)); + ogs_assert(pp_subs_reg_timer_local_var); + pp_subs_reg_timer_local_var->subs_reg_timer = subs_reg_timer; pp_subs_reg_timer_local_var->af_instance_id = af_instance_id; pp_subs_reg_timer_local_var->reference_id = reference_id; @@ -137,11 +136,11 @@ OpenAPI_pp_subs_reg_timer_t *OpenAPI_pp_subs_reg_timer_parseFromJSON(cJSON *pp_s pp_subs_reg_timer_local_var = OpenAPI_pp_subs_reg_timer_create ( subs_reg_timer->valuedouble, - ogs_strdup_or_assert(af_instance_id->valuestring), + ogs_strdup(af_instance_id->valuestring), reference_id->valuedouble, - validity_time ? ogs_strdup_or_assert(validity_time->valuestring) : NULL, - mtc_provider_information ? ogs_strdup_or_assert(mtc_provider_information->valuestring) : NULL + validity_time ? ogs_strdup(validity_time->valuestring) : NULL, + mtc_provider_information ? ogs_strdup(mtc_provider_information->valuestring) : NULL ); return pp_subs_reg_timer_local_var; diff --git a/lib/sbi/openapi/model/preemption_capability_rm.c b/lib/sbi/openapi/model/preemption_capability_rm.c index f181bcc10..da11bcb67 100644 --- a/lib/sbi/openapi/model/preemption_capability_rm.c +++ b/lib/sbi/openapi/model/preemption_capability_rm.c @@ -7,10 +7,9 @@ OpenAPI_preemption_capability_rm_t *OpenAPI_preemption_capability_rm_create( ) { - OpenAPI_preemption_capability_rm_t *preemption_capability_rm_local_var = OpenAPI_malloc(sizeof(OpenAPI_preemption_capability_rm_t)); - if (!preemption_capability_rm_local_var) { - return NULL; - } + OpenAPI_preemption_capability_rm_t *preemption_capability_rm_local_var = ogs_malloc(sizeof(OpenAPI_preemption_capability_rm_t)); + ogs_assert(preemption_capability_rm_local_var); + return preemption_capability_rm_local_var; } diff --git a/lib/sbi/openapi/model/preemption_control_information_rm.c b/lib/sbi/openapi/model/preemption_control_information_rm.c index a89d190c1..b5b6cea97 100644 --- a/lib/sbi/openapi/model/preemption_control_information_rm.c +++ b/lib/sbi/openapi/model/preemption_control_information_rm.c @@ -7,10 +7,9 @@ OpenAPI_preemption_control_information_rm_t *OpenAPI_preemption_control_information_rm_create( ) { - OpenAPI_preemption_control_information_rm_t *preemption_control_information_rm_local_var = OpenAPI_malloc(sizeof(OpenAPI_preemption_control_information_rm_t)); - if (!preemption_control_information_rm_local_var) { - return NULL; - } + OpenAPI_preemption_control_information_rm_t *preemption_control_information_rm_local_var = ogs_malloc(sizeof(OpenAPI_preemption_control_information_rm_t)); + ogs_assert(preemption_control_information_rm_local_var); + return preemption_control_information_rm_local_var; } diff --git a/lib/sbi/openapi/model/preemption_vulnerability_rm.c b/lib/sbi/openapi/model/preemption_vulnerability_rm.c index 542b19113..4b84b1bde 100644 --- a/lib/sbi/openapi/model/preemption_vulnerability_rm.c +++ b/lib/sbi/openapi/model/preemption_vulnerability_rm.c @@ -7,10 +7,9 @@ OpenAPI_preemption_vulnerability_rm_t *OpenAPI_preemption_vulnerability_rm_create( ) { - OpenAPI_preemption_vulnerability_rm_t *preemption_vulnerability_rm_local_var = OpenAPI_malloc(sizeof(OpenAPI_preemption_vulnerability_rm_t)); - if (!preemption_vulnerability_rm_local_var) { - return NULL; - } + OpenAPI_preemption_vulnerability_rm_t *preemption_vulnerability_rm_local_var = ogs_malloc(sizeof(OpenAPI_preemption_vulnerability_rm_t)); + ogs_assert(preemption_vulnerability_rm_local_var); + return preemption_vulnerability_rm_local_var; } diff --git a/lib/sbi/openapi/model/preferred_search.c b/lib/sbi/openapi/model/preferred_search.c index 70cf276d4..7c4e32bd6 100644 --- a/lib/sbi/openapi/model/preferred_search.c +++ b/lib/sbi/openapi/model/preferred_search.c @@ -19,10 +19,9 @@ OpenAPI_preferred_search_t *OpenAPI_preferred_search_create( int other_locality_ind ) { - OpenAPI_preferred_search_t *preferred_search_local_var = OpenAPI_malloc(sizeof(OpenAPI_preferred_search_t)); - if (!preferred_search_local_var) { - return NULL; - } + OpenAPI_preferred_search_t *preferred_search_local_var = ogs_malloc(sizeof(OpenAPI_preferred_search_t)); + ogs_assert(preferred_search_local_var); + preferred_search_local_var->is_preferred_tai_match_ind = is_preferred_tai_match_ind; preferred_search_local_var->preferred_tai_match_ind = preferred_tai_match_ind; preferred_search_local_var->is_preferred_full_plmn_match_ind = is_preferred_full_plmn_match_ind; diff --git a/lib/sbi/openapi/model/presence_info.c b/lib/sbi/openapi/model/presence_info.c index e090b990a..a2a3a576a 100644 --- a/lib/sbi/openapi/model/presence_info.c +++ b/lib/sbi/openapi/model/presence_info.c @@ -15,10 +15,9 @@ OpenAPI_presence_info_t *OpenAPI_presence_info_create( OpenAPI_list_t *globale_nb_id_list ) { - OpenAPI_presence_info_t *presence_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_presence_info_t)); - if (!presence_info_local_var) { - return NULL; - } + OpenAPI_presence_info_t *presence_info_local_var = ogs_malloc(sizeof(OpenAPI_presence_info_t)); + ogs_assert(presence_info_local_var); + presence_info_local_var->pra_id = pra_id; presence_info_local_var->additional_pra_id = additional_pra_id; presence_info_local_var->presence_state = presence_state; @@ -345,8 +344,8 @@ OpenAPI_presence_info_t *OpenAPI_presence_info_parseFromJSON(cJSON *presence_inf } presence_info_local_var = OpenAPI_presence_info_create ( - pra_id ? ogs_strdup_or_assert(pra_id->valuestring) : NULL, - additional_pra_id ? ogs_strdup_or_assert(additional_pra_id->valuestring) : NULL, + pra_id ? ogs_strdup(pra_id->valuestring) : NULL, + additional_pra_id ? ogs_strdup(additional_pra_id->valuestring) : NULL, presence_state ? presence_stateVariable : 0, tracking_area_list ? tracking_area_listList : NULL, ecgi_list ? ecgi_listList : NULL, diff --git a/lib/sbi/openapi/model/presence_info_rm.c b/lib/sbi/openapi/model/presence_info_rm.c index 41db88b57..d9dc40029 100644 --- a/lib/sbi/openapi/model/presence_info_rm.c +++ b/lib/sbi/openapi/model/presence_info_rm.c @@ -15,10 +15,9 @@ OpenAPI_presence_info_rm_t *OpenAPI_presence_info_rm_create( OpenAPI_list_t *globale_nb_id_list ) { - OpenAPI_presence_info_rm_t *presence_info_rm_local_var = OpenAPI_malloc(sizeof(OpenAPI_presence_info_rm_t)); - if (!presence_info_rm_local_var) { - return NULL; - } + OpenAPI_presence_info_rm_t *presence_info_rm_local_var = ogs_malloc(sizeof(OpenAPI_presence_info_rm_t)); + ogs_assert(presence_info_rm_local_var); + presence_info_rm_local_var->pra_id = pra_id; presence_info_rm_local_var->additional_pra_id = additional_pra_id; presence_info_rm_local_var->presence_state = presence_state; @@ -345,8 +344,8 @@ OpenAPI_presence_info_rm_t *OpenAPI_presence_info_rm_parseFromJSON(cJSON *presen } presence_info_rm_local_var = OpenAPI_presence_info_rm_create ( - pra_id ? ogs_strdup_or_assert(pra_id->valuestring) : NULL, - additional_pra_id ? ogs_strdup_or_assert(additional_pra_id->valuestring) : NULL, + pra_id ? ogs_strdup(pra_id->valuestring) : NULL, + additional_pra_id ? ogs_strdup(additional_pra_id->valuestring) : NULL, presence_state ? presence_stateVariable : 0, tracking_area_list ? tracking_area_listList : NULL, ecgi_list ? ecgi_listList : NULL, diff --git a/lib/sbi/openapi/model/problem_details.c b/lib/sbi/openapi/model/problem_details.c index 37c92259e..ca1023a74 100644 --- a/lib/sbi/openapi/model/problem_details.c +++ b/lib/sbi/openapi/model/problem_details.c @@ -19,10 +19,9 @@ OpenAPI_problem_details_t *OpenAPI_problem_details_create( char *nrf_id ) { - OpenAPI_problem_details_t *problem_details_local_var = OpenAPI_malloc(sizeof(OpenAPI_problem_details_t)); - if (!problem_details_local_var) { - return NULL; - } + OpenAPI_problem_details_t *problem_details_local_var = ogs_malloc(sizeof(OpenAPI_problem_details_t)); + ogs_assert(problem_details_local_var); + problem_details_local_var->type = type; problem_details_local_var->title = title; problem_details_local_var->is_status = is_status; @@ -290,18 +289,18 @@ OpenAPI_problem_details_t *OpenAPI_problem_details_parseFromJSON(cJSON *problem_ } problem_details_local_var = OpenAPI_problem_details_create ( - type ? ogs_strdup_or_assert(type->valuestring) : NULL, - title ? ogs_strdup_or_assert(title->valuestring) : NULL, + type ? ogs_strdup(type->valuestring) : NULL, + title ? ogs_strdup(title->valuestring) : NULL, status ? true : false, status ? status->valuedouble : 0, - detail ? ogs_strdup_or_assert(detail->valuestring) : NULL, - instance ? ogs_strdup_or_assert(instance->valuestring) : NULL, - cause ? ogs_strdup_or_assert(cause->valuestring) : NULL, + detail ? ogs_strdup(detail->valuestring) : NULL, + instance ? ogs_strdup(instance->valuestring) : NULL, + cause ? ogs_strdup(cause->valuestring) : NULL, invalid_params ? invalid_paramsList : NULL, - supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, + supported_features ? ogs_strdup(supported_features->valuestring) : NULL, access_token_error ? access_token_error_local_nonprim : NULL, access_token_request ? access_token_request_local_nonprim : NULL, - nrf_id ? ogs_strdup_or_assert(nrf_id->valuestring) : NULL + nrf_id ? ogs_strdup(nrf_id->valuestring) : NULL ); return problem_details_local_var; diff --git a/lib/sbi/openapi/model/problem_details_1.c b/lib/sbi/openapi/model/problem_details_1.c index 8b1a08f3c..2dfe9edd4 100644 --- a/lib/sbi/openapi/model/problem_details_1.c +++ b/lib/sbi/openapi/model/problem_details_1.c @@ -15,10 +15,9 @@ OpenAPI_problem_details_1_t *OpenAPI_problem_details_1_create( OpenAPI_list_t *invalid_params ) { - OpenAPI_problem_details_1_t *problem_details_1_local_var = OpenAPI_malloc(sizeof(OpenAPI_problem_details_1_t)); - if (!problem_details_1_local_var) { - return NULL; - } + OpenAPI_problem_details_1_t *problem_details_1_local_var = ogs_malloc(sizeof(OpenAPI_problem_details_1_t)); + ogs_assert(problem_details_1_local_var); + problem_details_1_local_var->type = type; problem_details_1_local_var->title = title; problem_details_1_local_var->is_status = is_status; @@ -206,13 +205,13 @@ OpenAPI_problem_details_1_t *OpenAPI_problem_details_1_parseFromJSON(cJSON *prob } problem_details_1_local_var = OpenAPI_problem_details_1_create ( - type ? ogs_strdup_or_assert(type->valuestring) : NULL, - title ? ogs_strdup_or_assert(title->valuestring) : NULL, + type ? ogs_strdup(type->valuestring) : NULL, + title ? ogs_strdup(title->valuestring) : NULL, status ? true : false, status ? status->valuedouble : 0, - detail ? ogs_strdup_or_assert(detail->valuestring) : NULL, - instance ? ogs_strdup_or_assert(instance->valuestring) : NULL, - cause ? ogs_strdup_or_assert(cause->valuestring) : NULL, + detail ? ogs_strdup(detail->valuestring) : NULL, + instance ? ogs_strdup(instance->valuestring) : NULL, + cause ? ogs_strdup(cause->valuestring) : NULL, invalid_params ? invalid_paramsList : NULL ); diff --git a/lib/sbi/openapi/model/problem_details_add_info.c b/lib/sbi/openapi/model/problem_details_add_info.c index f69ead69c..a309835c6 100644 --- a/lib/sbi/openapi/model/problem_details_add_info.c +++ b/lib/sbi/openapi/model/problem_details_add_info.c @@ -9,10 +9,9 @@ OpenAPI_problem_details_add_info_t *OpenAPI_problem_details_add_info_create( int remote_error ) { - OpenAPI_problem_details_add_info_t *problem_details_add_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_problem_details_add_info_t)); - if (!problem_details_add_info_local_var) { - return NULL; - } + OpenAPI_problem_details_add_info_t *problem_details_add_info_local_var = ogs_malloc(sizeof(OpenAPI_problem_details_add_info_t)); + ogs_assert(problem_details_add_info_local_var); + problem_details_add_info_local_var->is_remote_error = is_remote_error; problem_details_add_info_local_var->remote_error = remote_error; diff --git a/lib/sbi/openapi/model/provisioned_data_sets.c b/lib/sbi/openapi/model/provisioned_data_sets.c index 270f0e114..bbe04dc6a 100644 --- a/lib/sbi/openapi/model/provisioned_data_sets.c +++ b/lib/sbi/openapi/model/provisioned_data_sets.c @@ -17,10 +17,9 @@ OpenAPI_provisioned_data_sets_t *OpenAPI_provisioned_data_sets_create( OpenAPI_v2x_subscription_data_t *v2x_data ) { - OpenAPI_provisioned_data_sets_t *provisioned_data_sets_local_var = OpenAPI_malloc(sizeof(OpenAPI_provisioned_data_sets_t)); - if (!provisioned_data_sets_local_var) { - return NULL; - } + OpenAPI_provisioned_data_sets_t *provisioned_data_sets_local_var = ogs_malloc(sizeof(OpenAPI_provisioned_data_sets_t)); + ogs_assert(provisioned_data_sets_local_var); + provisioned_data_sets_local_var->am_data = am_data; provisioned_data_sets_local_var->smf_sel_data = smf_sel_data; provisioned_data_sets_local_var->sms_subs_data = sms_subs_data; diff --git a/lib/sbi/openapi/model/psa_information.c b/lib/sbi/openapi/model/psa_information.c index ea176db50..b0d87e38d 100644 --- a/lib/sbi/openapi/model/psa_information.c +++ b/lib/sbi/openapi/model/psa_information.c @@ -11,10 +11,9 @@ OpenAPI_psa_information_t *OpenAPI_psa_information_create( char *psa_upf_id ) { - OpenAPI_psa_information_t *psa_information_local_var = OpenAPI_malloc(sizeof(OpenAPI_psa_information_t)); - if (!psa_information_local_var) { - return NULL; - } + OpenAPI_psa_information_t *psa_information_local_var = ogs_malloc(sizeof(OpenAPI_psa_information_t)); + ogs_assert(psa_information_local_var); + psa_information_local_var->psa_ind = psa_ind; psa_information_local_var->dnai_list = dnai_list; psa_information_local_var->ue_ipv6_prefix = ue_ipv6_prefix; @@ -119,7 +118,7 @@ OpenAPI_psa_information_t *OpenAPI_psa_information_parseFromJSON(cJSON *psa_info ogs_error("OpenAPI_psa_information_parseFromJSON() failed [dnai_list]"); goto end; } - OpenAPI_list_add(dnai_listList , ogs_strdup_or_assert(dnai_list_local->valuestring)); + OpenAPI_list_add(dnai_listList , ogs_strdup(dnai_list_local->valuestring)); } } @@ -144,8 +143,8 @@ OpenAPI_psa_information_t *OpenAPI_psa_information_parseFromJSON(cJSON *psa_info psa_information_local_var = OpenAPI_psa_information_create ( psa_ind ? psa_indVariable : 0, dnai_list ? dnai_listList : NULL, - ue_ipv6_prefix ? ogs_strdup_or_assert(ue_ipv6_prefix->valuestring) : NULL, - psa_upf_id ? ogs_strdup_or_assert(psa_upf_id->valuestring) : NULL + ue_ipv6_prefix ? ogs_strdup(ue_ipv6_prefix->valuestring) : NULL, + psa_upf_id ? ogs_strdup(psa_upf_id->valuestring) : NULL ); return psa_information_local_var; diff --git a/lib/sbi/openapi/model/ptw_parameters.c b/lib/sbi/openapi/model/ptw_parameters.c index 1123f9e2f..833bf283b 100644 --- a/lib/sbi/openapi/model/ptw_parameters.c +++ b/lib/sbi/openapi/model/ptw_parameters.c @@ -9,10 +9,9 @@ OpenAPI_ptw_parameters_t *OpenAPI_ptw_parameters_create( char *ptw_value ) { - OpenAPI_ptw_parameters_t *ptw_parameters_local_var = OpenAPI_malloc(sizeof(OpenAPI_ptw_parameters_t)); - if (!ptw_parameters_local_var) { - return NULL; - } + OpenAPI_ptw_parameters_t *ptw_parameters_local_var = ogs_malloc(sizeof(OpenAPI_ptw_parameters_t)); + ogs_assert(ptw_parameters_local_var); + ptw_parameters_local_var->operation_mode = operation_mode; ptw_parameters_local_var->ptw_value = ptw_value; @@ -82,7 +81,7 @@ OpenAPI_ptw_parameters_t *OpenAPI_ptw_parameters_parseFromJSON(cJSON *ptw_parame ptw_parameters_local_var = OpenAPI_ptw_parameters_create ( operation_modeVariable, - ogs_strdup_or_assert(ptw_value->valuestring) + ogs_strdup(ptw_value->valuestring) ); return ptw_parameters_local_var; diff --git a/lib/sbi/openapi/model/ptw_parameters_1.c b/lib/sbi/openapi/model/ptw_parameters_1.c index 9af6fd4ba..6310a64f7 100644 --- a/lib/sbi/openapi/model/ptw_parameters_1.c +++ b/lib/sbi/openapi/model/ptw_parameters_1.c @@ -9,10 +9,9 @@ OpenAPI_ptw_parameters_1_t *OpenAPI_ptw_parameters_1_create( char *ptw_value ) { - OpenAPI_ptw_parameters_1_t *ptw_parameters_1_local_var = OpenAPI_malloc(sizeof(OpenAPI_ptw_parameters_1_t)); - if (!ptw_parameters_1_local_var) { - return NULL; - } + OpenAPI_ptw_parameters_1_t *ptw_parameters_1_local_var = ogs_malloc(sizeof(OpenAPI_ptw_parameters_1_t)); + ogs_assert(ptw_parameters_1_local_var); + ptw_parameters_1_local_var->operation_mode = operation_mode; ptw_parameters_1_local_var->ptw_value = ptw_value; @@ -82,7 +81,7 @@ OpenAPI_ptw_parameters_1_t *OpenAPI_ptw_parameters_1_parseFromJSON(cJSON *ptw_pa ptw_parameters_1_local_var = OpenAPI_ptw_parameters_1_create ( operation_modeVariable, - ogs_strdup_or_assert(ptw_value->valuestring) + ogs_strdup(ptw_value->valuestring) ); return ptw_parameters_1_local_var; diff --git a/lib/sbi/openapi/model/pws_error_data.c b/lib/sbi/openapi/model/pws_error_data.c index ca77d5578..0cd49a3c7 100644 --- a/lib/sbi/openapi/model/pws_error_data.c +++ b/lib/sbi/openapi/model/pws_error_data.c @@ -8,10 +8,9 @@ OpenAPI_pws_error_data_t *OpenAPI_pws_error_data_create( int namf_cause ) { - OpenAPI_pws_error_data_t *pws_error_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_pws_error_data_t)); - if (!pws_error_data_local_var) { - return NULL; - } + OpenAPI_pws_error_data_t *pws_error_data_local_var = ogs_malloc(sizeof(OpenAPI_pws_error_data_t)); + ogs_assert(pws_error_data_local_var); + pws_error_data_local_var->namf_cause = namf_cause; return pws_error_data_local_var; diff --git a/lib/sbi/openapi/model/pws_information.c b/lib/sbi/openapi/model/pws_information.c index 6836022ba..becda60e0 100644 --- a/lib/sbi/openapi/model/pws_information.c +++ b/lib/sbi/openapi/model/pws_information.c @@ -14,10 +14,9 @@ OpenAPI_pws_information_t *OpenAPI_pws_information_create( char *omc_id ) { - OpenAPI_pws_information_t *pws_information_local_var = OpenAPI_malloc(sizeof(OpenAPI_pws_information_t)); - if (!pws_information_local_var) { - return NULL; - } + OpenAPI_pws_information_t *pws_information_local_var = ogs_malloc(sizeof(OpenAPI_pws_information_t)); + ogs_assert(pws_information_local_var); + pws_information_local_var->message_identifier = message_identifier; pws_information_local_var->serial_number = serial_number; pws_information_local_var->pws_container = pws_container; @@ -197,7 +196,7 @@ OpenAPI_pws_information_t *OpenAPI_pws_information_parseFromJSON(cJSON *pws_info bc_empty_area_list ? bc_empty_area_listList : NULL, send_ran_response ? true : false, send_ran_response ? send_ran_response->valueint : 0, - omc_id ? ogs_strdup_or_assert(omc_id->valuestring) : NULL + omc_id ? ogs_strdup(omc_id->valuestring) : NULL ); return pws_information_local_var; diff --git a/lib/sbi/openapi/model/pws_response_data.c b/lib/sbi/openapi/model/pws_response_data.c index e28fc3874..c44640518 100644 --- a/lib/sbi/openapi/model/pws_response_data.c +++ b/lib/sbi/openapi/model/pws_response_data.c @@ -11,10 +11,9 @@ OpenAPI_pws_response_data_t *OpenAPI_pws_response_data_create( OpenAPI_list_t *unknown_tai_list ) { - OpenAPI_pws_response_data_t *pws_response_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_pws_response_data_t)); - if (!pws_response_data_local_var) { - return NULL; - } + OpenAPI_pws_response_data_t *pws_response_data_local_var = ogs_malloc(sizeof(OpenAPI_pws_response_data_t)); + ogs_assert(pws_response_data_local_var); + pws_response_data_local_var->ngap_message_type = ngap_message_type; pws_response_data_local_var->serial_number = serial_number; pws_response_data_local_var->message_identifier = message_identifier; diff --git a/lib/sbi/openapi/model/qos_characteristics.c b/lib/sbi/openapi/model/qos_characteristics.c index 9f432fd8f..348431ff3 100644 --- a/lib/sbi/openapi/model/qos_characteristics.c +++ b/lib/sbi/openapi/model/qos_characteristics.c @@ -18,10 +18,9 @@ OpenAPI_qos_characteristics_t *OpenAPI_qos_characteristics_create( int ext_max_data_burst_vol ) { - OpenAPI_qos_characteristics_t *qos_characteristics_local_var = OpenAPI_malloc(sizeof(OpenAPI_qos_characteristics_t)); - if (!qos_characteristics_local_var) { - return NULL; - } + OpenAPI_qos_characteristics_t *qos_characteristics_local_var = ogs_malloc(sizeof(OpenAPI_qos_characteristics_t)); + ogs_assert(qos_characteristics_local_var); + qos_characteristics_local_var->_5qi = _5qi; qos_characteristics_local_var->resource_type = resource_type; qos_characteristics_local_var->priority_level = priority_level; @@ -202,7 +201,7 @@ OpenAPI_qos_characteristics_t *OpenAPI_qos_characteristics_parseFromJSON(cJSON * priority_level->valuedouble, packet_delay_budget->valuedouble, - ogs_strdup_or_assert(packet_error_rate->valuestring), + ogs_strdup(packet_error_rate->valuestring), averaging_window ? true : false, averaging_window ? averaging_window->valuedouble : 0, max_data_burst_vol ? true : false, diff --git a/lib/sbi/openapi/model/qos_data.c b/lib/sbi/openapi/model/qos_data.c index ec2c2c620..9d2c12384 100644 --- a/lib/sbi/openapi/model/qos_data.c +++ b/lib/sbi/openapi/model/qos_data.c @@ -38,10 +38,9 @@ OpenAPI_qos_data_t *OpenAPI_qos_data_create( char *packet_error_rate ) { - OpenAPI_qos_data_t *qos_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_qos_data_t)); - if (!qos_data_local_var) { - return NULL; - } + OpenAPI_qos_data_t *qos_data_local_var = ogs_malloc(sizeof(OpenAPI_qos_data_t)); + ogs_assert(qos_data_local_var); + qos_data_local_var->qos_id = qos_id; qos_data_local_var->is__5qi = is__5qi; qos_data_local_var->_5qi = _5qi; @@ -437,13 +436,13 @@ OpenAPI_qos_data_t *OpenAPI_qos_data_parseFromJSON(cJSON *qos_dataJSON) } qos_data_local_var = OpenAPI_qos_data_create ( - ogs_strdup_or_assert(qos_id->valuestring), + ogs_strdup(qos_id->valuestring), _5qi ? true : false, _5qi ? _5qi->valuedouble : 0, - maxbr_ul ? ogs_strdup_or_assert(maxbr_ul->valuestring) : NULL, - maxbr_dl ? ogs_strdup_or_assert(maxbr_dl->valuestring) : NULL, - gbr_ul ? ogs_strdup_or_assert(gbr_ul->valuestring) : NULL, - gbr_dl ? ogs_strdup_or_assert(gbr_dl->valuestring) : NULL, + maxbr_ul ? ogs_strdup(maxbr_ul->valuestring) : NULL, + maxbr_dl ? ogs_strdup(maxbr_dl->valuestring) : NULL, + gbr_ul ? ogs_strdup(gbr_ul->valuestring) : NULL, + gbr_dl ? ogs_strdup(gbr_dl->valuestring) : NULL, arp ? arp_local_nonprim : NULL, qnc ? true : false, qnc ? qnc->valueint : 0, @@ -455,8 +454,8 @@ OpenAPI_qos_data_t *OpenAPI_qos_data_parseFromJSON(cJSON *qos_dataJSON) max_data_burst_vol ? max_data_burst_vol->valuedouble : 0, reflective_qos ? true : false, reflective_qos ? reflective_qos->valueint : 0, - sharing_key_dl ? ogs_strdup_or_assert(sharing_key_dl->valuestring) : NULL, - sharing_key_ul ? ogs_strdup_or_assert(sharing_key_ul->valuestring) : NULL, + sharing_key_dl ? ogs_strdup(sharing_key_dl->valuestring) : NULL, + sharing_key_ul ? ogs_strdup(sharing_key_ul->valuestring) : NULL, max_packet_loss_rate_dl ? true : false, max_packet_loss_rate_dl ? max_packet_loss_rate_dl->valuedouble : 0, max_packet_loss_rate_ul ? true : false, @@ -467,7 +466,7 @@ OpenAPI_qos_data_t *OpenAPI_qos_data_parseFromJSON(cJSON *qos_dataJSON) ext_max_data_burst_vol ? ext_max_data_burst_vol->valuedouble : 0, packet_delay_budget ? true : false, packet_delay_budget ? packet_delay_budget->valuedouble : 0, - packet_error_rate ? ogs_strdup_or_assert(packet_error_rate->valuestring) : NULL + packet_error_rate ? ogs_strdup(packet_error_rate->valuestring) : NULL ); return qos_data_local_var; diff --git a/lib/sbi/openapi/model/qos_flow_add_modify_request_item.c b/lib/sbi/openapi/model/qos_flow_add_modify_request_item.c index 8caf5f031..4b1f3ecf7 100644 --- a/lib/sbi/openapi/model/qos_flow_add_modify_request_item.c +++ b/lib/sbi/openapi/model/qos_flow_add_modify_request_item.c @@ -14,10 +14,9 @@ OpenAPI_qos_flow_add_modify_request_item_t *OpenAPI_qos_flow_add_modify_request_ OpenAPI_qos_flow_access_type_e associated_an_type ) { - OpenAPI_qos_flow_add_modify_request_item_t *qos_flow_add_modify_request_item_local_var = OpenAPI_malloc(sizeof(OpenAPI_qos_flow_add_modify_request_item_t)); - if (!qos_flow_add_modify_request_item_local_var) { - return NULL; - } + OpenAPI_qos_flow_add_modify_request_item_t *qos_flow_add_modify_request_item_local_var = ogs_malloc(sizeof(OpenAPI_qos_flow_add_modify_request_item_t)); + ogs_assert(qos_flow_add_modify_request_item_local_var); + qos_flow_add_modify_request_item_local_var->qfi = qfi; qos_flow_add_modify_request_item_local_var->is_ebi = is_ebi; qos_flow_add_modify_request_item_local_var->ebi = ebi; diff --git a/lib/sbi/openapi/model/qos_flow_item.c b/lib/sbi/openapi/model/qos_flow_item.c index d2d8dc8f4..8ad3c0efe 100644 --- a/lib/sbi/openapi/model/qos_flow_item.c +++ b/lib/sbi/openapi/model/qos_flow_item.c @@ -13,10 +13,9 @@ OpenAPI_qos_flow_item_t *OpenAPI_qos_flow_item_create( int null_qo_s_profile_index ) { - OpenAPI_qos_flow_item_t *qos_flow_item_local_var = OpenAPI_malloc(sizeof(OpenAPI_qos_flow_item_t)); - if (!qos_flow_item_local_var) { - return NULL; - } + OpenAPI_qos_flow_item_t *qos_flow_item_local_var = ogs_malloc(sizeof(OpenAPI_qos_flow_item_t)); + ogs_assert(qos_flow_item_local_var); + qos_flow_item_local_var->qfi = qfi; qos_flow_item_local_var->cause = cause; qos_flow_item_local_var->is_current_qos_profile_index = is_current_qos_profile_index; diff --git a/lib/sbi/openapi/model/qos_flow_notify_item.c b/lib/sbi/openapi/model/qos_flow_notify_item.c index 54a4bfaa0..add3ce3ba 100644 --- a/lib/sbi/openapi/model/qos_flow_notify_item.c +++ b/lib/sbi/openapi/model/qos_flow_notify_item.c @@ -13,10 +13,9 @@ OpenAPI_qos_flow_notify_item_t *OpenAPI_qos_flow_notify_item_create( int null_qo_s_profile_index ) { - OpenAPI_qos_flow_notify_item_t *qos_flow_notify_item_local_var = OpenAPI_malloc(sizeof(OpenAPI_qos_flow_notify_item_t)); - if (!qos_flow_notify_item_local_var) { - return NULL; - } + OpenAPI_qos_flow_notify_item_t *qos_flow_notify_item_local_var = ogs_malloc(sizeof(OpenAPI_qos_flow_notify_item_t)); + ogs_assert(qos_flow_notify_item_local_var); + qos_flow_notify_item_local_var->qfi = qfi; qos_flow_notify_item_local_var->notification_cause = notification_cause; qos_flow_notify_item_local_var->is_current_qos_profile_index = is_current_qos_profile_index; diff --git a/lib/sbi/openapi/model/qos_flow_profile.c b/lib/sbi/openapi/model/qos_flow_profile.c index 80e339a01..0de401c61 100644 --- a/lib/sbi/openapi/model/qos_flow_profile.c +++ b/lib/sbi/openapi/model/qos_flow_profile.c @@ -17,10 +17,9 @@ OpenAPI_qos_flow_profile_t *OpenAPI_qos_flow_profile_create( int qos_rep_period ) { - OpenAPI_qos_flow_profile_t *qos_flow_profile_local_var = OpenAPI_malloc(sizeof(OpenAPI_qos_flow_profile_t)); - if (!qos_flow_profile_local_var) { - return NULL; - } + OpenAPI_qos_flow_profile_t *qos_flow_profile_local_var = ogs_malloc(sizeof(OpenAPI_qos_flow_profile_t)); + ogs_assert(qos_flow_profile_local_var); + qos_flow_profile_local_var->_5qi = _5qi; qos_flow_profile_local_var->non_dynamic5_qi = non_dynamic5_qi; qos_flow_profile_local_var->dynamic5_qi = dynamic5_qi; diff --git a/lib/sbi/openapi/model/qos_flow_release_request_item.c b/lib/sbi/openapi/model/qos_flow_release_request_item.c index 6d758fd04..6d297a98a 100644 --- a/lib/sbi/openapi/model/qos_flow_release_request_item.c +++ b/lib/sbi/openapi/model/qos_flow_release_request_item.c @@ -10,10 +10,9 @@ OpenAPI_qos_flow_release_request_item_t *OpenAPI_qos_flow_release_request_item_c char qos_flow_description ) { - OpenAPI_qos_flow_release_request_item_t *qos_flow_release_request_item_local_var = OpenAPI_malloc(sizeof(OpenAPI_qos_flow_release_request_item_t)); - if (!qos_flow_release_request_item_local_var) { - return NULL; - } + OpenAPI_qos_flow_release_request_item_t *qos_flow_release_request_item_local_var = ogs_malloc(sizeof(OpenAPI_qos_flow_release_request_item_t)); + ogs_assert(qos_flow_release_request_item_local_var); + qos_flow_release_request_item_local_var->qfi = qfi; qos_flow_release_request_item_local_var->qos_rules = qos_rules; qos_flow_release_request_item_local_var->qos_flow_description = qos_flow_description; diff --git a/lib/sbi/openapi/model/qos_flow_setup_item.c b/lib/sbi/openapi/model/qos_flow_setup_item.c index d131b5c65..f5e49d73a 100644 --- a/lib/sbi/openapi/model/qos_flow_setup_item.c +++ b/lib/sbi/openapi/model/qos_flow_setup_item.c @@ -14,10 +14,9 @@ OpenAPI_qos_flow_setup_item_t *OpenAPI_qos_flow_setup_item_create( OpenAPI_qos_flow_access_type_e associated_an_type ) { - OpenAPI_qos_flow_setup_item_t *qos_flow_setup_item_local_var = OpenAPI_malloc(sizeof(OpenAPI_qos_flow_setup_item_t)); - if (!qos_flow_setup_item_local_var) { - return NULL; - } + OpenAPI_qos_flow_setup_item_t *qos_flow_setup_item_local_var = ogs_malloc(sizeof(OpenAPI_qos_flow_setup_item_t)); + ogs_assert(qos_flow_setup_item_local_var); + qos_flow_setup_item_local_var->qfi = qfi; qos_flow_setup_item_local_var->qos_rules = qos_rules; qos_flow_setup_item_local_var->is_ebi = is_ebi; diff --git a/lib/sbi/openapi/model/qos_flow_tunnel.c b/lib/sbi/openapi/model/qos_flow_tunnel.c index e7079644d..9feafa61e 100644 --- a/lib/sbi/openapi/model/qos_flow_tunnel.c +++ b/lib/sbi/openapi/model/qos_flow_tunnel.c @@ -9,10 +9,9 @@ OpenAPI_qos_flow_tunnel_t *OpenAPI_qos_flow_tunnel_create( OpenAPI_tunnel_info_t *tunnel_info ) { - OpenAPI_qos_flow_tunnel_t *qos_flow_tunnel_local_var = OpenAPI_malloc(sizeof(OpenAPI_qos_flow_tunnel_t)); - if (!qos_flow_tunnel_local_var) { - return NULL; - } + OpenAPI_qos_flow_tunnel_t *qos_flow_tunnel_local_var = ogs_malloc(sizeof(OpenAPI_qos_flow_tunnel_t)); + ogs_assert(qos_flow_tunnel_local_var); + qos_flow_tunnel_local_var->qfi_list = qfi_list; qos_flow_tunnel_local_var->tunnel_info = tunnel_info; diff --git a/lib/sbi/openapi/model/qos_flow_usage_report.c b/lib/sbi/openapi/model/qos_flow_usage_report.c index d9f9509cd..02d678d2f 100644 --- a/lib/sbi/openapi/model/qos_flow_usage_report.c +++ b/lib/sbi/openapi/model/qos_flow_usage_report.c @@ -12,10 +12,9 @@ OpenAPI_qos_flow_usage_report_t *OpenAPI_qos_flow_usage_report_create( long uplink_volume ) { - OpenAPI_qos_flow_usage_report_t *qos_flow_usage_report_local_var = OpenAPI_malloc(sizeof(OpenAPI_qos_flow_usage_report_t)); - if (!qos_flow_usage_report_local_var) { - return NULL; - } + OpenAPI_qos_flow_usage_report_t *qos_flow_usage_report_local_var = ogs_malloc(sizeof(OpenAPI_qos_flow_usage_report_t)); + ogs_assert(qos_flow_usage_report_local_var); + qos_flow_usage_report_local_var->qfi = qfi; qos_flow_usage_report_local_var->start_time_stamp = start_time_stamp; qos_flow_usage_report_local_var->end_time_stamp = end_time_stamp; @@ -136,8 +135,8 @@ OpenAPI_qos_flow_usage_report_t *OpenAPI_qos_flow_usage_report_parseFromJSON(cJS qos_flow_usage_report_local_var = OpenAPI_qos_flow_usage_report_create ( qfi->valuedouble, - ogs_strdup_or_assert(start_time_stamp->valuestring), - ogs_strdup_or_assert(end_time_stamp->valuestring), + ogs_strdup(start_time_stamp->valuestring), + ogs_strdup(end_time_stamp->valuestring), downlink_volume->valuedouble, diff --git a/lib/sbi/openapi/model/qos_monitoring_data.c b/lib/sbi/openapi/model/qos_monitoring_data.c index e6ce7622b..e3eb7103c 100644 --- a/lib/sbi/openapi/model/qos_monitoring_data.c +++ b/lib/sbi/openapi/model/qos_monitoring_data.c @@ -22,10 +22,9 @@ OpenAPI_qos_monitoring_data_t *OpenAPI_qos_monitoring_data_create( char *notify_corre_id ) { - OpenAPI_qos_monitoring_data_t *qos_monitoring_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_qos_monitoring_data_t)); - if (!qos_monitoring_data_local_var) { - return NULL; - } + OpenAPI_qos_monitoring_data_t *qos_monitoring_data_local_var = ogs_malloc(sizeof(OpenAPI_qos_monitoring_data_t)); + ogs_assert(qos_monitoring_data_local_var); + qos_monitoring_data_local_var->qm_id = qm_id; qos_monitoring_data_local_var->req_qos_mon_params = req_qos_mon_params; qos_monitoring_data_local_var->rep_freqs = rep_freqs; @@ -279,7 +278,7 @@ OpenAPI_qos_monitoring_data_t *OpenAPI_qos_monitoring_data_parseFromJSON(cJSON * } qos_monitoring_data_local_var = OpenAPI_qos_monitoring_data_create ( - ogs_strdup_or_assert(qm_id->valuestring), + ogs_strdup(qm_id->valuestring), req_qos_mon_paramsList, rep_freqsList, rep_thresh_dl ? true : false, @@ -292,8 +291,8 @@ OpenAPI_qos_monitoring_data_t *OpenAPI_qos_monitoring_data_parseFromJSON(cJSON * wait_time ? wait_time->valuedouble : 0, rep_period ? true : false, rep_period ? rep_period->valuedouble : 0, - notify_uri ? ogs_strdup_or_assert(notify_uri->valuestring) : NULL, - notify_corre_id ? ogs_strdup_or_assert(notify_corre_id->valuestring) : NULL + notify_uri ? ogs_strdup(notify_uri->valuestring) : NULL, + notify_corre_id ? ogs_strdup(notify_corre_id->valuestring) : NULL ); return qos_monitoring_data_local_var; diff --git a/lib/sbi/openapi/model/qos_monitoring_info.c b/lib/sbi/openapi/model/qos_monitoring_info.c index 05c0b3de5..595df211d 100644 --- a/lib/sbi/openapi/model/qos_monitoring_info.c +++ b/lib/sbi/openapi/model/qos_monitoring_info.c @@ -9,10 +9,9 @@ OpenAPI_qos_monitoring_info_t *OpenAPI_qos_monitoring_info_create( int qos_monitoring_ind ) { - OpenAPI_qos_monitoring_info_t *qos_monitoring_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_qos_monitoring_info_t)); - if (!qos_monitoring_info_local_var) { - return NULL; - } + OpenAPI_qos_monitoring_info_t *qos_monitoring_info_local_var = ogs_malloc(sizeof(OpenAPI_qos_monitoring_info_t)); + ogs_assert(qos_monitoring_info_local_var); + qos_monitoring_info_local_var->is_qos_monitoring_ind = is_qos_monitoring_ind; qos_monitoring_info_local_var->qos_monitoring_ind = qos_monitoring_ind; diff --git a/lib/sbi/openapi/model/qos_monitoring_information.c b/lib/sbi/openapi/model/qos_monitoring_information.c index a78576e15..378ceabb9 100644 --- a/lib/sbi/openapi/model/qos_monitoring_information.c +++ b/lib/sbi/openapi/model/qos_monitoring_information.c @@ -13,10 +13,9 @@ OpenAPI_qos_monitoring_information_t *OpenAPI_qos_monitoring_information_create( int rep_thresh_rp ) { - OpenAPI_qos_monitoring_information_t *qos_monitoring_information_local_var = OpenAPI_malloc(sizeof(OpenAPI_qos_monitoring_information_t)); - if (!qos_monitoring_information_local_var) { - return NULL; - } + OpenAPI_qos_monitoring_information_t *qos_monitoring_information_local_var = ogs_malloc(sizeof(OpenAPI_qos_monitoring_information_t)); + ogs_assert(qos_monitoring_information_local_var); + qos_monitoring_information_local_var->is_rep_thresh_dl = is_rep_thresh_dl; qos_monitoring_information_local_var->rep_thresh_dl = rep_thresh_dl; qos_monitoring_information_local_var->is_rep_thresh_ul = is_rep_thresh_ul; diff --git a/lib/sbi/openapi/model/qos_monitoring_information_rm.c b/lib/sbi/openapi/model/qos_monitoring_information_rm.c index a061f5a93..5879766cf 100644 --- a/lib/sbi/openapi/model/qos_monitoring_information_rm.c +++ b/lib/sbi/openapi/model/qos_monitoring_information_rm.c @@ -13,10 +13,9 @@ OpenAPI_qos_monitoring_information_rm_t *OpenAPI_qos_monitoring_information_rm_c int rep_thresh_rp ) { - OpenAPI_qos_monitoring_information_rm_t *qos_monitoring_information_rm_local_var = OpenAPI_malloc(sizeof(OpenAPI_qos_monitoring_information_rm_t)); - if (!qos_monitoring_information_rm_local_var) { - return NULL; - } + OpenAPI_qos_monitoring_information_rm_t *qos_monitoring_information_rm_local_var = ogs_malloc(sizeof(OpenAPI_qos_monitoring_information_rm_t)); + ogs_assert(qos_monitoring_information_rm_local_var); + qos_monitoring_information_rm_local_var->is_rep_thresh_dl = is_rep_thresh_dl; qos_monitoring_information_rm_local_var->rep_thresh_dl = rep_thresh_dl; qos_monitoring_information_rm_local_var->is_rep_thresh_ul = is_rep_thresh_ul; diff --git a/lib/sbi/openapi/model/qos_monitoring_report.c b/lib/sbi/openapi/model/qos_monitoring_report.c index 5e07e257a..f5167f321 100644 --- a/lib/sbi/openapi/model/qos_monitoring_report.c +++ b/lib/sbi/openapi/model/qos_monitoring_report.c @@ -11,10 +11,9 @@ OpenAPI_qos_monitoring_report_t *OpenAPI_qos_monitoring_report_create( OpenAPI_list_t *rt_delays ) { - OpenAPI_qos_monitoring_report_t *qos_monitoring_report_local_var = OpenAPI_malloc(sizeof(OpenAPI_qos_monitoring_report_t)); - if (!qos_monitoring_report_local_var) { - return NULL; - } + OpenAPI_qos_monitoring_report_t *qos_monitoring_report_local_var = ogs_malloc(sizeof(OpenAPI_qos_monitoring_report_t)); + ogs_assert(qos_monitoring_report_local_var); + qos_monitoring_report_local_var->flows = flows; qos_monitoring_report_local_var->ul_delays = ul_delays; qos_monitoring_report_local_var->dl_delays = dl_delays; diff --git a/lib/sbi/openapi/model/qos_notification_control_info.c b/lib/sbi/openapi/model/qos_notification_control_info.c index 1a671a249..560f004b6 100644 --- a/lib/sbi/openapi/model/qos_notification_control_info.c +++ b/lib/sbi/openapi/model/qos_notification_control_info.c @@ -10,10 +10,9 @@ OpenAPI_qos_notification_control_info_t *OpenAPI_qos_notification_control_info_c char *alt_ser_req ) { - OpenAPI_qos_notification_control_info_t *qos_notification_control_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_qos_notification_control_info_t)); - if (!qos_notification_control_info_local_var) { - return NULL; - } + OpenAPI_qos_notification_control_info_t *qos_notification_control_info_local_var = ogs_malloc(sizeof(OpenAPI_qos_notification_control_info_t)); + ogs_assert(qos_notification_control_info_local_var); + qos_notification_control_info_local_var->notif_type = notif_type; qos_notification_control_info_local_var->flows = flows; qos_notification_control_info_local_var->alt_ser_req = alt_ser_req; @@ -132,7 +131,7 @@ OpenAPI_qos_notification_control_info_t *OpenAPI_qos_notification_control_info_p qos_notification_control_info_local_var = OpenAPI_qos_notification_control_info_create ( notif_typeVariable, flows ? flowsList : NULL, - alt_ser_req ? ogs_strdup_or_assert(alt_ser_req->valuestring) : NULL + alt_ser_req ? ogs_strdup(alt_ser_req->valuestring) : NULL ); return qos_notification_control_info_local_var; diff --git a/lib/sbi/openapi/model/ran_nas_rel_cause.c b/lib/sbi/openapi/model/ran_nas_rel_cause.c index 0cb93d718..d380a65b5 100644 --- a/lib/sbi/openapi/model/ran_nas_rel_cause.c +++ b/lib/sbi/openapi/model/ran_nas_rel_cause.c @@ -13,10 +13,9 @@ OpenAPI_ran_nas_rel_cause_t *OpenAPI_ran_nas_rel_cause_create( char *eps_cause ) { - OpenAPI_ran_nas_rel_cause_t *ran_nas_rel_cause_local_var = OpenAPI_malloc(sizeof(OpenAPI_ran_nas_rel_cause_t)); - if (!ran_nas_rel_cause_local_var) { - return NULL; - } + OpenAPI_ran_nas_rel_cause_t *ran_nas_rel_cause_local_var = ogs_malloc(sizeof(OpenAPI_ran_nas_rel_cause_t)); + ogs_assert(ran_nas_rel_cause_local_var); + ran_nas_rel_cause_local_var->ng_ap_cause = ng_ap_cause; ran_nas_rel_cause_local_var->is__5g_mm_cause = is__5g_mm_cause; ran_nas_rel_cause_local_var->_5g_mm_cause = _5g_mm_cause; @@ -129,7 +128,7 @@ OpenAPI_ran_nas_rel_cause_t *OpenAPI_ran_nas_rel_cause_parseFromJSON(cJSON *ran_ _5g_mm_cause ? _5g_mm_cause->valuedouble : 0, _5g_sm_cause ? true : false, _5g_sm_cause ? _5g_sm_cause->valuedouble : 0, - eps_cause ? ogs_strdup_or_assert(eps_cause->valuestring) : NULL + eps_cause ? ogs_strdup(eps_cause->valuestring) : NULL ); return ran_nas_rel_cause_local_var; diff --git a/lib/sbi/openapi/model/reachability_filter.c b/lib/sbi/openapi/model/reachability_filter.c index b5798cf4f..2cc2b935e 100644 --- a/lib/sbi/openapi/model/reachability_filter.c +++ b/lib/sbi/openapi/model/reachability_filter.c @@ -7,10 +7,9 @@ OpenAPI_reachability_filter_t *OpenAPI_reachability_filter_create( ) { - OpenAPI_reachability_filter_t *reachability_filter_local_var = OpenAPI_malloc(sizeof(OpenAPI_reachability_filter_t)); - if (!reachability_filter_local_var) { - return NULL; - } + OpenAPI_reachability_filter_t *reachability_filter_local_var = ogs_malloc(sizeof(OpenAPI_reachability_filter_t)); + ogs_assert(reachability_filter_local_var); + return reachability_filter_local_var; } diff --git a/lib/sbi/openapi/model/reachability_for_sms_configuration.c b/lib/sbi/openapi/model/reachability_for_sms_configuration.c index 50647c396..cc0d8c635 100644 --- a/lib/sbi/openapi/model/reachability_for_sms_configuration.c +++ b/lib/sbi/openapi/model/reachability_for_sms_configuration.c @@ -7,10 +7,9 @@ OpenAPI_reachability_for_sms_configuration_t *OpenAPI_reachability_for_sms_configuration_create( ) { - OpenAPI_reachability_for_sms_configuration_t *reachability_for_sms_configuration_local_var = OpenAPI_malloc(sizeof(OpenAPI_reachability_for_sms_configuration_t)); - if (!reachability_for_sms_configuration_local_var) { - return NULL; - } + OpenAPI_reachability_for_sms_configuration_t *reachability_for_sms_configuration_local_var = ogs_malloc(sizeof(OpenAPI_reachability_for_sms_configuration_t)); + ogs_assert(reachability_for_sms_configuration_local_var); + return reachability_for_sms_configuration_local_var; } diff --git a/lib/sbi/openapi/model/redirect_information.c b/lib/sbi/openapi/model/redirect_information.c index 251c4b1a9..a80e5e0fe 100644 --- a/lib/sbi/openapi/model/redirect_information.c +++ b/lib/sbi/openapi/model/redirect_information.c @@ -11,10 +11,9 @@ OpenAPI_redirect_information_t *OpenAPI_redirect_information_create( char *redirect_server_address ) { - OpenAPI_redirect_information_t *redirect_information_local_var = OpenAPI_malloc(sizeof(OpenAPI_redirect_information_t)); - if (!redirect_information_local_var) { - return NULL; - } + OpenAPI_redirect_information_t *redirect_information_local_var = ogs_malloc(sizeof(OpenAPI_redirect_information_t)); + ogs_assert(redirect_information_local_var); + redirect_information_local_var->is_redirect_enabled = is_redirect_enabled; redirect_information_local_var->redirect_enabled = redirect_enabled; redirect_information_local_var->redirect_address_type = redirect_address_type; @@ -104,7 +103,7 @@ OpenAPI_redirect_information_t *OpenAPI_redirect_information_parseFromJSON(cJSON redirect_enabled ? true : false, redirect_enabled ? redirect_enabled->valueint : 0, redirect_address_type ? redirect_address_typeVariable : 0, - redirect_server_address ? ogs_strdup_or_assert(redirect_server_address->valuestring) : NULL + redirect_server_address ? ogs_strdup(redirect_server_address->valuestring) : NULL ); return redirect_information_local_var; diff --git a/lib/sbi/openapi/model/redirect_response.c b/lib/sbi/openapi/model/redirect_response.c index 66f89e101..41a8ab89a 100644 --- a/lib/sbi/openapi/model/redirect_response.c +++ b/lib/sbi/openapi/model/redirect_response.c @@ -9,10 +9,9 @@ OpenAPI_redirect_response_t *OpenAPI_redirect_response_create( char *target_scp ) { - OpenAPI_redirect_response_t *redirect_response_local_var = OpenAPI_malloc(sizeof(OpenAPI_redirect_response_t)); - if (!redirect_response_local_var) { - return NULL; - } + OpenAPI_redirect_response_t *redirect_response_local_var = ogs_malloc(sizeof(OpenAPI_redirect_response_t)); + ogs_assert(redirect_response_local_var); + redirect_response_local_var->cause = cause; redirect_response_local_var->target_scp = target_scp; @@ -80,8 +79,8 @@ OpenAPI_redirect_response_t *OpenAPI_redirect_response_parseFromJSON(cJSON *redi } redirect_response_local_var = OpenAPI_redirect_response_create ( - cause ? ogs_strdup_or_assert(cause->valuestring) : NULL, - target_scp ? ogs_strdup_or_assert(target_scp->valuestring) : NULL + cause ? ogs_strdup(cause->valuestring) : NULL, + target_scp ? ogs_strdup(target_scp->valuestring) : NULL ); return redirect_response_local_var; diff --git a/lib/sbi/openapi/model/redundant_pdu_session_information.c b/lib/sbi/openapi/model/redundant_pdu_session_information.c index ddc6c2625..d6d5d5735 100644 --- a/lib/sbi/openapi/model/redundant_pdu_session_information.c +++ b/lib/sbi/openapi/model/redundant_pdu_session_information.c @@ -8,10 +8,9 @@ OpenAPI_redundant_pdu_session_information_t *OpenAPI_redundant_pdu_session_infor OpenAPI_rsn_e rsn ) { - OpenAPI_redundant_pdu_session_information_t *redundant_pdu_session_information_local_var = OpenAPI_malloc(sizeof(OpenAPI_redundant_pdu_session_information_t)); - if (!redundant_pdu_session_information_local_var) { - return NULL; - } + OpenAPI_redundant_pdu_session_information_t *redundant_pdu_session_information_local_var = ogs_malloc(sizeof(OpenAPI_redundant_pdu_session_information_t)); + ogs_assert(redundant_pdu_session_information_local_var); + redundant_pdu_session_information_local_var->rsn = rsn; return redundant_pdu_session_information_local_var; diff --git a/lib/sbi/openapi/model/ref_to_binary_data.c b/lib/sbi/openapi/model/ref_to_binary_data.c index d20250265..bde491fe6 100644 --- a/lib/sbi/openapi/model/ref_to_binary_data.c +++ b/lib/sbi/openapi/model/ref_to_binary_data.c @@ -8,10 +8,9 @@ OpenAPI_ref_to_binary_data_t *OpenAPI_ref_to_binary_data_create( char *content_id ) { - OpenAPI_ref_to_binary_data_t *ref_to_binary_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_ref_to_binary_data_t)); - if (!ref_to_binary_data_local_var) { - return NULL; - } + OpenAPI_ref_to_binary_data_t *ref_to_binary_data_local_var = ogs_malloc(sizeof(OpenAPI_ref_to_binary_data_t)); + ogs_assert(ref_to_binary_data_local_var); + ref_to_binary_data_local_var->content_id = content_id; return ref_to_binary_data_local_var; @@ -61,7 +60,7 @@ OpenAPI_ref_to_binary_data_t *OpenAPI_ref_to_binary_data_parseFromJSON(cJSON *re } ref_to_binary_data_local_var = OpenAPI_ref_to_binary_data_create ( - ogs_strdup_or_assert(content_id->valuestring) + ogs_strdup(content_id->valuestring) ); return ref_to_binary_data_local_var; diff --git a/lib/sbi/openapi/model/registration_context_container.c b/lib/sbi/openapi/model/registration_context_container.c index e537a209a..a53ab8005 100644 --- a/lib/sbi/openapi/model/registration_context_container.c +++ b/lib/sbi/openapi/model/registration_context_container.c @@ -33,10 +33,9 @@ OpenAPI_registration_context_container_t *OpenAPI_registration_context_container OpenAPI_npn_access_info_t *npn_access_info ) { - OpenAPI_registration_context_container_t *registration_context_container_local_var = OpenAPI_malloc(sizeof(OpenAPI_registration_context_container_t)); - if (!registration_context_container_local_var) { - return NULL; - } + OpenAPI_registration_context_container_t *registration_context_container_local_var = ogs_malloc(sizeof(OpenAPI_registration_context_container_t)); + ogs_assert(registration_context_container_local_var); + registration_context_container_local_var->ue_context = ue_context; registration_context_container_local_var->local_time_zone = local_time_zone; registration_context_container_local_var->an_type = an_type; @@ -587,20 +586,20 @@ OpenAPI_registration_context_container_t *OpenAPI_registration_context_container registration_context_container_local_var = OpenAPI_registration_context_container_create ( ue_context_local_nonprim, - local_time_zone ? ogs_strdup_or_assert(local_time_zone->valuestring) : NULL, + local_time_zone ? ogs_strdup(local_time_zone->valuestring) : NULL, an_typeVariable, an_n2_ap_id->valuedouble, ran_node_id_local_nonprim, - ogs_strdup_or_assert(initial_amf_name->valuestring), + ogs_strdup(initial_amf_name->valuestring), user_location_local_nonprim, - rrc_est_cause ? ogs_strdup_or_assert(rrc_est_cause->valuestring) : NULL, + rrc_est_cause ? ogs_strdup(rrc_est_cause->valuestring) : NULL, ue_context_request ? true : false, ue_context_request ? ue_context_request->valueint : 0, initial_amf_n2_ap_id ? true : false, initial_amf_n2_ap_id ? initial_amf_n2_ap_id->valuedouble : 0, - an_n2_ipv4_addr ? ogs_strdup_or_assert(an_n2_ipv4_addr->valuestring) : NULL, - an_n2_ipv6_addr ? ogs_strdup_or_assert(an_n2_ipv6_addr->valuestring) : NULL, + an_n2_ipv4_addr ? ogs_strdup(an_n2_ipv4_addr->valuestring) : NULL, + an_n2_ipv6_addr ? ogs_strdup(an_n2_ipv6_addr->valuestring) : NULL, allowed_nssai ? allowed_nssai_local_nonprim : NULL, configured_nssai ? configured_nssaiList : NULL, rejected_nssai_in_plmn ? rejected_nssai_in_plmnList : NULL, diff --git a/lib/sbi/openapi/model/registration_data_sets.c b/lib/sbi/openapi/model/registration_data_sets.c index 8e21522e3..a1bffec3a 100644 --- a/lib/sbi/openapi/model/registration_data_sets.c +++ b/lib/sbi/openapi/model/registration_data_sets.c @@ -12,10 +12,9 @@ OpenAPI_registration_data_sets_t *OpenAPI_registration_data_sets_create( OpenAPI_smsf_registration_t *smsf_non3_gpp ) { - OpenAPI_registration_data_sets_t *registration_data_sets_local_var = OpenAPI_malloc(sizeof(OpenAPI_registration_data_sets_t)); - if (!registration_data_sets_local_var) { - return NULL; - } + OpenAPI_registration_data_sets_t *registration_data_sets_local_var = ogs_malloc(sizeof(OpenAPI_registration_data_sets_t)); + ogs_assert(registration_data_sets_local_var); + registration_data_sets_local_var->amf3_gpp = amf3_gpp; registration_data_sets_local_var->amf_non3_gpp = amf_non3_gpp; registration_data_sets_local_var->smf_registration = smf_registration; diff --git a/lib/sbi/openapi/model/registration_location_info.c b/lib/sbi/openapi/model/registration_location_info.c index 6ce690d16..1e3e2103d 100644 --- a/lib/sbi/openapi/model/registration_location_info.c +++ b/lib/sbi/openapi/model/registration_location_info.c @@ -11,10 +11,9 @@ OpenAPI_registration_location_info_t *OpenAPI_registration_location_info_create( OpenAPI_list_t *access_type_list ) { - OpenAPI_registration_location_info_t *registration_location_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_registration_location_info_t)); - if (!registration_location_info_local_var) { - return NULL; - } + OpenAPI_registration_location_info_t *registration_location_info_local_var = ogs_malloc(sizeof(OpenAPI_registration_location_info_t)); + ogs_assert(registration_location_info_local_var); + registration_location_info_local_var->amf_instance_id = amf_instance_id; registration_location_info_local_var->plmn_id = plmn_id; registration_location_info_local_var->vgmlc_address = vgmlc_address; @@ -147,7 +146,7 @@ OpenAPI_registration_location_info_t *OpenAPI_registration_location_info_parseFr } registration_location_info_local_var = OpenAPI_registration_location_info_create ( - ogs_strdup_or_assert(amf_instance_id->valuestring), + ogs_strdup(amf_instance_id->valuestring), plmn_id ? plmn_id_local_nonprim : NULL, vgmlc_address ? vgmlc_address_local_nonprim : NULL, access_type_listList diff --git a/lib/sbi/openapi/model/release_data.c b/lib/sbi/openapi/model/release_data.c index 9ad0385b6..9a9eb29cf 100644 --- a/lib/sbi/openapi/model/release_data.c +++ b/lib/sbi/openapi/model/release_data.c @@ -19,10 +19,9 @@ OpenAPI_release_data_t *OpenAPI_release_data_create( OpenAPI_n4_information_t *n4_info_ext2 ) { - OpenAPI_release_data_t *release_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_release_data_t)); - if (!release_data_local_var) { - return NULL; - } + OpenAPI_release_data_t *release_data_local_var = ogs_malloc(sizeof(OpenAPI_release_data_t)); + ogs_assert(release_data_local_var); + release_data_local_var->cause = cause; release_data_local_var->ng_ap_cause = ng_ap_cause; release_data_local_var->is__5g_mm_cause_value = is__5g_mm_cause_value; @@ -342,7 +341,7 @@ OpenAPI_release_data_t *OpenAPI_release_data_parseFromJSON(cJSON *release_dataJS _5g_mm_cause_value ? true : false, _5g_mm_cause_value ? _5g_mm_cause_value->valuedouble : 0, ue_location ? ue_location_local_nonprim : NULL, - ue_time_zone ? ogs_strdup_or_assert(ue_time_zone->valuestring) : NULL, + ue_time_zone ? ogs_strdup(ue_time_zone->valuestring) : NULL, add_ue_location ? add_ue_location_local_nonprim : NULL, secondary_rat_usage_report ? secondary_rat_usage_reportList : NULL, secondary_rat_usage_info ? secondary_rat_usage_infoList : NULL, diff --git a/lib/sbi/openapi/model/released_data.c b/lib/sbi/openapi/model/released_data.c index e6f00fb83..b0c65568c 100644 --- a/lib/sbi/openapi/model/released_data.c +++ b/lib/sbi/openapi/model/released_data.c @@ -12,10 +12,9 @@ OpenAPI_released_data_t *OpenAPI_released_data_create( OpenAPI_n4_information_t *n4_info_ext2 ) { - OpenAPI_released_data_t *released_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_released_data_t)); - if (!released_data_local_var) { - return NULL; - } + OpenAPI_released_data_t *released_data_local_var = ogs_malloc(sizeof(OpenAPI_released_data_t)); + ogs_assert(released_data_local_var); + released_data_local_var->small_data_rate_status = small_data_rate_status; released_data_local_var->apn_rate_status = apn_rate_status; released_data_local_var->n4_info = n4_info; diff --git a/lib/sbi/openapi/model/report_item.c b/lib/sbi/openapi/model/report_item.c index 3dce237ec..af3b95974 100644 --- a/lib/sbi/openapi/model/report_item.c +++ b/lib/sbi/openapi/model/report_item.c @@ -8,10 +8,9 @@ OpenAPI_report_item_t *OpenAPI_report_item_create( char *path ) { - OpenAPI_report_item_t *report_item_local_var = OpenAPI_malloc(sizeof(OpenAPI_report_item_t)); - if (!report_item_local_var) { - return NULL; - } + OpenAPI_report_item_t *report_item_local_var = ogs_malloc(sizeof(OpenAPI_report_item_t)); + ogs_assert(report_item_local_var); + report_item_local_var->path = path; return report_item_local_var; @@ -61,7 +60,7 @@ OpenAPI_report_item_t *OpenAPI_report_item_parseFromJSON(cJSON *report_itemJSON) } report_item_local_var = OpenAPI_report_item_create ( - ogs_strdup_or_assert(path->valuestring) + ogs_strdup(path->valuestring) ); return report_item_local_var; diff --git a/lib/sbi/openapi/model/reporting_options.c b/lib/sbi/openapi/model/reporting_options.c index 090b34525..b16ae2a64 100644 --- a/lib/sbi/openapi/model/reporting_options.c +++ b/lib/sbi/openapi/model/reporting_options.c @@ -17,10 +17,9 @@ OpenAPI_reporting_options_t *OpenAPI_reporting_options_create( int report_period ) { - OpenAPI_reporting_options_t *reporting_options_local_var = OpenAPI_malloc(sizeof(OpenAPI_reporting_options_t)); - if (!reporting_options_local_var) { - return NULL; - } + OpenAPI_reporting_options_t *reporting_options_local_var = ogs_malloc(sizeof(OpenAPI_reporting_options_t)); + ogs_assert(reporting_options_local_var); + reporting_options_local_var->report_mode = report_mode; reporting_options_local_var->is_max_num_of_reports = is_max_num_of_reports; reporting_options_local_var->max_num_of_reports = max_num_of_reports; @@ -167,7 +166,7 @@ OpenAPI_reporting_options_t *OpenAPI_reporting_options_parseFromJSON(cJSON *repo report_mode ? report_mode_local_nonprim : NULL, max_num_of_reports ? true : false, max_num_of_reports ? max_num_of_reports->valuedouble : 0, - expiry ? ogs_strdup_or_assert(expiry->valuestring) : NULL, + expiry ? ogs_strdup(expiry->valuestring) : NULL, sampling_ratio ? true : false, sampling_ratio ? sampling_ratio->valuedouble : 0, guard_time ? true : false, diff --git a/lib/sbi/openapi/model/requested_qos.c b/lib/sbi/openapi/model/requested_qos.c index da70b4bcd..3046e40dd 100644 --- a/lib/sbi/openapi/model/requested_qos.c +++ b/lib/sbi/openapi/model/requested_qos.c @@ -10,10 +10,9 @@ OpenAPI_requested_qos_t *OpenAPI_requested_qos_create( char *gbr_dl ) { - OpenAPI_requested_qos_t *requested_qos_local_var = OpenAPI_malloc(sizeof(OpenAPI_requested_qos_t)); - if (!requested_qos_local_var) { - return NULL; - } + OpenAPI_requested_qos_t *requested_qos_local_var = ogs_malloc(sizeof(OpenAPI_requested_qos_t)); + ogs_assert(requested_qos_local_var); + requested_qos_local_var->_5qi = _5qi; requested_qos_local_var->gbr_ul = gbr_ul; requested_qos_local_var->gbr_dl = gbr_dl; @@ -100,8 +99,8 @@ OpenAPI_requested_qos_t *OpenAPI_requested_qos_parseFromJSON(cJSON *requested_qo requested_qos_local_var = OpenAPI_requested_qos_create ( _5qi->valuedouble, - gbr_ul ? ogs_strdup_or_assert(gbr_ul->valuestring) : NULL, - gbr_dl ? ogs_strdup_or_assert(gbr_dl->valuestring) : NULL + gbr_ul ? ogs_strdup(gbr_ul->valuestring) : NULL, + gbr_dl ? ogs_strdup(gbr_dl->valuestring) : NULL ); return requested_qos_local_var; diff --git a/lib/sbi/openapi/model/requested_rule_data.c b/lib/sbi/openapi/model/requested_rule_data.c index 006dbfb33..84fba461f 100644 --- a/lib/sbi/openapi/model/requested_rule_data.c +++ b/lib/sbi/openapi/model/requested_rule_data.c @@ -9,10 +9,9 @@ OpenAPI_requested_rule_data_t *OpenAPI_requested_rule_data_create( OpenAPI_list_t *req_data ) { - OpenAPI_requested_rule_data_t *requested_rule_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_requested_rule_data_t)); - if (!requested_rule_data_local_var) { - return NULL; - } + OpenAPI_requested_rule_data_t *requested_rule_data_local_var = ogs_malloc(sizeof(OpenAPI_requested_rule_data_t)); + ogs_assert(requested_rule_data_local_var); + requested_rule_data_local_var->ref_pcc_rule_ids = ref_pcc_rule_ids; requested_rule_data_local_var->req_data = req_data; @@ -96,7 +95,7 @@ OpenAPI_requested_rule_data_t *OpenAPI_requested_rule_data_parseFromJSON(cJSON * ogs_error("OpenAPI_requested_rule_data_parseFromJSON() failed [ref_pcc_rule_ids]"); goto end; } - OpenAPI_list_add(ref_pcc_rule_idsList , ogs_strdup_or_assert(ref_pcc_rule_ids_local->valuestring)); + OpenAPI_list_add(ref_pcc_rule_idsList , ogs_strdup(ref_pcc_rule_ids_local->valuestring)); } cJSON *req_data = cJSON_GetObjectItemCaseSensitive(requested_rule_dataJSON, "reqData"); diff --git a/lib/sbi/openapi/model/requested_usage_data.c b/lib/sbi/openapi/model/requested_usage_data.c index 05533d59a..a3b1c4492 100644 --- a/lib/sbi/openapi/model/requested_usage_data.c +++ b/lib/sbi/openapi/model/requested_usage_data.c @@ -10,10 +10,9 @@ OpenAPI_requested_usage_data_t *OpenAPI_requested_usage_data_create( int all_um_ids ) { - OpenAPI_requested_usage_data_t *requested_usage_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_requested_usage_data_t)); - if (!requested_usage_data_local_var) { - return NULL; - } + OpenAPI_requested_usage_data_t *requested_usage_data_local_var = ogs_malloc(sizeof(OpenAPI_requested_usage_data_t)); + ogs_assert(requested_usage_data_local_var); + requested_usage_data_local_var->ref_um_ids = ref_um_ids; requested_usage_data_local_var->is_all_um_ids = is_all_um_ids; requested_usage_data_local_var->all_um_ids = all_um_ids; @@ -90,7 +89,7 @@ OpenAPI_requested_usage_data_t *OpenAPI_requested_usage_data_parseFromJSON(cJSON ogs_error("OpenAPI_requested_usage_data_parseFromJSON() failed [ref_um_ids]"); goto end; } - OpenAPI_list_add(ref_um_idsList , ogs_strdup_or_assert(ref_um_ids_local->valuestring)); + OpenAPI_list_add(ref_um_idsList , ogs_strdup(ref_um_ids_local->valuestring)); } } diff --git a/lib/sbi/openapi/model/resource_item.c b/lib/sbi/openapi/model/resource_item.c index 821a72672..2be0fd42f 100644 --- a/lib/sbi/openapi/model/resource_item.c +++ b/lib/sbi/openapi/model/resource_item.c @@ -9,10 +9,9 @@ OpenAPI_resource_item_t *OpenAPI_resource_item_create( OpenAPI_list_t *items ) { - OpenAPI_resource_item_t *resource_item_local_var = OpenAPI_malloc(sizeof(OpenAPI_resource_item_t)); - if (!resource_item_local_var) { - return NULL; - } + OpenAPI_resource_item_t *resource_item_local_var = ogs_malloc(sizeof(OpenAPI_resource_item_t)); + ogs_assert(resource_item_local_var); + resource_item_local_var->mon_resource_uri = mon_resource_uri; resource_item_local_var->items = items; @@ -99,11 +98,11 @@ OpenAPI_resource_item_t *OpenAPI_resource_item_parseFromJSON(cJSON *resource_ite ogs_error("OpenAPI_resource_item_parseFromJSON() failed [items]"); goto end; } - OpenAPI_list_add(itemsList , ogs_strdup_or_assert(items_local->valuestring)); + OpenAPI_list_add(itemsList , ogs_strdup(items_local->valuestring)); } resource_item_local_var = OpenAPI_resource_item_create ( - ogs_strdup_or_assert(mon_resource_uri->valuestring), + ogs_strdup(mon_resource_uri->valuestring), itemsList ); diff --git a/lib/sbi/openapi/model/resources_allocation_info.c b/lib/sbi/openapi/model/resources_allocation_info.c index 647498c7f..03ce4de23 100644 --- a/lib/sbi/openapi/model/resources_allocation_info.c +++ b/lib/sbi/openapi/model/resources_allocation_info.c @@ -10,10 +10,9 @@ OpenAPI_resources_allocation_info_t *OpenAPI_resources_allocation_info_create( char *alt_ser_req ) { - OpenAPI_resources_allocation_info_t *resources_allocation_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_resources_allocation_info_t)); - if (!resources_allocation_info_local_var) { - return NULL; - } + OpenAPI_resources_allocation_info_t *resources_allocation_info_local_var = ogs_malloc(sizeof(OpenAPI_resources_allocation_info_t)); + ogs_assert(resources_allocation_info_local_var); + resources_allocation_info_local_var->mc_resourc_status = mc_resourc_status; resources_allocation_info_local_var->flows = flows; resources_allocation_info_local_var->alt_ser_req = alt_ser_req; @@ -132,7 +131,7 @@ OpenAPI_resources_allocation_info_t *OpenAPI_resources_allocation_info_parseFrom resources_allocation_info_local_var = OpenAPI_resources_allocation_info_create ( mc_resourc_status ? mc_resourc_statusVariable : 0, flows ? flowsList : NULL, - alt_ser_req ? ogs_strdup_or_assert(alt_ser_req->valuestring) : NULL + alt_ser_req ? ogs_strdup(alt_ser_req->valuestring) : NULL ); return resources_allocation_info_local_var; diff --git a/lib/sbi/openapi/model/resynchronization_info.c b/lib/sbi/openapi/model/resynchronization_info.c index f45e3f5ed..1a970f2fd 100644 --- a/lib/sbi/openapi/model/resynchronization_info.c +++ b/lib/sbi/openapi/model/resynchronization_info.c @@ -9,10 +9,9 @@ OpenAPI_resynchronization_info_t *OpenAPI_resynchronization_info_create( char *auts ) { - OpenAPI_resynchronization_info_t *resynchronization_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_resynchronization_info_t)); - if (!resynchronization_info_local_var) { - return NULL; - } + OpenAPI_resynchronization_info_t *resynchronization_info_local_var = ogs_malloc(sizeof(OpenAPI_resynchronization_info_t)); + ogs_assert(resynchronization_info_local_var); + resynchronization_info_local_var->rand = rand; resynchronization_info_local_var->auts = auts; @@ -80,8 +79,8 @@ OpenAPI_resynchronization_info_t *OpenAPI_resynchronization_info_parseFromJSON(c } resynchronization_info_local_var = OpenAPI_resynchronization_info_create ( - ogs_strdup_or_assert(rand->valuestring), - ogs_strdup_or_assert(auts->valuestring) + ogs_strdup(rand->valuestring), + ogs_strdup(auts->valuestring) ); return resynchronization_info_local_var; diff --git a/lib/sbi/openapi/model/retrieve_data.c b/lib/sbi/openapi/model/retrieve_data.c index e6f78e311..83faf4662 100644 --- a/lib/sbi/openapi/model/retrieve_data.c +++ b/lib/sbi/openapi/model/retrieve_data.c @@ -9,10 +9,9 @@ OpenAPI_retrieve_data_t *OpenAPI_retrieve_data_create( int small_data_rate_status_req ) { - OpenAPI_retrieve_data_t *retrieve_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_retrieve_data_t)); - if (!retrieve_data_local_var) { - return NULL; - } + OpenAPI_retrieve_data_t *retrieve_data_local_var = ogs_malloc(sizeof(OpenAPI_retrieve_data_t)); + ogs_assert(retrieve_data_local_var); + retrieve_data_local_var->is_small_data_rate_status_req = is_small_data_rate_status_req; retrieve_data_local_var->small_data_rate_status_req = small_data_rate_status_req; diff --git a/lib/sbi/openapi/model/retrieved_data.c b/lib/sbi/openapi/model/retrieved_data.c index 3769cd09a..23ea6cba9 100644 --- a/lib/sbi/openapi/model/retrieved_data.c +++ b/lib/sbi/openapi/model/retrieved_data.c @@ -8,10 +8,9 @@ OpenAPI_retrieved_data_t *OpenAPI_retrieved_data_create( OpenAPI_small_data_rate_status_t *small_data_rate_status ) { - OpenAPI_retrieved_data_t *retrieved_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_retrieved_data_t)); - if (!retrieved_data_local_var) { - return NULL; - } + OpenAPI_retrieved_data_t *retrieved_data_local_var = ogs_malloc(sizeof(OpenAPI_retrieved_data_t)); + ogs_assert(retrieved_data_local_var); + retrieved_data_local_var->small_data_rate_status = small_data_rate_status; return retrieved_data_local_var; diff --git a/lib/sbi/openapi/model/rg_auth_ctx.c b/lib/sbi/openapi/model/rg_auth_ctx.c index 655115f1e..7eae434e6 100644 --- a/lib/sbi/openapi/model/rg_auth_ctx.c +++ b/lib/sbi/openapi/model/rg_auth_ctx.c @@ -11,10 +11,9 @@ OpenAPI_rg_auth_ctx_t *OpenAPI_rg_auth_ctx_create( int auth_ind ) { - OpenAPI_rg_auth_ctx_t *rg_auth_ctx_local_var = OpenAPI_malloc(sizeof(OpenAPI_rg_auth_ctx_t)); - if (!rg_auth_ctx_local_var) { - return NULL; - } + OpenAPI_rg_auth_ctx_t *rg_auth_ctx_local_var = ogs_malloc(sizeof(OpenAPI_rg_auth_ctx_t)); + ogs_assert(rg_auth_ctx_local_var); + rg_auth_ctx_local_var->auth_result = auth_result; rg_auth_ctx_local_var->supi = supi; rg_auth_ctx_local_var->is_auth_ind = is_auth_ind; @@ -102,7 +101,7 @@ OpenAPI_rg_auth_ctx_t *OpenAPI_rg_auth_ctx_parseFromJSON(cJSON *rg_auth_ctxJSON) rg_auth_ctx_local_var = OpenAPI_rg_auth_ctx_create ( auth_resultVariable, - supi ? ogs_strdup_or_assert(supi->valuestring) : NULL, + supi ? ogs_strdup(supi->valuestring) : NULL, auth_ind ? true : false, auth_ind ? auth_ind->valueint : 0 ); diff --git a/lib/sbi/openapi/model/rg_authentication_info.c b/lib/sbi/openapi/model/rg_authentication_info.c index 08cb53e8d..224de033a 100644 --- a/lib/sbi/openapi/model/rg_authentication_info.c +++ b/lib/sbi/openapi/model/rg_authentication_info.c @@ -10,10 +10,9 @@ OpenAPI_rg_authentication_info_t *OpenAPI_rg_authentication_info_create( char *supported_features ) { - OpenAPI_rg_authentication_info_t *rg_authentication_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_rg_authentication_info_t)); - if (!rg_authentication_info_local_var) { - return NULL; - } + OpenAPI_rg_authentication_info_t *rg_authentication_info_local_var = ogs_malloc(sizeof(OpenAPI_rg_authentication_info_t)); + ogs_assert(rg_authentication_info_local_var); + rg_authentication_info_local_var->suci = suci; rg_authentication_info_local_var->authenticated_ind = authenticated_ind; rg_authentication_info_local_var->supported_features = supported_features; @@ -98,10 +97,10 @@ OpenAPI_rg_authentication_info_t *OpenAPI_rg_authentication_info_parseFromJSON(c } rg_authentication_info_local_var = OpenAPI_rg_authentication_info_create ( - ogs_strdup_or_assert(suci->valuestring), + ogs_strdup(suci->valuestring), authenticated_ind->valueint, - supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL + supported_features ? ogs_strdup(supported_features->valuestring) : NULL ); return rg_authentication_info_local_var; diff --git a/lib/sbi/openapi/model/rm_info.c b/lib/sbi/openapi/model/rm_info.c index c47898cc8..a55dadec0 100644 --- a/lib/sbi/openapi/model/rm_info.c +++ b/lib/sbi/openapi/model/rm_info.c @@ -9,10 +9,9 @@ OpenAPI_rm_info_t *OpenAPI_rm_info_create( OpenAPI_access_type_e access_type ) { - OpenAPI_rm_info_t *rm_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_rm_info_t)); - if (!rm_info_local_var) { - return NULL; - } + OpenAPI_rm_info_t *rm_info_local_var = ogs_malloc(sizeof(OpenAPI_rm_info_t)); + ogs_assert(rm_info_local_var); + rm_info_local_var->rm_state = rm_state; rm_info_local_var->access_type = access_type; diff --git a/lib/sbi/openapi/model/rm_state.c b/lib/sbi/openapi/model/rm_state.c index 6467cf3bb..065608cb7 100644 --- a/lib/sbi/openapi/model/rm_state.c +++ b/lib/sbi/openapi/model/rm_state.c @@ -7,10 +7,9 @@ OpenAPI_rm_state_t *OpenAPI_rm_state_create( ) { - OpenAPI_rm_state_t *rm_state_local_var = OpenAPI_malloc(sizeof(OpenAPI_rm_state_t)); - if (!rm_state_local_var) { - return NULL; - } + OpenAPI_rm_state_t *rm_state_local_var = ogs_malloc(sizeof(OpenAPI_rm_state_t)); + ogs_assert(rm_state_local_var); + return rm_state_local_var; } diff --git a/lib/sbi/openapi/model/roaming_charging_profile.c b/lib/sbi/openapi/model/roaming_charging_profile.c index 0be002b4e..e450ad2ee 100644 --- a/lib/sbi/openapi/model/roaming_charging_profile.c +++ b/lib/sbi/openapi/model/roaming_charging_profile.c @@ -9,10 +9,9 @@ OpenAPI_roaming_charging_profile_t *OpenAPI_roaming_charging_profile_create( OpenAPI_partial_record_method_t *partial_record_method ) { - OpenAPI_roaming_charging_profile_t *roaming_charging_profile_local_var = OpenAPI_malloc(sizeof(OpenAPI_roaming_charging_profile_t)); - if (!roaming_charging_profile_local_var) { - return NULL; - } + OpenAPI_roaming_charging_profile_t *roaming_charging_profile_local_var = ogs_malloc(sizeof(OpenAPI_roaming_charging_profile_t)); + ogs_assert(roaming_charging_profile_local_var); + roaming_charging_profile_local_var->triggers = triggers; roaming_charging_profile_local_var->partial_record_method = partial_record_method; diff --git a/lib/sbi/openapi/model/route_information.c b/lib/sbi/openapi/model/route_information.c index 50a43cb8c..cc1f7b026 100644 --- a/lib/sbi/openapi/model/route_information.c +++ b/lib/sbi/openapi/model/route_information.c @@ -10,10 +10,9 @@ OpenAPI_route_information_t *OpenAPI_route_information_create( int port_number ) { - OpenAPI_route_information_t *route_information_local_var = OpenAPI_malloc(sizeof(OpenAPI_route_information_t)); - if (!route_information_local_var) { - return NULL; - } + OpenAPI_route_information_t *route_information_local_var = ogs_malloc(sizeof(OpenAPI_route_information_t)); + ogs_assert(route_information_local_var); + route_information_local_var->ipv4_addr = ipv4_addr; route_information_local_var->ipv6_addr = ipv6_addr; route_information_local_var->port_number = port_number; @@ -98,8 +97,8 @@ OpenAPI_route_information_t *OpenAPI_route_information_parseFromJSON(cJSON *rout } route_information_local_var = OpenAPI_route_information_create ( - ipv4_addr ? ogs_strdup_or_assert(ipv4_addr->valuestring) : NULL, - ipv6_addr ? ogs_strdup_or_assert(ipv6_addr->valuestring) : NULL, + ipv4_addr ? ogs_strdup(ipv4_addr->valuestring) : NULL, + ipv6_addr ? ogs_strdup(ipv6_addr->valuestring) : NULL, port_number->valuedouble ); diff --git a/lib/sbi/openapi/model/route_to_location.c b/lib/sbi/openapi/model/route_to_location.c index d9f4acce3..d495b370a 100644 --- a/lib/sbi/openapi/model/route_to_location.c +++ b/lib/sbi/openapi/model/route_to_location.c @@ -10,10 +10,9 @@ OpenAPI_route_to_location_t *OpenAPI_route_to_location_create( char *route_prof_id ) { - OpenAPI_route_to_location_t *route_to_location_local_var = OpenAPI_malloc(sizeof(OpenAPI_route_to_location_t)); - if (!route_to_location_local_var) { - return NULL; - } + OpenAPI_route_to_location_t *route_to_location_local_var = ogs_malloc(sizeof(OpenAPI_route_to_location_t)); + ogs_assert(route_to_location_local_var); + route_to_location_local_var->dnai = dnai; route_to_location_local_var->route_info = route_info; route_to_location_local_var->route_prof_id = route_prof_id; @@ -103,9 +102,9 @@ OpenAPI_route_to_location_t *OpenAPI_route_to_location_parseFromJSON(cJSON *rout } route_to_location_local_var = OpenAPI_route_to_location_create ( - ogs_strdup_or_assert(dnai->valuestring), + ogs_strdup(dnai->valuestring), route_info ? route_info_local_nonprim : NULL, - route_prof_id ? ogs_strdup_or_assert(route_prof_id->valuestring) : NULL + route_prof_id ? ogs_strdup(route_prof_id->valuestring) : NULL ); return route_to_location_local_var; diff --git a/lib/sbi/openapi/model/rule_report.c b/lib/sbi/openapi/model/rule_report.c index f7b24f87a..4427fe8f7 100644 --- a/lib/sbi/openapi/model/rule_report.c +++ b/lib/sbi/openapi/model/rule_report.c @@ -13,10 +13,9 @@ OpenAPI_rule_report_t *OpenAPI_rule_report_create( OpenAPI_list_t *ran_nas_rel_causes ) { - OpenAPI_rule_report_t *rule_report_local_var = OpenAPI_malloc(sizeof(OpenAPI_rule_report_t)); - if (!rule_report_local_var) { - return NULL; - } + OpenAPI_rule_report_t *rule_report_local_var = ogs_malloc(sizeof(OpenAPI_rule_report_t)); + ogs_assert(rule_report_local_var); + rule_report_local_var->pcc_rule_ids = pcc_rule_ids; rule_report_local_var->rule_status = rule_status; rule_report_local_var->cont_vers = cont_vers; @@ -160,7 +159,7 @@ OpenAPI_rule_report_t *OpenAPI_rule_report_parseFromJSON(cJSON *rule_reportJSON) ogs_error("OpenAPI_rule_report_parseFromJSON() failed [pcc_rule_ids]"); goto end; } - OpenAPI_list_add(pcc_rule_idsList , ogs_strdup_or_assert(pcc_rule_ids_local->valuestring)); + OpenAPI_list_add(pcc_rule_idsList , ogs_strdup(pcc_rule_ids_local->valuestring)); } cJSON *rule_status = cJSON_GetObjectItemCaseSensitive(rule_reportJSON, "ruleStatus"); diff --git a/lib/sbi/openapi/model/scheduled_communication_time.c b/lib/sbi/openapi/model/scheduled_communication_time.c index 9c57b3ac7..5c2b3e306 100644 --- a/lib/sbi/openapi/model/scheduled_communication_time.c +++ b/lib/sbi/openapi/model/scheduled_communication_time.c @@ -10,10 +10,9 @@ OpenAPI_scheduled_communication_time_t *OpenAPI_scheduled_communication_time_cre char *time_of_day_end ) { - OpenAPI_scheduled_communication_time_t *scheduled_communication_time_local_var = OpenAPI_malloc(sizeof(OpenAPI_scheduled_communication_time_t)); - if (!scheduled_communication_time_local_var) { - return NULL; - } + OpenAPI_scheduled_communication_time_t *scheduled_communication_time_local_var = ogs_malloc(sizeof(OpenAPI_scheduled_communication_time_t)); + ogs_assert(scheduled_communication_time_local_var); + scheduled_communication_time_local_var->days_of_week = days_of_week; scheduled_communication_time_local_var->time_of_day_start = time_of_day_start; scheduled_communication_time_local_var->time_of_day_end = time_of_day_end; @@ -123,8 +122,8 @@ OpenAPI_scheduled_communication_time_t *OpenAPI_scheduled_communication_time_par scheduled_communication_time_local_var = OpenAPI_scheduled_communication_time_create ( days_of_week ? days_of_weekList : NULL, - time_of_day_start ? ogs_strdup_or_assert(time_of_day_start->valuestring) : NULL, - time_of_day_end ? ogs_strdup_or_assert(time_of_day_end->valuestring) : NULL + time_of_day_start ? ogs_strdup(time_of_day_start->valuestring) : NULL, + time_of_day_end ? ogs_strdup(time_of_day_end->valuestring) : NULL ); return scheduled_communication_time_local_var; diff --git a/lib/sbi/openapi/model/scheduled_communication_time_1.c b/lib/sbi/openapi/model/scheduled_communication_time_1.c index 08de5be4c..7a48bd298 100644 --- a/lib/sbi/openapi/model/scheduled_communication_time_1.c +++ b/lib/sbi/openapi/model/scheduled_communication_time_1.c @@ -10,10 +10,9 @@ OpenAPI_scheduled_communication_time_1_t *OpenAPI_scheduled_communication_time_1 char *time_of_day_end ) { - OpenAPI_scheduled_communication_time_1_t *scheduled_communication_time_1_local_var = OpenAPI_malloc(sizeof(OpenAPI_scheduled_communication_time_1_t)); - if (!scheduled_communication_time_1_local_var) { - return NULL; - } + OpenAPI_scheduled_communication_time_1_t *scheduled_communication_time_1_local_var = ogs_malloc(sizeof(OpenAPI_scheduled_communication_time_1_t)); + ogs_assert(scheduled_communication_time_1_local_var); + scheduled_communication_time_1_local_var->days_of_week = days_of_week; scheduled_communication_time_1_local_var->time_of_day_start = time_of_day_start; scheduled_communication_time_1_local_var->time_of_day_end = time_of_day_end; @@ -123,8 +122,8 @@ OpenAPI_scheduled_communication_time_1_t *OpenAPI_scheduled_communication_time_1 scheduled_communication_time_1_local_var = OpenAPI_scheduled_communication_time_1_create ( days_of_week ? days_of_weekList : NULL, - time_of_day_start ? ogs_strdup_or_assert(time_of_day_start->valuestring) : NULL, - time_of_day_end ? ogs_strdup_or_assert(time_of_day_end->valuestring) : NULL + time_of_day_start ? ogs_strdup(time_of_day_start->valuestring) : NULL, + time_of_day_end ? ogs_strdup(time_of_day_end->valuestring) : NULL ); return scheduled_communication_time_1_local_var; diff --git a/lib/sbi/openapi/model/scheduled_communication_time_rm.c b/lib/sbi/openapi/model/scheduled_communication_time_rm.c index c332df706..7c9338235 100644 --- a/lib/sbi/openapi/model/scheduled_communication_time_rm.c +++ b/lib/sbi/openapi/model/scheduled_communication_time_rm.c @@ -10,10 +10,9 @@ OpenAPI_scheduled_communication_time_rm_t *OpenAPI_scheduled_communication_time_ char *time_of_day_end ) { - OpenAPI_scheduled_communication_time_rm_t *scheduled_communication_time_rm_local_var = OpenAPI_malloc(sizeof(OpenAPI_scheduled_communication_time_rm_t)); - if (!scheduled_communication_time_rm_local_var) { - return NULL; - } + OpenAPI_scheduled_communication_time_rm_t *scheduled_communication_time_rm_local_var = ogs_malloc(sizeof(OpenAPI_scheduled_communication_time_rm_t)); + ogs_assert(scheduled_communication_time_rm_local_var); + scheduled_communication_time_rm_local_var->days_of_week = days_of_week; scheduled_communication_time_rm_local_var->time_of_day_start = time_of_day_start; scheduled_communication_time_rm_local_var->time_of_day_end = time_of_day_end; @@ -123,8 +122,8 @@ OpenAPI_scheduled_communication_time_rm_t *OpenAPI_scheduled_communication_time_ scheduled_communication_time_rm_local_var = OpenAPI_scheduled_communication_time_rm_create ( days_of_week ? days_of_weekList : NULL, - time_of_day_start ? ogs_strdup_or_assert(time_of_day_start->valuestring) : NULL, - time_of_day_end ? ogs_strdup_or_assert(time_of_day_end->valuestring) : NULL + time_of_day_start ? ogs_strdup(time_of_day_start->valuestring) : NULL, + time_of_day_end ? ogs_strdup(time_of_day_end->valuestring) : NULL ); return scheduled_communication_time_rm_local_var; diff --git a/lib/sbi/openapi/model/scheduled_communication_type_rm.c b/lib/sbi/openapi/model/scheduled_communication_type_rm.c index d9266b157..0ad9fe639 100644 --- a/lib/sbi/openapi/model/scheduled_communication_type_rm.c +++ b/lib/sbi/openapi/model/scheduled_communication_type_rm.c @@ -7,10 +7,9 @@ OpenAPI_scheduled_communication_type_rm_t *OpenAPI_scheduled_communication_type_rm_create( ) { - OpenAPI_scheduled_communication_type_rm_t *scheduled_communication_type_rm_local_var = OpenAPI_malloc(sizeof(OpenAPI_scheduled_communication_type_rm_t)); - if (!scheduled_communication_type_rm_local_var) { - return NULL; - } + OpenAPI_scheduled_communication_type_rm_t *scheduled_communication_type_rm_local_var = ogs_malloc(sizeof(OpenAPI_scheduled_communication_type_rm_t)); + ogs_assert(scheduled_communication_type_rm_local_var); + return scheduled_communication_type_rm_local_var; } diff --git a/lib/sbi/openapi/model/scp_domain_cond.c b/lib/sbi/openapi/model/scp_domain_cond.c index 2ae1a5cb7..5ceee5e24 100644 --- a/lib/sbi/openapi/model/scp_domain_cond.c +++ b/lib/sbi/openapi/model/scp_domain_cond.c @@ -8,10 +8,9 @@ OpenAPI_scp_domain_cond_t *OpenAPI_scp_domain_cond_create( OpenAPI_list_t *scp_domains ) { - OpenAPI_scp_domain_cond_t *scp_domain_cond_local_var = OpenAPI_malloc(sizeof(OpenAPI_scp_domain_cond_t)); - if (!scp_domain_cond_local_var) { - return NULL; - } + OpenAPI_scp_domain_cond_t *scp_domain_cond_local_var = ogs_malloc(sizeof(OpenAPI_scp_domain_cond_t)); + ogs_assert(scp_domain_cond_local_var); + scp_domain_cond_local_var->scp_domains = scp_domains; return scp_domain_cond_local_var; @@ -79,7 +78,7 @@ OpenAPI_scp_domain_cond_t *OpenAPI_scp_domain_cond_parseFromJSON(cJSON *scp_doma ogs_error("OpenAPI_scp_domain_cond_parseFromJSON() failed [scp_domains]"); goto end; } - OpenAPI_list_add(scp_domainsList , ogs_strdup_or_assert(scp_domains_local->valuestring)); + OpenAPI_list_add(scp_domainsList , ogs_strdup(scp_domains_local->valuestring)); } } diff --git a/lib/sbi/openapi/model/scp_domain_info.c b/lib/sbi/openapi/model/scp_domain_info.c index 4d0a567d2..9942edf17 100644 --- a/lib/sbi/openapi/model/scp_domain_info.c +++ b/lib/sbi/openapi/model/scp_domain_info.c @@ -11,10 +11,9 @@ OpenAPI_scp_domain_info_t *OpenAPI_scp_domain_info_create( OpenAPI_list_t* scp_ports ) { - OpenAPI_scp_domain_info_t *scp_domain_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_scp_domain_info_t)); - if (!scp_domain_info_local_var) { - return NULL; - } + OpenAPI_scp_domain_info_t *scp_domain_info_local_var = ogs_malloc(sizeof(OpenAPI_scp_domain_info_t)); + ogs_assert(scp_domain_info_local_var); + scp_domain_info_local_var->scp_fqdn = scp_fqdn; scp_domain_info_local_var->scp_ip_end_points = scp_ip_end_points; scp_domain_info_local_var->scp_prefix = scp_prefix; @@ -37,6 +36,7 @@ void OpenAPI_scp_domain_info_free(OpenAPI_scp_domain_info_t *scp_domain_info) ogs_free(scp_domain_info->scp_prefix); OpenAPI_list_for_each(scp_domain_info->scp_ports, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); ogs_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -169,9 +169,9 @@ OpenAPI_scp_domain_info_t *OpenAPI_scp_domain_info_parseFromJSON(cJSON *scp_doma } scp_domain_info_local_var = OpenAPI_scp_domain_info_create ( - scp_fqdn ? ogs_strdup_or_assert(scp_fqdn->valuestring) : NULL, + scp_fqdn ? ogs_strdup(scp_fqdn->valuestring) : NULL, scp_ip_end_points ? scp_ip_end_pointsList : NULL, - scp_prefix ? ogs_strdup_or_assert(scp_prefix->valuestring) : NULL, + scp_prefix ? ogs_strdup(scp_prefix->valuestring) : NULL, scp_ports ? scp_portsList : NULL ); diff --git a/lib/sbi/openapi/model/scp_info.c b/lib/sbi/openapi/model/scp_info.c index 55e8f8996..6662f2e9d 100644 --- a/lib/sbi/openapi/model/scp_info.c +++ b/lib/sbi/openapi/model/scp_info.c @@ -18,10 +18,9 @@ OpenAPI_scp_info_t *OpenAPI_scp_info_create( OpenAPI_ip_reachability_e ip_reachability ) { - OpenAPI_scp_info_t *scp_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_scp_info_t)); - if (!scp_info_local_var) { - return NULL; - } + OpenAPI_scp_info_t *scp_info_local_var = ogs_malloc(sizeof(OpenAPI_scp_info_t)); + ogs_assert(scp_info_local_var); + scp_info_local_var->scp_domain_info_list = scp_domain_info_list; scp_info_local_var->scp_prefix = scp_prefix; scp_info_local_var->scp_ports = scp_ports; @@ -45,6 +44,7 @@ void OpenAPI_scp_info_free(OpenAPI_scp_info_t *scp_info) OpenAPI_lnode_t *node; OpenAPI_list_for_each(scp_info->scp_domain_info_list, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); ogs_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -52,6 +52,7 @@ void OpenAPI_scp_info_free(OpenAPI_scp_info_t *scp_info) ogs_free(scp_info->scp_prefix); OpenAPI_list_for_each(scp_info->scp_ports, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); ogs_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -331,7 +332,7 @@ OpenAPI_scp_info_t *OpenAPI_scp_info_parseFromJSON(cJSON *scp_infoJSON) ogs_error("OpenAPI_scp_info_parseFromJSON() failed [address_domains]"); goto end; } - OpenAPI_list_add(address_domainsList , ogs_strdup_or_assert(address_domains_local->valuestring)); + OpenAPI_list_add(address_domainsList , ogs_strdup(address_domains_local->valuestring)); } } @@ -351,7 +352,7 @@ OpenAPI_scp_info_t *OpenAPI_scp_info_parseFromJSON(cJSON *scp_infoJSON) ogs_error("OpenAPI_scp_info_parseFromJSON() failed [ipv4_addresses]"); goto end; } - OpenAPI_list_add(ipv4_addressesList , ogs_strdup_or_assert(ipv4_addresses_local->valuestring)); + OpenAPI_list_add(ipv4_addressesList , ogs_strdup(ipv4_addresses_local->valuestring)); } } @@ -371,7 +372,7 @@ OpenAPI_scp_info_t *OpenAPI_scp_info_parseFromJSON(cJSON *scp_infoJSON) ogs_error("OpenAPI_scp_info_parseFromJSON() failed [ipv6_prefixes]"); goto end; } - OpenAPI_list_add(ipv6_prefixesList , ogs_strdup_or_assert(ipv6_prefixes_local->valuestring)); + OpenAPI_list_add(ipv6_prefixesList , ogs_strdup(ipv6_prefixes_local->valuestring)); } } @@ -437,7 +438,7 @@ OpenAPI_scp_info_t *OpenAPI_scp_info_parseFromJSON(cJSON *scp_infoJSON) ogs_error("OpenAPI_scp_info_parseFromJSON() failed [served_nf_set_id_list]"); goto end; } - OpenAPI_list_add(served_nf_set_id_listList , ogs_strdup_or_assert(served_nf_set_id_list_local->valuestring)); + OpenAPI_list_add(served_nf_set_id_listList , ogs_strdup(served_nf_set_id_list_local->valuestring)); } } @@ -477,7 +478,7 @@ OpenAPI_scp_info_t *OpenAPI_scp_info_parseFromJSON(cJSON *scp_infoJSON) scp_info_local_var = OpenAPI_scp_info_create ( scp_domain_info_list ? scp_domain_info_listList : NULL, - scp_prefix ? ogs_strdup_or_assert(scp_prefix->valuestring) : NULL, + scp_prefix ? ogs_strdup(scp_prefix->valuestring) : NULL, scp_ports ? scp_portsList : NULL, address_domains ? address_domainsList : NULL, ipv4_addresses ? ipv4_addressesList : NULL, diff --git a/lib/sbi/openapi/model/sd_range.c b/lib/sbi/openapi/model/sd_range.c index 2c87b14e9..5f93bfca3 100644 --- a/lib/sbi/openapi/model/sd_range.c +++ b/lib/sbi/openapi/model/sd_range.c @@ -9,10 +9,9 @@ OpenAPI_sd_range_t *OpenAPI_sd_range_create( char *end ) { - OpenAPI_sd_range_t *sd_range_local_var = OpenAPI_malloc(sizeof(OpenAPI_sd_range_t)); - if (!sd_range_local_var) { - return NULL; - } + OpenAPI_sd_range_t *sd_range_local_var = ogs_malloc(sizeof(OpenAPI_sd_range_t)); + ogs_assert(sd_range_local_var); + sd_range_local_var->start = start; sd_range_local_var->end = end; @@ -80,8 +79,8 @@ OpenAPI_sd_range_t *OpenAPI_sd_range_parseFromJSON(cJSON *sd_rangeJSON) } sd_range_local_var = OpenAPI_sd_range_create ( - start ? ogs_strdup_or_assert(start->valuestring) : NULL, - end ? ogs_strdup_or_assert(end->valuestring) : NULL + start ? ogs_strdup(start->valuestring) : NULL, + end ? ogs_strdup(end->valuestring) : NULL ); return sd_range_local_var; diff --git a/lib/sbi/openapi/model/sdm_subs_modification.c b/lib/sbi/openapi/model/sdm_subs_modification.c index 4b686cb9c..65f11953e 100644 --- a/lib/sbi/openapi/model/sdm_subs_modification.c +++ b/lib/sbi/openapi/model/sdm_subs_modification.c @@ -9,10 +9,9 @@ OpenAPI_sdm_subs_modification_t *OpenAPI_sdm_subs_modification_create( OpenAPI_list_t *monitored_resource_uris ) { - OpenAPI_sdm_subs_modification_t *sdm_subs_modification_local_var = OpenAPI_malloc(sizeof(OpenAPI_sdm_subs_modification_t)); - if (!sdm_subs_modification_local_var) { - return NULL; - } + OpenAPI_sdm_subs_modification_t *sdm_subs_modification_local_var = ogs_malloc(sizeof(OpenAPI_sdm_subs_modification_t)); + ogs_assert(sdm_subs_modification_local_var); + sdm_subs_modification_local_var->expires = expires; sdm_subs_modification_local_var->monitored_resource_uris = monitored_resource_uris; @@ -98,12 +97,12 @@ OpenAPI_sdm_subs_modification_t *OpenAPI_sdm_subs_modification_parseFromJSON(cJS ogs_error("OpenAPI_sdm_subs_modification_parseFromJSON() failed [monitored_resource_uris]"); goto end; } - OpenAPI_list_add(monitored_resource_urisList , ogs_strdup_or_assert(monitored_resource_uris_local->valuestring)); + OpenAPI_list_add(monitored_resource_urisList , ogs_strdup(monitored_resource_uris_local->valuestring)); } } sdm_subs_modification_local_var = OpenAPI_sdm_subs_modification_create ( - expires ? ogs_strdup_or_assert(expires->valuestring) : NULL, + expires ? ogs_strdup(expires->valuestring) : NULL, monitored_resource_uris ? monitored_resource_urisList : NULL ); diff --git a/lib/sbi/openapi/model/sdm_subscription.c b/lib/sbi/openapi/model/sdm_subscription.c index b5ab32f41..2e3f11f63 100644 --- a/lib/sbi/openapi/model/sdm_subscription.c +++ b/lib/sbi/openapi/model/sdm_subscription.c @@ -23,10 +23,9 @@ OpenAPI_sdm_subscription_t *OpenAPI_sdm_subscription_create( OpenAPI_context_info_t *context_info ) { - OpenAPI_sdm_subscription_t *sdm_subscription_local_var = OpenAPI_malloc(sizeof(OpenAPI_sdm_subscription_t)); - if (!sdm_subscription_local_var) { - return NULL; - } + OpenAPI_sdm_subscription_t *sdm_subscription_local_var = ogs_malloc(sizeof(OpenAPI_sdm_subscription_t)); + ogs_assert(sdm_subscription_local_var); + sdm_subscription_local_var->nf_instance_id = nf_instance_id; sdm_subscription_local_var->is_implicit_unsubscribe = is_implicit_unsubscribe; sdm_subscription_local_var->implicit_unsubscribe = implicit_unsubscribe; @@ -281,7 +280,7 @@ OpenAPI_sdm_subscription_t *OpenAPI_sdm_subscription_parseFromJSON(cJSON *sdm_su ogs_error("OpenAPI_sdm_subscription_parseFromJSON() failed [monitored_resource_uris]"); goto end; } - OpenAPI_list_add(monitored_resource_urisList , ogs_strdup_or_assert(monitored_resource_uris_local->valuestring)); + OpenAPI_list_add(monitored_resource_urisList , ogs_strdup(monitored_resource_uris_local->valuestring)); } cJSON *single_nssai = cJSON_GetObjectItemCaseSensitive(sdm_subscriptionJSON, "singleNssai"); @@ -349,21 +348,21 @@ OpenAPI_sdm_subscription_t *OpenAPI_sdm_subscription_parseFromJSON(cJSON *sdm_su } sdm_subscription_local_var = OpenAPI_sdm_subscription_create ( - ogs_strdup_or_assert(nf_instance_id->valuestring), + ogs_strdup(nf_instance_id->valuestring), implicit_unsubscribe ? true : false, implicit_unsubscribe ? implicit_unsubscribe->valueint : 0, - expires ? ogs_strdup_or_assert(expires->valuestring) : NULL, - ogs_strdup_or_assert(callback_reference->valuestring), - amf_service_name ? ogs_strdup_or_assert(amf_service_name->valuestring) : NULL, + expires ? ogs_strdup(expires->valuestring) : NULL, + ogs_strdup(callback_reference->valuestring), + amf_service_name ? ogs_strdup(amf_service_name->valuestring) : NULL, monitored_resource_urisList, single_nssai ? single_nssai_local_nonprim : NULL, - dnn ? ogs_strdup_or_assert(dnn->valuestring) : NULL, - subscription_id ? ogs_strdup_or_assert(subscription_id->valuestring) : NULL, + dnn ? ogs_strdup(dnn->valuestring) : NULL, + subscription_id ? ogs_strdup(subscription_id->valuestring) : NULL, plmn_id ? plmn_id_local_nonprim : NULL, immediate_report ? true : false, immediate_report ? immediate_report->valueint : 0, report ? report_local_nonprim : NULL, - supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, + supported_features ? ogs_strdup(supported_features->valuestring) : NULL, context_info ? context_info_local_nonprim : NULL ); diff --git a/lib/sbi/openapi/model/sdm_subscription_1.c b/lib/sbi/openapi/model/sdm_subscription_1.c index 94db274d4..ae8b01f3d 100644 --- a/lib/sbi/openapi/model/sdm_subscription_1.c +++ b/lib/sbi/openapi/model/sdm_subscription_1.c @@ -23,10 +23,9 @@ OpenAPI_sdm_subscription_1_t *OpenAPI_sdm_subscription_1_create( OpenAPI_context_info_t *context_info ) { - OpenAPI_sdm_subscription_1_t *sdm_subscription_1_local_var = OpenAPI_malloc(sizeof(OpenAPI_sdm_subscription_1_t)); - if (!sdm_subscription_1_local_var) { - return NULL; - } + OpenAPI_sdm_subscription_1_t *sdm_subscription_1_local_var = ogs_malloc(sizeof(OpenAPI_sdm_subscription_1_t)); + ogs_assert(sdm_subscription_1_local_var); + sdm_subscription_1_local_var->nf_instance_id = nf_instance_id; sdm_subscription_1_local_var->is_implicit_unsubscribe = is_implicit_unsubscribe; sdm_subscription_1_local_var->implicit_unsubscribe = implicit_unsubscribe; @@ -281,7 +280,7 @@ OpenAPI_sdm_subscription_1_t *OpenAPI_sdm_subscription_1_parseFromJSON(cJSON *sd ogs_error("OpenAPI_sdm_subscription_1_parseFromJSON() failed [monitored_resource_uris]"); goto end; } - OpenAPI_list_add(monitored_resource_urisList , ogs_strdup_or_assert(monitored_resource_uris_local->valuestring)); + OpenAPI_list_add(monitored_resource_urisList , ogs_strdup(monitored_resource_uris_local->valuestring)); } cJSON *single_nssai = cJSON_GetObjectItemCaseSensitive(sdm_subscription_1JSON, "singleNssai"); @@ -349,21 +348,21 @@ OpenAPI_sdm_subscription_1_t *OpenAPI_sdm_subscription_1_parseFromJSON(cJSON *sd } sdm_subscription_1_local_var = OpenAPI_sdm_subscription_1_create ( - ogs_strdup_or_assert(nf_instance_id->valuestring), + ogs_strdup(nf_instance_id->valuestring), implicit_unsubscribe ? true : false, implicit_unsubscribe ? implicit_unsubscribe->valueint : 0, - expires ? ogs_strdup_or_assert(expires->valuestring) : NULL, - ogs_strdup_or_assert(callback_reference->valuestring), - amf_service_name ? ogs_strdup_or_assert(amf_service_name->valuestring) : NULL, + expires ? ogs_strdup(expires->valuestring) : NULL, + ogs_strdup(callback_reference->valuestring), + amf_service_name ? ogs_strdup(amf_service_name->valuestring) : NULL, monitored_resource_urisList, single_nssai ? single_nssai_local_nonprim : NULL, - dnn ? ogs_strdup_or_assert(dnn->valuestring) : NULL, - subscription_id ? ogs_strdup_or_assert(subscription_id->valuestring) : NULL, + dnn ? ogs_strdup(dnn->valuestring) : NULL, + subscription_id ? ogs_strdup(subscription_id->valuestring) : NULL, plmn_id ? plmn_id_local_nonprim : NULL, immediate_report ? true : false, immediate_report ? immediate_report->valueint : 0, report ? report_local_nonprim : NULL, - supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, + supported_features ? ogs_strdup(supported_features->valuestring) : NULL, context_info ? context_info_local_nonprim : NULL ); diff --git a/lib/sbi/openapi/model/seaf_data.c b/lib/sbi/openapi/model/seaf_data.c index 297edda7c..05a2b2d03 100644 --- a/lib/sbi/openapi/model/seaf_data.c +++ b/lib/sbi/openapi/model/seaf_data.c @@ -16,10 +16,9 @@ OpenAPI_seaf_data_t *OpenAPI_seaf_data_create( int key_amf_h_derivation_ind ) { - OpenAPI_seaf_data_t *seaf_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_seaf_data_t)); - if (!seaf_data_local_var) { - return NULL; - } + OpenAPI_seaf_data_t *seaf_data_local_var = ogs_malloc(sizeof(OpenAPI_seaf_data_t)); + ogs_assert(seaf_data_local_var); + seaf_data_local_var->ng_ksi = ng_ksi; seaf_data_local_var->key_amf = key_amf; seaf_data_local_var->nh = nh; @@ -169,7 +168,7 @@ OpenAPI_seaf_data_t *OpenAPI_seaf_data_parseFromJSON(cJSON *seaf_dataJSON) seaf_data_local_var = OpenAPI_seaf_data_create ( ng_ksi_local_nonprim, key_amf_local_nonprim, - nh ? ogs_strdup_or_assert(nh->valuestring) : NULL, + nh ? ogs_strdup(nh->valuestring) : NULL, ncc ? true : false, ncc ? ncc->valuedouble : 0, key_amf_change_ind ? true : false, diff --git a/lib/sbi/openapi/model/search_result.c b/lib/sbi/openapi/model/search_result.c index 6eb64933f..77ec4686b 100644 --- a/lib/sbi/openapi/model/search_result.c +++ b/lib/sbi/openapi/model/search_result.c @@ -15,10 +15,9 @@ OpenAPI_search_result_t *OpenAPI_search_result_create( char *nrf_supported_features ) { - OpenAPI_search_result_t *search_result_local_var = OpenAPI_malloc(sizeof(OpenAPI_search_result_t)); - if (!search_result_local_var) { - return NULL; - } + OpenAPI_search_result_t *search_result_local_var = ogs_malloc(sizeof(OpenAPI_search_result_t)); + ogs_assert(search_result_local_var); + search_result_local_var->is_validity_period = is_validity_period; search_result_local_var->validity_period = validity_period; search_result_local_var->nf_instances = nf_instances; @@ -195,11 +194,11 @@ OpenAPI_search_result_t *OpenAPI_search_result_parseFromJSON(cJSON *search_resul validity_period ? true : false, validity_period ? validity_period->valuedouble : 0, nf_instancesList, - search_id ? ogs_strdup_or_assert(search_id->valuestring) : NULL, + search_id ? ogs_strdup(search_id->valuestring) : NULL, num_nf_inst_complete ? true : false, num_nf_inst_complete ? num_nf_inst_complete->valuedouble : 0, preferred_search ? preferred_search_local_nonprim : NULL, - nrf_supported_features ? ogs_strdup_or_assert(nrf_supported_features->valuestring) : NULL + nrf_supported_features ? ogs_strdup(nrf_supported_features->valuestring) : NULL ); return search_result_local_var; diff --git a/lib/sbi/openapi/model/secondary_rat_usage_info.c b/lib/sbi/openapi/model/secondary_rat_usage_info.c index 0c8579bbd..862ae37ac 100644 --- a/lib/sbi/openapi/model/secondary_rat_usage_info.c +++ b/lib/sbi/openapi/model/secondary_rat_usage_info.c @@ -10,10 +10,9 @@ OpenAPI_secondary_rat_usage_info_t *OpenAPI_secondary_rat_usage_info_create( OpenAPI_list_t *pdu_session_usage_data ) { - OpenAPI_secondary_rat_usage_info_t *secondary_rat_usage_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_secondary_rat_usage_info_t)); - if (!secondary_rat_usage_info_local_var) { - return NULL; - } + OpenAPI_secondary_rat_usage_info_t *secondary_rat_usage_info_local_var = ogs_malloc(sizeof(OpenAPI_secondary_rat_usage_info_t)); + ogs_assert(secondary_rat_usage_info_local_var); + secondary_rat_usage_info_local_var->secondary_rat_type = secondary_rat_type; secondary_rat_usage_info_local_var->qos_flows_usage_data = qos_flows_usage_data; secondary_rat_usage_info_local_var->pdu_session_usage_data = pdu_session_usage_data; diff --git a/lib/sbi/openapi/model/secondary_rat_usage_report.c b/lib/sbi/openapi/model/secondary_rat_usage_report.c index 8d3dcf535..aae5d7c3c 100644 --- a/lib/sbi/openapi/model/secondary_rat_usage_report.c +++ b/lib/sbi/openapi/model/secondary_rat_usage_report.c @@ -9,10 +9,9 @@ OpenAPI_secondary_rat_usage_report_t *OpenAPI_secondary_rat_usage_report_create( OpenAPI_list_t *qos_flows_usage_data ) { - OpenAPI_secondary_rat_usage_report_t *secondary_rat_usage_report_local_var = OpenAPI_malloc(sizeof(OpenAPI_secondary_rat_usage_report_t)); - if (!secondary_rat_usage_report_local_var) { - return NULL; - } + OpenAPI_secondary_rat_usage_report_t *secondary_rat_usage_report_local_var = ogs_malloc(sizeof(OpenAPI_secondary_rat_usage_report_t)); + ogs_assert(secondary_rat_usage_report_local_var); + secondary_rat_usage_report_local_var->secondary_rat_type = secondary_rat_type; secondary_rat_usage_report_local_var->qos_flows_usage_data = qos_flows_usage_data; diff --git a/lib/sbi/openapi/model/security_result.c b/lib/sbi/openapi/model/security_result.c index 8aad19d29..c9684c015 100644 --- a/lib/sbi/openapi/model/security_result.c +++ b/lib/sbi/openapi/model/security_result.c @@ -9,10 +9,9 @@ OpenAPI_security_result_t *OpenAPI_security_result_create( OpenAPI_protection_result_e confidentiality_protection_result ) { - OpenAPI_security_result_t *security_result_local_var = OpenAPI_malloc(sizeof(OpenAPI_security_result_t)); - if (!security_result_local_var) { - return NULL; - } + OpenAPI_security_result_t *security_result_local_var = ogs_malloc(sizeof(OpenAPI_security_result_t)); + ogs_assert(security_result_local_var); + security_result_local_var->integrity_protection_result = integrity_protection_result; security_result_local_var->confidentiality_protection_result = confidentiality_protection_result; diff --git a/lib/sbi/openapi/model/send_mo_data_req_data.c b/lib/sbi/openapi/model/send_mo_data_req_data.c index dc6dccfbd..9c9a39864 100644 --- a/lib/sbi/openapi/model/send_mo_data_req_data.c +++ b/lib/sbi/openapi/model/send_mo_data_req_data.c @@ -10,10 +10,9 @@ OpenAPI_send_mo_data_req_data_t *OpenAPI_send_mo_data_req_data_create( OpenAPI_user_location_t *ue_location ) { - OpenAPI_send_mo_data_req_data_t *send_mo_data_req_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_send_mo_data_req_data_t)); - if (!send_mo_data_req_data_local_var) { - return NULL; - } + OpenAPI_send_mo_data_req_data_t *send_mo_data_req_data_local_var = ogs_malloc(sizeof(OpenAPI_send_mo_data_req_data_t)); + ogs_assert(send_mo_data_req_data_local_var); + send_mo_data_req_data_local_var->mo_data = mo_data; send_mo_data_req_data_local_var->mo_exp_data_counter = mo_exp_data_counter; send_mo_data_req_data_local_var->ue_location = ue_location; diff --git a/lib/sbi/openapi/model/sequence_number.c b/lib/sbi/openapi/model/sequence_number.c index 80086176a..57caa253d 100644 --- a/lib/sbi/openapi/model/sequence_number.c +++ b/lib/sbi/openapi/model/sequence_number.c @@ -13,10 +13,9 @@ OpenAPI_sequence_number_t *OpenAPI_sequence_number_create( OpenAPI_sign_e dif_sign ) { - OpenAPI_sequence_number_t *sequence_number_local_var = OpenAPI_malloc(sizeof(OpenAPI_sequence_number_t)); - if (!sequence_number_local_var) { - return NULL; - } + OpenAPI_sequence_number_t *sequence_number_local_var = ogs_malloc(sizeof(OpenAPI_sequence_number_t)); + ogs_assert(sequence_number_local_var); + sequence_number_local_var->sqn_scheme = sqn_scheme; sequence_number_local_var->sqn = sqn; sequence_number_local_var->last_indexes = last_indexes; @@ -36,6 +35,7 @@ void OpenAPI_sequence_number_free(OpenAPI_sequence_number_t *sequence_number) ogs_free(sequence_number->sqn); OpenAPI_list_for_each(sequence_number->last_indexes, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); ogs_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -162,7 +162,7 @@ OpenAPI_sequence_number_t *OpenAPI_sequence_number_parseFromJSON(cJSON *sequence sequence_number_local_var = OpenAPI_sequence_number_create ( sqn_scheme ? sqn_schemeVariable : 0, - sqn ? ogs_strdup_or_assert(sqn->valuestring) : NULL, + sqn ? ogs_strdup(sqn->valuestring) : NULL, last_indexes ? last_indexesList : NULL, ind_length ? true : false, ind_length ? ind_length->valuedouble : 0, diff --git a/lib/sbi/openapi/model/service_area_restriction.c b/lib/sbi/openapi/model/service_area_restriction.c index 10ccc2024..9074d8f2f 100644 --- a/lib/sbi/openapi/model/service_area_restriction.c +++ b/lib/sbi/openapi/model/service_area_restriction.c @@ -13,10 +13,9 @@ OpenAPI_service_area_restriction_t *OpenAPI_service_area_restriction_create( int max_num_of_tas_for_not_allowed_areas ) { - OpenAPI_service_area_restriction_t *service_area_restriction_local_var = OpenAPI_malloc(sizeof(OpenAPI_service_area_restriction_t)); - if (!service_area_restriction_local_var) { - return NULL; - } + OpenAPI_service_area_restriction_t *service_area_restriction_local_var = ogs_malloc(sizeof(OpenAPI_service_area_restriction_t)); + ogs_assert(service_area_restriction_local_var); + service_area_restriction_local_var->restriction_type = restriction_type; service_area_restriction_local_var->areas = areas; service_area_restriction_local_var->is_max_num_of_tas = is_max_num_of_tas; diff --git a/lib/sbi/openapi/model/service_area_restriction_1.c b/lib/sbi/openapi/model/service_area_restriction_1.c index d16b3f0da..d11cfe28f 100644 --- a/lib/sbi/openapi/model/service_area_restriction_1.c +++ b/lib/sbi/openapi/model/service_area_restriction_1.c @@ -13,10 +13,9 @@ OpenAPI_service_area_restriction_1_t *OpenAPI_service_area_restriction_1_create( int max_num_of_tas_for_not_allowed_areas ) { - OpenAPI_service_area_restriction_1_t *service_area_restriction_1_local_var = OpenAPI_malloc(sizeof(OpenAPI_service_area_restriction_1_t)); - if (!service_area_restriction_1_local_var) { - return NULL; - } + OpenAPI_service_area_restriction_1_t *service_area_restriction_1_local_var = ogs_malloc(sizeof(OpenAPI_service_area_restriction_1_t)); + ogs_assert(service_area_restriction_1_local_var); + service_area_restriction_1_local_var->restriction_type = restriction_type; service_area_restriction_1_local_var->areas = areas; service_area_restriction_1_local_var->is_max_num_of_tas = is_max_num_of_tas; diff --git a/lib/sbi/openapi/model/service_name_cond.c b/lib/sbi/openapi/model/service_name_cond.c index dce75ad14..5d7b4a657 100644 --- a/lib/sbi/openapi/model/service_name_cond.c +++ b/lib/sbi/openapi/model/service_name_cond.c @@ -8,10 +8,9 @@ OpenAPI_service_name_cond_t *OpenAPI_service_name_cond_create( char *service_name ) { - OpenAPI_service_name_cond_t *service_name_cond_local_var = OpenAPI_malloc(sizeof(OpenAPI_service_name_cond_t)); - if (!service_name_cond_local_var) { - return NULL; - } + OpenAPI_service_name_cond_t *service_name_cond_local_var = ogs_malloc(sizeof(OpenAPI_service_name_cond_t)); + ogs_assert(service_name_cond_local_var); + service_name_cond_local_var->service_name = service_name; return service_name_cond_local_var; @@ -61,7 +60,7 @@ OpenAPI_service_name_cond_t *OpenAPI_service_name_cond_parseFromJSON(cJSON *serv } service_name_cond_local_var = OpenAPI_service_name_cond_create ( - ogs_strdup_or_assert(service_name->valuestring) + ogs_strdup(service_name->valuestring) ); return service_name_cond_local_var; diff --git a/lib/sbi/openapi/model/service_parameter_data.c b/lib/sbi/openapi/model/service_parameter_data.c index b652d34ba..7adc30686 100644 --- a/lib/sbi/openapi/model/service_parameter_data.c +++ b/lib/sbi/openapi/model/service_parameter_data.c @@ -21,10 +21,9 @@ OpenAPI_service_parameter_data_t *OpenAPI_service_parameter_data_create( char *res_uri ) { - OpenAPI_service_parameter_data_t *service_parameter_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_service_parameter_data_t)); - if (!service_parameter_data_local_var) { - return NULL; - } + OpenAPI_service_parameter_data_t *service_parameter_data_local_var = ogs_malloc(sizeof(OpenAPI_service_parameter_data_t)); + ogs_assert(service_parameter_data_local_var); + service_parameter_data_local_var->app_id = app_id; service_parameter_data_local_var->dnn = dnn; service_parameter_data_local_var->snssai = snssai; @@ -294,20 +293,20 @@ OpenAPI_service_parameter_data_t *OpenAPI_service_parameter_data_parseFromJSON(c } service_parameter_data_local_var = OpenAPI_service_parameter_data_create ( - app_id ? ogs_strdup_or_assert(app_id->valuestring) : NULL, - dnn ? ogs_strdup_or_assert(dnn->valuestring) : NULL, + app_id ? ogs_strdup(app_id->valuestring) : NULL, + dnn ? ogs_strdup(dnn->valuestring) : NULL, snssai ? snssai_local_nonprim : NULL, - inter_group_id ? ogs_strdup_or_assert(inter_group_id->valuestring) : NULL, - supi ? ogs_strdup_or_assert(supi->valuestring) : NULL, - ue_ipv4 ? ogs_strdup_or_assert(ue_ipv4->valuestring) : NULL, - ue_ipv6 ? ogs_strdup_or_assert(ue_ipv6->valuestring) : NULL, - ue_mac ? ogs_strdup_or_assert(ue_mac->valuestring) : NULL, + inter_group_id ? ogs_strdup(inter_group_id->valuestring) : NULL, + supi ? ogs_strdup(supi->valuestring) : NULL, + ue_ipv4 ? ogs_strdup(ue_ipv4->valuestring) : NULL, + ue_ipv6 ? ogs_strdup(ue_ipv6->valuestring) : NULL, + ue_mac ? ogs_strdup(ue_mac->valuestring) : NULL, any_ue_ind ? true : false, any_ue_ind ? any_ue_ind->valueint : 0, - param_over_pc5 ? ogs_strdup_or_assert(param_over_pc5->valuestring) : NULL, - param_over_uu ? ogs_strdup_or_assert(param_over_uu->valuestring) : NULL, - supp_feat ? ogs_strdup_or_assert(supp_feat->valuestring) : NULL, - res_uri ? ogs_strdup_or_assert(res_uri->valuestring) : NULL + param_over_pc5 ? ogs_strdup(param_over_pc5->valuestring) : NULL, + param_over_uu ? ogs_strdup(param_over_uu->valuestring) : NULL, + supp_feat ? ogs_strdup(supp_feat->valuestring) : NULL, + res_uri ? ogs_strdup(res_uri->valuestring) : NULL ); return service_parameter_data_local_var; diff --git a/lib/sbi/openapi/model/service_parameter_data_patch.c b/lib/sbi/openapi/model/service_parameter_data_patch.c index 634cf953c..59f80c02d 100644 --- a/lib/sbi/openapi/model/service_parameter_data_patch.c +++ b/lib/sbi/openapi/model/service_parameter_data_patch.c @@ -9,10 +9,9 @@ OpenAPI_service_parameter_data_patch_t *OpenAPI_service_parameter_data_patch_cre char *param_over_uu ) { - OpenAPI_service_parameter_data_patch_t *service_parameter_data_patch_local_var = OpenAPI_malloc(sizeof(OpenAPI_service_parameter_data_patch_t)); - if (!service_parameter_data_patch_local_var) { - return NULL; - } + OpenAPI_service_parameter_data_patch_t *service_parameter_data_patch_local_var = ogs_malloc(sizeof(OpenAPI_service_parameter_data_patch_t)); + ogs_assert(service_parameter_data_patch_local_var); + service_parameter_data_patch_local_var->param_over_pc5 = param_over_pc5; service_parameter_data_patch_local_var->param_over_uu = param_over_uu; @@ -80,8 +79,8 @@ OpenAPI_service_parameter_data_patch_t *OpenAPI_service_parameter_data_patch_par } service_parameter_data_patch_local_var = OpenAPI_service_parameter_data_patch_create ( - param_over_pc5 ? ogs_strdup_or_assert(param_over_pc5->valuestring) : NULL, - param_over_uu ? ogs_strdup_or_assert(param_over_uu->valuestring) : NULL + param_over_pc5 ? ogs_strdup(param_over_pc5->valuestring) : NULL, + param_over_uu ? ogs_strdup(param_over_uu->valuestring) : NULL ); return service_parameter_data_patch_local_var; diff --git a/lib/sbi/openapi/model/service_type_unrelated_class.c b/lib/sbi/openapi/model/service_type_unrelated_class.c index adf25752d..a00dd8bf8 100644 --- a/lib/sbi/openapi/model/service_type_unrelated_class.c +++ b/lib/sbi/openapi/model/service_type_unrelated_class.c @@ -13,10 +13,9 @@ OpenAPI_service_type_unrelated_class_t *OpenAPI_service_type_unrelated_class_cre OpenAPI_list_t *code_word_list ) { - OpenAPI_service_type_unrelated_class_t *service_type_unrelated_class_local_var = OpenAPI_malloc(sizeof(OpenAPI_service_type_unrelated_class_t)); - if (!service_type_unrelated_class_local_var) { - return NULL; - } + OpenAPI_service_type_unrelated_class_t *service_type_unrelated_class_local_var = ogs_malloc(sizeof(OpenAPI_service_type_unrelated_class_t)); + ogs_assert(service_type_unrelated_class_local_var); + service_type_unrelated_class_local_var->service_type = service_type; service_type_unrelated_class_local_var->allowed_geographic_area = allowed_geographic_area; service_type_unrelated_class_local_var->privacy_check_related_action = privacy_check_related_action; @@ -209,7 +208,7 @@ OpenAPI_service_type_unrelated_class_t *OpenAPI_service_type_unrelated_class_par ogs_error("OpenAPI_service_type_unrelated_class_parseFromJSON() failed [code_word_list]"); goto end; } - OpenAPI_list_add(code_word_listList , ogs_strdup_or_assert(code_word_list_local->valuestring)); + OpenAPI_list_add(code_word_listList , ogs_strdup(code_word_list_local->valuestring)); } } diff --git a/lib/sbi/openapi/model/service_type_unrelated_class_1.c b/lib/sbi/openapi/model/service_type_unrelated_class_1.c index ffafd9a5f..9a2116850 100644 --- a/lib/sbi/openapi/model/service_type_unrelated_class_1.c +++ b/lib/sbi/openapi/model/service_type_unrelated_class_1.c @@ -13,10 +13,9 @@ OpenAPI_service_type_unrelated_class_1_t *OpenAPI_service_type_unrelated_class_1 OpenAPI_list_t *code_word_list ) { - OpenAPI_service_type_unrelated_class_1_t *service_type_unrelated_class_1_local_var = OpenAPI_malloc(sizeof(OpenAPI_service_type_unrelated_class_1_t)); - if (!service_type_unrelated_class_1_local_var) { - return NULL; - } + OpenAPI_service_type_unrelated_class_1_t *service_type_unrelated_class_1_local_var = ogs_malloc(sizeof(OpenAPI_service_type_unrelated_class_1_t)); + ogs_assert(service_type_unrelated_class_1_local_var); + service_type_unrelated_class_1_local_var->service_type = service_type; service_type_unrelated_class_1_local_var->allowed_geographic_area = allowed_geographic_area; service_type_unrelated_class_1_local_var->privacy_check_related_action = privacy_check_related_action; @@ -209,7 +208,7 @@ OpenAPI_service_type_unrelated_class_1_t *OpenAPI_service_type_unrelated_class_1 ogs_error("OpenAPI_service_type_unrelated_class_1_parseFromJSON() failed [code_word_list]"); goto end; } - OpenAPI_list_add(code_word_listList , ogs_strdup_or_assert(code_word_list_local->valuestring)); + OpenAPI_list_add(code_word_listList , ogs_strdup(code_word_list_local->valuestring)); } } diff --git a/lib/sbi/openapi/model/serving_nf_identity.c b/lib/sbi/openapi/model/serving_nf_identity.c index 97d7fc897..acb291b15 100644 --- a/lib/sbi/openapi/model/serving_nf_identity.c +++ b/lib/sbi/openapi/model/serving_nf_identity.c @@ -10,10 +10,9 @@ OpenAPI_serving_nf_identity_t *OpenAPI_serving_nf_identity_create( OpenAPI_an_gw_address_t *an_gw_addr ) { - OpenAPI_serving_nf_identity_t *serving_nf_identity_local_var = OpenAPI_malloc(sizeof(OpenAPI_serving_nf_identity_t)); - if (!serving_nf_identity_local_var) { - return NULL; - } + OpenAPI_serving_nf_identity_t *serving_nf_identity_local_var = ogs_malloc(sizeof(OpenAPI_serving_nf_identity_t)); + ogs_assert(serving_nf_identity_local_var); + serving_nf_identity_local_var->serv_nf_inst_id = serv_nf_inst_id; serving_nf_identity_local_var->guami = guami; serving_nf_identity_local_var->an_gw_addr = an_gw_addr; @@ -107,7 +106,7 @@ OpenAPI_serving_nf_identity_t *OpenAPI_serving_nf_identity_parseFromJSON(cJSON * } serving_nf_identity_local_var = OpenAPI_serving_nf_identity_create ( - serv_nf_inst_id ? ogs_strdup_or_assert(serv_nf_inst_id->valuestring) : NULL, + serv_nf_inst_id ? ogs_strdup(serv_nf_inst_id->valuestring) : NULL, guami ? guami_local_nonprim : NULL, an_gw_addr ? an_gw_addr_local_nonprim : NULL ); diff --git a/lib/sbi/openapi/model/session_management_subscription_data.c b/lib/sbi/openapi/model/session_management_subscription_data.c index 4b7dc1a20..c706a0b40 100644 --- a/lib/sbi/openapi/model/session_management_subscription_data.c +++ b/lib/sbi/openapi/model/session_management_subscription_data.c @@ -18,10 +18,9 @@ OpenAPI_session_management_subscription_data_t *OpenAPI_session_management_subsc char *_3gpp_charging_characteristics ) { - OpenAPI_session_management_subscription_data_t *session_management_subscription_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_session_management_subscription_data_t)); - if (!session_management_subscription_data_local_var) { - return NULL; - } + OpenAPI_session_management_subscription_data_t *session_management_subscription_data_local_var = ogs_malloc(sizeof(OpenAPI_session_management_subscription_data_t)); + ogs_assert(session_management_subscription_data_local_var); + session_management_subscription_data_local_var->single_nssai = single_nssai; session_management_subscription_data_local_var->dnn_configurations = dnn_configurations; session_management_subscription_data_local_var->internal_group_ids = internal_group_ids; @@ -46,6 +45,7 @@ void OpenAPI_session_management_subscription_data_free(OpenAPI_session_managemen OpenAPI_snssai_free(session_management_subscription_data->single_nssai); OpenAPI_list_for_each(session_management_subscription_data->dnn_configurations, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_dnn_configuration_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -56,6 +56,7 @@ void OpenAPI_session_management_subscription_data_free(OpenAPI_session_managemen OpenAPI_list_free(session_management_subscription_data->internal_group_ids); OpenAPI_list_for_each(session_management_subscription_data->shared_vn_group_data_ids, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); ogs_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -65,12 +66,14 @@ void OpenAPI_session_management_subscription_data_free(OpenAPI_session_managemen ogs_free(session_management_subscription_data->shared_trace_data_id); OpenAPI_list_for_each(session_management_subscription_data->expected_ue_behaviours_list, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_expected_ue_behaviour_data_free(localKeyValue->value); ogs_free(localKeyValue); } OpenAPI_list_free(session_management_subscription_data->expected_ue_behaviours_list); OpenAPI_list_for_each(session_management_subscription_data->suggested_packet_num_dl_list, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_suggested_packet_num_dl_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -272,9 +275,9 @@ OpenAPI_session_management_subscription_data_t *OpenAPI_session_management_subsc cJSON *localMapObject = dnn_configurations_local_map; if (cJSON_IsObject(dnn_configurations_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_dnn_configuration_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_dnn_configuration_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(dnn_configurations_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_session_management_subscription_data_parseFromJSON() failed [dnn_configurations]"); goto end; @@ -299,7 +302,7 @@ OpenAPI_session_management_subscription_data_t *OpenAPI_session_management_subsc ogs_error("OpenAPI_session_management_subscription_data_parseFromJSON() failed [internal_group_ids]"); goto end; } - OpenAPI_list_add(internal_group_idsList , ogs_strdup_or_assert(internal_group_ids_local->valuestring)); + OpenAPI_list_add(internal_group_idsList , ogs_strdup(internal_group_ids_local->valuestring)); } } @@ -371,9 +374,9 @@ OpenAPI_session_management_subscription_data_t *OpenAPI_session_management_subsc cJSON *localMapObject = expected_ue_behaviours_list_local_map; if (cJSON_IsObject(expected_ue_behaviours_list_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_expected_ue_behaviour_data_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_expected_ue_behaviour_data_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(expected_ue_behaviours_list_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_session_management_subscription_data_parseFromJSON() failed [expected_ue_behaviours_list]"); goto end; @@ -397,9 +400,9 @@ OpenAPI_session_management_subscription_data_t *OpenAPI_session_management_subsc cJSON *localMapObject = suggested_packet_num_dl_list_local_map; if (cJSON_IsObject(suggested_packet_num_dl_list_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_suggested_packet_num_dl_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_suggested_packet_num_dl_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(suggested_packet_num_dl_list_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_session_management_subscription_data_parseFromJSON() failed [suggested_packet_num_dl_list]"); goto end; @@ -422,13 +425,13 @@ OpenAPI_session_management_subscription_data_t *OpenAPI_session_management_subsc dnn_configurations ? dnn_configurationsList : NULL, internal_group_ids ? internal_group_idsList : NULL, shared_vn_group_data_ids ? shared_vn_group_data_idsList : NULL, - shared_dnn_configurations_id ? ogs_strdup_or_assert(shared_dnn_configurations_id->valuestring) : NULL, + shared_dnn_configurations_id ? ogs_strdup(shared_dnn_configurations_id->valuestring) : NULL, odb_packet_services ? odb_packet_servicesVariable : 0, trace_data ? trace_data_local_nonprim : NULL, - shared_trace_data_id ? ogs_strdup_or_assert(shared_trace_data_id->valuestring) : NULL, + shared_trace_data_id ? ogs_strdup(shared_trace_data_id->valuestring) : NULL, expected_ue_behaviours_list ? expected_ue_behaviours_listList : NULL, suggested_packet_num_dl_list ? suggested_packet_num_dl_listList : NULL, - _3gpp_charging_characteristics ? ogs_strdup_or_assert(_3gpp_charging_characteristics->valuestring) : NULL + _3gpp_charging_characteristics ? ogs_strdup(_3gpp_charging_characteristics->valuestring) : NULL ); return session_management_subscription_data_local_var; diff --git a/lib/sbi/openapi/model/session_management_subscription_data_1.c b/lib/sbi/openapi/model/session_management_subscription_data_1.c index 2da277125..da9707062 100644 --- a/lib/sbi/openapi/model/session_management_subscription_data_1.c +++ b/lib/sbi/openapi/model/session_management_subscription_data_1.c @@ -18,10 +18,9 @@ OpenAPI_session_management_subscription_data_1_t *OpenAPI_session_management_sub char *_3gpp_charging_characteristics ) { - OpenAPI_session_management_subscription_data_1_t *session_management_subscription_data_1_local_var = OpenAPI_malloc(sizeof(OpenAPI_session_management_subscription_data_1_t)); - if (!session_management_subscription_data_1_local_var) { - return NULL; - } + OpenAPI_session_management_subscription_data_1_t *session_management_subscription_data_1_local_var = ogs_malloc(sizeof(OpenAPI_session_management_subscription_data_1_t)); + ogs_assert(session_management_subscription_data_1_local_var); + session_management_subscription_data_1_local_var->single_nssai = single_nssai; session_management_subscription_data_1_local_var->dnn_configurations = dnn_configurations; session_management_subscription_data_1_local_var->internal_group_ids = internal_group_ids; @@ -46,6 +45,7 @@ void OpenAPI_session_management_subscription_data_1_free(OpenAPI_session_managem OpenAPI_snssai_free(session_management_subscription_data_1->single_nssai); OpenAPI_list_for_each(session_management_subscription_data_1->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); } @@ -56,6 +56,7 @@ void OpenAPI_session_management_subscription_data_1_free(OpenAPI_session_managem OpenAPI_list_free(session_management_subscription_data_1->internal_group_ids); OpenAPI_list_for_each(session_management_subscription_data_1->shared_vn_group_data_ids, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); ogs_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -65,12 +66,14 @@ void OpenAPI_session_management_subscription_data_1_free(OpenAPI_session_managem ogs_free(session_management_subscription_data_1->shared_trace_data_id); OpenAPI_list_for_each(session_management_subscription_data_1->expected_ue_behaviours_list, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_expected_ue_behaviour_data_1_free(localKeyValue->value); ogs_free(localKeyValue); } OpenAPI_list_free(session_management_subscription_data_1->expected_ue_behaviours_list); OpenAPI_list_for_each(session_management_subscription_data_1->suggested_packet_num_dl_list, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_suggested_packet_num_dl_1_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -272,9 +275,9 @@ OpenAPI_session_management_subscription_data_1_t *OpenAPI_session_management_sub cJSON *localMapObject = dnn_configurations_local_map; if (cJSON_IsObject(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(dnn_configurations_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_session_management_subscription_data_1_parseFromJSON() failed [dnn_configurations]"); goto end; @@ -299,7 +302,7 @@ OpenAPI_session_management_subscription_data_1_t *OpenAPI_session_management_sub ogs_error("OpenAPI_session_management_subscription_data_1_parseFromJSON() failed [internal_group_ids]"); goto end; } - OpenAPI_list_add(internal_group_idsList , ogs_strdup_or_assert(internal_group_ids_local->valuestring)); + OpenAPI_list_add(internal_group_idsList , ogs_strdup(internal_group_ids_local->valuestring)); } } @@ -371,9 +374,9 @@ OpenAPI_session_management_subscription_data_1_t *OpenAPI_session_management_sub cJSON *localMapObject = expected_ue_behaviours_list_local_map; if (cJSON_IsObject(expected_ue_behaviours_list_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_expected_ue_behaviour_data_1_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_expected_ue_behaviour_data_1_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(expected_ue_behaviours_list_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_session_management_subscription_data_1_parseFromJSON() failed [expected_ue_behaviours_list]"); goto end; @@ -397,9 +400,9 @@ OpenAPI_session_management_subscription_data_1_t *OpenAPI_session_management_sub cJSON *localMapObject = suggested_packet_num_dl_list_local_map; if (cJSON_IsObject(suggested_packet_num_dl_list_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_suggested_packet_num_dl_1_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_suggested_packet_num_dl_1_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(suggested_packet_num_dl_list_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_session_management_subscription_data_1_parseFromJSON() failed [suggested_packet_num_dl_list]"); goto end; @@ -422,13 +425,13 @@ OpenAPI_session_management_subscription_data_1_t *OpenAPI_session_management_sub dnn_configurations ? dnn_configurationsList : NULL, internal_group_ids ? internal_group_idsList : NULL, shared_vn_group_data_ids ? shared_vn_group_data_idsList : NULL, - shared_dnn_configurations_id ? ogs_strdup_or_assert(shared_dnn_configurations_id->valuestring) : NULL, + shared_dnn_configurations_id ? ogs_strdup(shared_dnn_configurations_id->valuestring) : NULL, odb_packet_services ? odb_packet_servicesVariable : 0, trace_data ? trace_data_local_nonprim : NULL, - shared_trace_data_id ? ogs_strdup_or_assert(shared_trace_data_id->valuestring) : NULL, + shared_trace_data_id ? ogs_strdup(shared_trace_data_id->valuestring) : NULL, expected_ue_behaviours_list ? expected_ue_behaviours_listList : NULL, suggested_packet_num_dl_list ? suggested_packet_num_dl_listList : NULL, - _3gpp_charging_characteristics ? ogs_strdup_or_assert(_3gpp_charging_characteristics->valuestring) : NULL + _3gpp_charging_characteristics ? ogs_strdup(_3gpp_charging_characteristics->valuestring) : NULL ); return session_management_subscription_data_1_local_var; diff --git a/lib/sbi/openapi/model/session_rule.c b/lib/sbi/openapi/model/session_rule.c index b8d1e90ba..c47959398 100644 --- a/lib/sbi/openapi/model/session_rule.c +++ b/lib/sbi/openapi/model/session_rule.c @@ -13,10 +13,9 @@ OpenAPI_session_rule_t *OpenAPI_session_rule_create( char *ref_cond_data ) { - OpenAPI_session_rule_t *session_rule_local_var = OpenAPI_malloc(sizeof(OpenAPI_session_rule_t)); - if (!session_rule_local_var) { - return NULL; - } + OpenAPI_session_rule_t *session_rule_local_var = ogs_malloc(sizeof(OpenAPI_session_rule_t)); + ogs_assert(session_rule_local_var); + session_rule_local_var->auth_sess_ambr = auth_sess_ambr; session_rule_local_var->auth_def_qos = auth_def_qos; session_rule_local_var->sess_rule_id = sess_rule_id; @@ -166,10 +165,10 @@ OpenAPI_session_rule_t *OpenAPI_session_rule_parseFromJSON(cJSON *session_ruleJS session_rule_local_var = OpenAPI_session_rule_create ( auth_sess_ambr ? auth_sess_ambr_local_nonprim : NULL, auth_def_qos ? auth_def_qos_local_nonprim : NULL, - ogs_strdup_or_assert(sess_rule_id->valuestring), - ref_um_data ? ogs_strdup_or_assert(ref_um_data->valuestring) : NULL, - ref_um_n3g_data ? ogs_strdup_or_assert(ref_um_n3g_data->valuestring) : NULL, - ref_cond_data ? ogs_strdup_or_assert(ref_cond_data->valuestring) : NULL + ogs_strdup(sess_rule_id->valuestring), + ref_um_data ? ogs_strdup(ref_um_data->valuestring) : NULL, + ref_um_n3g_data ? ogs_strdup(ref_um_n3g_data->valuestring) : NULL, + ref_cond_data ? ogs_strdup(ref_cond_data->valuestring) : NULL ); return session_rule_local_var; diff --git a/lib/sbi/openapi/model/session_rule_report.c b/lib/sbi/openapi/model/session_rule_report.c index 5bf754b8f..a8d7f6d8d 100644 --- a/lib/sbi/openapi/model/session_rule_report.c +++ b/lib/sbi/openapi/model/session_rule_report.c @@ -11,10 +11,9 @@ OpenAPI_session_rule_report_t *OpenAPI_session_rule_report_create( OpenAPI_list_t *policy_dec_failure_reports ) { - OpenAPI_session_rule_report_t *session_rule_report_local_var = OpenAPI_malloc(sizeof(OpenAPI_session_rule_report_t)); - if (!session_rule_report_local_var) { - return NULL; - } + OpenAPI_session_rule_report_t *session_rule_report_local_var = ogs_malloc(sizeof(OpenAPI_session_rule_report_t)); + ogs_assert(session_rule_report_local_var); + session_rule_report_local_var->rule_ids = rule_ids; session_rule_report_local_var->rule_status = rule_status; session_rule_report_local_var->sess_rule_failure_code = sess_rule_failure_code; @@ -114,7 +113,7 @@ OpenAPI_session_rule_report_t *OpenAPI_session_rule_report_parseFromJSON(cJSON * ogs_error("OpenAPI_session_rule_report_parseFromJSON() failed [rule_ids]"); goto end; } - OpenAPI_list_add(rule_idsList , ogs_strdup_or_assert(rule_ids_local->valuestring)); + OpenAPI_list_add(rule_idsList , ogs_strdup(rule_ids_local->valuestring)); } cJSON *rule_status = cJSON_GetObjectItemCaseSensitive(session_rule_reportJSON, "ruleStatus"); diff --git a/lib/sbi/openapi/model/shared_data.c b/lib/sbi/openapi/model/shared_data.c index ab06532d5..93d1d717b 100644 --- a/lib/sbi/openapi/model/shared_data.c +++ b/lib/sbi/openapi/model/shared_data.c @@ -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, diff --git a/lib/sbi/openapi/model/slice_info_for_pdu_session.c b/lib/sbi/openapi/model/slice_info_for_pdu_session.c index 60b9d689d..7612ed3e6 100644 --- a/lib/sbi/openapi/model/slice_info_for_pdu_session.c +++ b/lib/sbi/openapi/model/slice_info_for_pdu_session.c @@ -10,10 +10,9 @@ OpenAPI_slice_info_for_pdu_session_t *OpenAPI_slice_info_for_pdu_session_create( OpenAPI_snssai_t *home_snssai ) { - OpenAPI_slice_info_for_pdu_session_t *slice_info_for_pdu_session_local_var = OpenAPI_malloc(sizeof(OpenAPI_slice_info_for_pdu_session_t)); - if (!slice_info_for_pdu_session_local_var) { - return NULL; - } + OpenAPI_slice_info_for_pdu_session_t *slice_info_for_pdu_session_local_var = ogs_malloc(sizeof(OpenAPI_slice_info_for_pdu_session_t)); + ogs_assert(slice_info_for_pdu_session_local_var); + slice_info_for_pdu_session_local_var->s_nssai = s_nssai; slice_info_for_pdu_session_local_var->roaming_indication = roaming_indication; slice_info_for_pdu_session_local_var->home_snssai = home_snssai; diff --git a/lib/sbi/openapi/model/slice_info_for_registration.c b/lib/sbi/openapi/model/slice_info_for_registration.c index cb93a8787..cb334036b 100644 --- a/lib/sbi/openapi/model/slice_info_for_registration.c +++ b/lib/sbi/openapi/model/slice_info_for_registration.c @@ -17,10 +17,9 @@ OpenAPI_slice_info_for_registration_t *OpenAPI_slice_info_for_registration_creat int request_mapping ) { - OpenAPI_slice_info_for_registration_t *slice_info_for_registration_local_var = OpenAPI_malloc(sizeof(OpenAPI_slice_info_for_registration_t)); - if (!slice_info_for_registration_local_var) { - return NULL; - } + OpenAPI_slice_info_for_registration_t *slice_info_for_registration_local_var = ogs_malloc(sizeof(OpenAPI_slice_info_for_registration_t)); + ogs_assert(slice_info_for_registration_local_var); + slice_info_for_registration_local_var->subscribed_nssai = subscribed_nssai; slice_info_for_registration_local_var->allowed_nssai_current_access = allowed_nssai_current_access; slice_info_for_registration_local_var->allowed_nssai_other_access = allowed_nssai_other_access; diff --git a/lib/sbi/openapi/model/slice_info_for_ue_configuration_update.c b/lib/sbi/openapi/model/slice_info_for_ue_configuration_update.c index 59ad606fe..c3f790f0d 100644 --- a/lib/sbi/openapi/model/slice_info_for_ue_configuration_update.c +++ b/lib/sbi/openapi/model/slice_info_for_ue_configuration_update.c @@ -14,10 +14,9 @@ OpenAPI_slice_info_for_ue_configuration_update_t *OpenAPI_slice_info_for_ue_conf OpenAPI_list_t *mapping_of_nssai ) { - OpenAPI_slice_info_for_ue_configuration_update_t *slice_info_for_ue_configuration_update_local_var = OpenAPI_malloc(sizeof(OpenAPI_slice_info_for_ue_configuration_update_t)); - if (!slice_info_for_ue_configuration_update_local_var) { - return NULL; - } + OpenAPI_slice_info_for_ue_configuration_update_t *slice_info_for_ue_configuration_update_local_var = ogs_malloc(sizeof(OpenAPI_slice_info_for_ue_configuration_update_t)); + ogs_assert(slice_info_for_ue_configuration_update_local_var); + slice_info_for_ue_configuration_update_local_var->subscribed_nssai = subscribed_nssai; slice_info_for_ue_configuration_update_local_var->allowed_nssai_current_access = allowed_nssai_current_access; slice_info_for_ue_configuration_update_local_var->allowed_nssai_other_access = allowed_nssai_other_access; diff --git a/lib/sbi/openapi/model/sm_context.c b/lib/sbi/openapi/model/sm_context.c index fdc386f1d..51765bc44 100644 --- a/lib/sbi/openapi/model/sm_context.c +++ b/lib/sbi/openapi/model/sm_context.c @@ -59,10 +59,9 @@ OpenAPI_sm_context_t *OpenAPI_sm_context_create( OpenAPI_list_t *add_red_ran_tunnel_info ) { - OpenAPI_sm_context_t *sm_context_local_var = OpenAPI_malloc(sizeof(OpenAPI_sm_context_t)); - if (!sm_context_local_var) { - return NULL; - } + OpenAPI_sm_context_t *sm_context_local_var = ogs_malloc(sizeof(OpenAPI_sm_context_t)); + ogs_assert(sm_context_local_var); + sm_context_local_var->pdu_session_id = pdu_session_id; sm_context_local_var->dnn = dnn; sm_context_local_var->selected_dnn = selected_dnn; @@ -1113,45 +1112,45 @@ OpenAPI_sm_context_t *OpenAPI_sm_context_parseFromJSON(cJSON *sm_contextJSON) sm_context_local_var = OpenAPI_sm_context_create ( pdu_session_id->valuedouble, - ogs_strdup_or_assert(dnn->valuestring), - selected_dnn ? ogs_strdup_or_assert(selected_dnn->valuestring) : NULL, + ogs_strdup(dnn->valuestring), + selected_dnn ? ogs_strdup(selected_dnn->valuestring) : NULL, s_nssai_local_nonprim, hplmn_snssai ? hplmn_snssai_local_nonprim : NULL, pdu_session_typeVariable, - gpsi ? ogs_strdup_or_assert(gpsi->valuestring) : NULL, - h_smf_uri ? ogs_strdup_or_assert(h_smf_uri->valuestring) : NULL, - smf_uri ? ogs_strdup_or_assert(smf_uri->valuestring) : NULL, - pdu_session_ref ? ogs_strdup_or_assert(pdu_session_ref->valuestring) : NULL, - pcf_id ? ogs_strdup_or_assert(pcf_id->valuestring) : NULL, - pcf_group_id ? ogs_strdup_or_assert(pcf_group_id->valuestring) : NULL, - pcf_set_id ? ogs_strdup_or_assert(pcf_set_id->valuestring) : NULL, + gpsi ? ogs_strdup(gpsi->valuestring) : NULL, + h_smf_uri ? ogs_strdup(h_smf_uri->valuestring) : NULL, + smf_uri ? ogs_strdup(smf_uri->valuestring) : NULL, + pdu_session_ref ? ogs_strdup(pdu_session_ref->valuestring) : NULL, + pcf_id ? ogs_strdup(pcf_id->valuestring) : NULL, + pcf_group_id ? ogs_strdup(pcf_group_id->valuestring) : NULL, + pcf_set_id ? ogs_strdup(pcf_set_id->valuestring) : NULL, sel_mode ? sel_modeVariable : 0, - udm_group_id ? ogs_strdup_or_assert(udm_group_id->valuestring) : NULL, - routing_indicator ? ogs_strdup_or_assert(routing_indicator->valuestring) : NULL, + udm_group_id ? ogs_strdup(udm_group_id->valuestring) : NULL, + routing_indicator ? ogs_strdup(routing_indicator->valuestring) : NULL, session_ambr_local_nonprim, qos_flows_listList, - h_smf_instance_id ? ogs_strdup_or_assert(h_smf_instance_id->valuestring) : NULL, - smf_instance_id ? ogs_strdup_or_assert(smf_instance_id->valuestring) : NULL, - pdu_session_smf_set_id ? ogs_strdup_or_assert(pdu_session_smf_set_id->valuestring) : NULL, - pdu_session_smf_service_set_id ? ogs_strdup_or_assert(pdu_session_smf_service_set_id->valuestring) : NULL, + h_smf_instance_id ? ogs_strdup(h_smf_instance_id->valuestring) : NULL, + smf_instance_id ? ogs_strdup(smf_instance_id->valuestring) : NULL, + pdu_session_smf_set_id ? ogs_strdup(pdu_session_smf_set_id->valuestring) : NULL, + pdu_session_smf_service_set_id ? ogs_strdup(pdu_session_smf_service_set_id->valuestring) : NULL, pdu_session_smf_binding ? pdu_session_smf_bindingVariable : 0, enable_pause_charging ? true : false, enable_pause_charging ? enable_pause_charging->valueint : 0, - ue_ipv4_address ? ogs_strdup_or_assert(ue_ipv4_address->valuestring) : NULL, - ue_ipv6_prefix ? ogs_strdup_or_assert(ue_ipv6_prefix->valuestring) : NULL, + ue_ipv4_address ? ogs_strdup(ue_ipv4_address->valuestring) : NULL, + ue_ipv6_prefix ? ogs_strdup(ue_ipv6_prefix->valuestring) : NULL, eps_pdn_cnx_info ? eps_pdn_cnx_info_local_nonprim : NULL, eps_bearer_info ? eps_bearer_infoList : NULL, max_integrity_protected_data_rate ? max_integrity_protected_data_rateVariable : 0, always_on_granted ? true : false, always_on_granted ? always_on_granted->valueint : 0, up_security ? up_security_local_nonprim : NULL, - h_smf_service_instance_id ? ogs_strdup_or_assert(h_smf_service_instance_id->valuestring) : NULL, - smf_service_instance_id ? ogs_strdup_or_assert(smf_service_instance_id->valuestring) : NULL, - recovery_time ? ogs_strdup_or_assert(recovery_time->valuestring) : NULL, + h_smf_service_instance_id ? ogs_strdup(h_smf_service_instance_id->valuestring) : NULL, + smf_service_instance_id ? ogs_strdup(smf_service_instance_id->valuestring) : NULL, + recovery_time ? ogs_strdup(recovery_time->valuestring) : NULL, forwarding_ind ? true : false, forwarding_ind ? forwarding_ind->valueint : 0, psa_tunnel_info ? psa_tunnel_info_local_nonprim : NULL, - charging_id ? ogs_strdup_or_assert(charging_id->valuestring) : NULL, + charging_id ? ogs_strdup(charging_id->valuestring) : NULL, charging_info ? charging_info_local_nonprim : NULL, roaming_charging_profile ? roaming_charging_profile_local_nonprim : NULL, nef_ext_buf_support_ind ? true : false, diff --git a/lib/sbi/openapi/model/sm_context_create_data.c b/lib/sbi/openapi/model/sm_context_create_data.c index 0fda8b4e4..26480bf9f 100644 --- a/lib/sbi/openapi/model/sm_context_create_data.c +++ b/lib/sbi/openapi/model/sm_context_create_data.c @@ -98,10 +98,9 @@ OpenAPI_sm_context_create_data_t *OpenAPI_sm_context_create_data_create( int ran_unchanged_ind ) { - OpenAPI_sm_context_create_data_t *sm_context_create_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_sm_context_create_data_t)); - if (!sm_context_create_data_local_var) { - return NULL; - } + OpenAPI_sm_context_create_data_t *sm_context_create_data_local_var = ogs_malloc(sizeof(OpenAPI_sm_context_create_data_t)); + ogs_assert(sm_context_create_data_local_var); + sm_context_create_data_local_var->supi = supi; sm_context_create_data_local_var->is_unauthenticated_supi = is_unauthenticated_supi; sm_context_create_data_local_var->unauthenticated_supi = unauthenticated_supi; @@ -1246,7 +1245,7 @@ OpenAPI_sm_context_create_data_t *OpenAPI_sm_context_create_data_parseFromJSON(c ogs_error("OpenAPI_sm_context_create_data_parseFromJSON() failed [additional_hsmf_uri]"); goto end; } - OpenAPI_list_add(additional_hsmf_uriList , ogs_strdup_or_assert(additional_hsmf_uri_local->valuestring)); + OpenAPI_list_add(additional_hsmf_uriList , ogs_strdup(additional_hsmf_uri_local->valuestring)); } } @@ -1266,7 +1265,7 @@ OpenAPI_sm_context_create_data_t *OpenAPI_sm_context_create_data_parseFromJSON(c ogs_error("OpenAPI_sm_context_create_data_parseFromJSON() failed [additional_hsmf_id]"); goto end; } - OpenAPI_list_add(additional_hsmf_idList , ogs_strdup_or_assert(additional_hsmf_id_local->valuestring)); + OpenAPI_list_add(additional_hsmf_idList , ogs_strdup(additional_hsmf_id_local->valuestring)); } } @@ -1286,7 +1285,7 @@ OpenAPI_sm_context_create_data_t *OpenAPI_sm_context_create_data_parseFromJSON(c ogs_error("OpenAPI_sm_context_create_data_parseFromJSON() failed [additional_smf_uri]"); goto end; } - OpenAPI_list_add(additional_smf_uriList , ogs_strdup_or_assert(additional_smf_uri_local->valuestring)); + OpenAPI_list_add(additional_smf_uriList , ogs_strdup(additional_smf_uri_local->valuestring)); } } @@ -1306,7 +1305,7 @@ OpenAPI_sm_context_create_data_t *OpenAPI_sm_context_create_data_parseFromJSON(c ogs_error("OpenAPI_sm_context_create_data_parseFromJSON() failed [additional_smf_id]"); goto end; } - OpenAPI_list_add(additional_smf_idList , ogs_strdup_or_assert(additional_smf_id_local->valuestring)); + OpenAPI_list_add(additional_smf_idList , ogs_strdup(additional_smf_id_local->valuestring)); } } @@ -1744,20 +1743,20 @@ OpenAPI_sm_context_create_data_t *OpenAPI_sm_context_create_data_parseFromJSON(c } sm_context_create_data_local_var = OpenAPI_sm_context_create_data_create ( - supi ? ogs_strdup_or_assert(supi->valuestring) : NULL, + supi ? ogs_strdup(supi->valuestring) : NULL, unauthenticated_supi ? true : false, unauthenticated_supi ? unauthenticated_supi->valueint : 0, - pei ? ogs_strdup_or_assert(pei->valuestring) : NULL, - gpsi ? ogs_strdup_or_assert(gpsi->valuestring) : NULL, + pei ? ogs_strdup(pei->valuestring) : NULL, + gpsi ? ogs_strdup(gpsi->valuestring) : NULL, pdu_session_id ? true : false, pdu_session_id ? pdu_session_id->valuedouble : 0, - dnn ? ogs_strdup_or_assert(dnn->valuestring) : NULL, - selected_dnn ? ogs_strdup_or_assert(selected_dnn->valuestring) : NULL, + dnn ? ogs_strdup(dnn->valuestring) : NULL, + selected_dnn ? ogs_strdup(selected_dnn->valuestring) : NULL, s_nssai ? s_nssai_local_nonprim : NULL, hplmn_snssai ? hplmn_snssai_local_nonprim : NULL, - ogs_strdup_or_assert(serving_nf_id->valuestring), + ogs_strdup(serving_nf_id->valuestring), guami ? guami_local_nonprim : NULL, - service_name ? ogs_strdup_or_assert(service_name->valuestring) : NULL, + service_name ? ogs_strdup(service_name->valuestring) : NULL, serving_network_local_nonprim, request_type ? request_typeVariable : 0, n1_sm_msg ? n1_sm_msg_local_nonprim : NULL, @@ -1766,13 +1765,13 @@ OpenAPI_sm_context_create_data_t *OpenAPI_sm_context_create_data_parseFromJSON(c rat_type ? rat_typeVariable : 0, presence_in_ladn ? presence_in_ladnVariable : 0, ue_location ? ue_location_local_nonprim : NULL, - ue_time_zone ? ogs_strdup_or_assert(ue_time_zone->valuestring) : NULL, + ue_time_zone ? ogs_strdup(ue_time_zone->valuestring) : NULL, add_ue_location ? add_ue_location_local_nonprim : NULL, - ogs_strdup_or_assert(sm_context_status_uri->valuestring), - h_smf_uri ? ogs_strdup_or_assert(h_smf_uri->valuestring) : NULL, - h_smf_id ? ogs_strdup_or_assert(h_smf_id->valuestring) : NULL, - smf_uri ? ogs_strdup_or_assert(smf_uri->valuestring) : NULL, - smf_id ? ogs_strdup_or_assert(smf_id->valuestring) : NULL, + ogs_strdup(sm_context_status_uri->valuestring), + h_smf_uri ? ogs_strdup(h_smf_uri->valuestring) : NULL, + h_smf_id ? ogs_strdup(h_smf_id->valuestring) : NULL, + smf_uri ? ogs_strdup(smf_uri->valuestring) : NULL, + smf_id ? ogs_strdup(smf_id->valuestring) : NULL, additional_hsmf_uri ? additional_hsmf_uriList : NULL, additional_hsmf_id ? additional_hsmf_idList : NULL, additional_smf_uri ? additional_smf_uriList : NULL, @@ -1780,25 +1779,25 @@ OpenAPI_sm_context_create_data_t *OpenAPI_sm_context_create_data_parseFromJSON(c old_pdu_session_id ? true : false, old_pdu_session_id ? old_pdu_session_id->valuedouble : 0, pdu_sessions_activate_list ? pdu_sessions_activate_listList : NULL, - ue_eps_pdn_connection ? ogs_strdup_or_assert(ue_eps_pdn_connection->valuestring) : NULL, + ue_eps_pdn_connection ? ogs_strdup(ue_eps_pdn_connection->valuestring) : NULL, ho_state ? ho_stateVariable : 0, - pcf_id ? ogs_strdup_or_assert(pcf_id->valuestring) : NULL, - pcf_group_id ? ogs_strdup_or_assert(pcf_group_id->valuestring) : NULL, - pcf_set_id ? ogs_strdup_or_assert(pcf_set_id->valuestring) : NULL, - nrf_uri ? ogs_strdup_or_assert(nrf_uri->valuestring) : NULL, - supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, + pcf_id ? ogs_strdup(pcf_id->valuestring) : NULL, + pcf_group_id ? ogs_strdup(pcf_group_id->valuestring) : NULL, + pcf_set_id ? ogs_strdup(pcf_set_id->valuestring) : NULL, + nrf_uri ? ogs_strdup(nrf_uri->valuestring) : NULL, + supported_features ? ogs_strdup(supported_features->valuestring) : NULL, sel_mode ? sel_modeVariable : 0, backup_amf_info ? backup_amf_infoList : NULL, trace_data ? trace_data_local_nonprim : NULL, - udm_group_id ? ogs_strdup_or_assert(udm_group_id->valuestring) : NULL, - routing_indicator ? ogs_strdup_or_assert(routing_indicator->valuestring) : NULL, + udm_group_id ? ogs_strdup(udm_group_id->valuestring) : NULL, + routing_indicator ? ogs_strdup(routing_indicator->valuestring) : NULL, eps_interworking_ind ? eps_interworking_indVariable : 0, indirect_forwarding_flag ? true : false, indirect_forwarding_flag ? indirect_forwarding_flag->valueint : 0, direct_forwarding_flag ? true : false, direct_forwarding_flag ? direct_forwarding_flag->valueint : 0, target_id ? target_id_local_nonprim : NULL, - eps_bearer_ctx_status ? ogs_strdup_or_assert(eps_bearer_ctx_status->valuestring) : NULL, + eps_bearer_ctx_status ? ogs_strdup(eps_bearer_ctx_status->valuestring) : NULL, cp_ciot_enabled ? true : false, cp_ciot_enabled ? cp_ciot_enabled->valueint : 0, cp_only_ind ? true : false, @@ -1813,10 +1812,10 @@ OpenAPI_sm_context_create_data_t *OpenAPI_sm_context_create_data_parseFromJSON(c n2_sm_info_type ? n2_sm_info_typeVariable : 0, n2_sm_info_ext1 ? n2_sm_info_ext1_local_nonprim : NULL, n2_sm_info_type_ext1 ? n2_sm_info_type_ext1Variable : 0, - sm_context_ref ? ogs_strdup_or_assert(sm_context_ref->valuestring) : NULL, - sm_context_smf_id ? ogs_strdup_or_assert(sm_context_smf_id->valuestring) : NULL, - sm_context_smf_set_id ? ogs_strdup_or_assert(sm_context_smf_set_id->valuestring) : NULL, - sm_context_smf_service_set_id ? ogs_strdup_or_assert(sm_context_smf_service_set_id->valuestring) : NULL, + sm_context_ref ? ogs_strdup(sm_context_ref->valuestring) : NULL, + sm_context_smf_id ? ogs_strdup(sm_context_smf_id->valuestring) : NULL, + sm_context_smf_set_id ? ogs_strdup(sm_context_smf_set_id->valuestring) : NULL, + sm_context_smf_service_set_id ? ogs_strdup(sm_context_smf_service_set_id->valuestring) : NULL, sm_context_smf_binding ? sm_context_smf_bindingVariable : 0, up_cnx_state ? up_cnx_stateVariable : 0, small_data_rate_status ? small_data_rate_status_local_nonprim : NULL, @@ -1828,8 +1827,8 @@ OpenAPI_sm_context_create_data_t *OpenAPI_sm_context_create_data_parseFromJSON(c ddn_failure_subs ? ddn_failure_subs_local_nonprim : NULL, smf_transfer_ind ? true : false, smf_transfer_ind ? smf_transfer_ind->valueint : 0, - old_smf_id ? ogs_strdup_or_assert(old_smf_id->valuestring) : NULL, - old_sm_context_ref ? ogs_strdup_or_assert(old_sm_context_ref->valuestring) : NULL, + old_smf_id ? ogs_strdup(old_smf_id->valuestring) : NULL, + old_sm_context_ref ? ogs_strdup(old_sm_context_ref->valuestring) : NULL, w_agf_info ? w_agf_info_local_nonprim : NULL, tngf_info ? tngf_info_local_nonprim : NULL, twif_info ? twif_info_local_nonprim : NULL, diff --git a/lib/sbi/openapi/model/sm_context_create_error.c b/lib/sbi/openapi/model/sm_context_create_error.c index 8733ecd8a..a12335c2f 100644 --- a/lib/sbi/openapi/model/sm_context_create_error.c +++ b/lib/sbi/openapi/model/sm_context_create_error.c @@ -12,10 +12,9 @@ OpenAPI_sm_context_create_error_t *OpenAPI_sm_context_create_error_create( char *recovery_time ) { - OpenAPI_sm_context_create_error_t *sm_context_create_error_local_var = OpenAPI_malloc(sizeof(OpenAPI_sm_context_create_error_t)); - if (!sm_context_create_error_local_var) { - return NULL; - } + OpenAPI_sm_context_create_error_t *sm_context_create_error_local_var = ogs_malloc(sizeof(OpenAPI_sm_context_create_error_t)); + ogs_assert(sm_context_create_error_local_var); + sm_context_create_error_local_var->error = error; sm_context_create_error_local_var->n1_sm_msg = n1_sm_msg; sm_context_create_error_local_var->n2_sm_info = n2_sm_info; @@ -154,7 +153,7 @@ OpenAPI_sm_context_create_error_t *OpenAPI_sm_context_create_error_parseFromJSON n1_sm_msg ? n1_sm_msg_local_nonprim : NULL, n2_sm_info ? n2_sm_info_local_nonprim : NULL, n2_sm_info_type ? n2_sm_info_typeVariable : 0, - recovery_time ? ogs_strdup_or_assert(recovery_time->valuestring) : NULL + recovery_time ? ogs_strdup(recovery_time->valuestring) : NULL ); return sm_context_create_error_local_var; diff --git a/lib/sbi/openapi/model/sm_context_created_data.c b/lib/sbi/openapi/model/sm_context_created_data.c index 157ab77d7..afd5703fc 100644 --- a/lib/sbi/openapi/model/sm_context_created_data.c +++ b/lib/sbi/openapi/model/sm_context_created_data.c @@ -23,10 +23,9 @@ OpenAPI_sm_context_created_data_t *OpenAPI_sm_context_created_data_create( char *selected_old_smf_id ) { - OpenAPI_sm_context_created_data_t *sm_context_created_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_sm_context_created_data_t)); - if (!sm_context_created_data_local_var) { - return NULL; - } + OpenAPI_sm_context_created_data_t *sm_context_created_data_local_var = ogs_malloc(sizeof(OpenAPI_sm_context_created_data_t)); + ogs_assert(sm_context_created_data_local_var); + sm_context_created_data_local_var->h_smf_uri = h_smf_uri; sm_context_created_data_local_var->smf_uri = smf_uri; sm_context_created_data_local_var->is_pdu_session_id = is_pdu_session_id; @@ -369,8 +368,8 @@ OpenAPI_sm_context_created_data_t *OpenAPI_sm_context_created_data_parseFromJSON } sm_context_created_data_local_var = OpenAPI_sm_context_created_data_create ( - h_smf_uri ? ogs_strdup_or_assert(h_smf_uri->valuestring) : NULL, - smf_uri ? ogs_strdup_or_assert(smf_uri->valuestring) : NULL, + h_smf_uri ? ogs_strdup(h_smf_uri->valuestring) : NULL, + smf_uri ? ogs_strdup(smf_uri->valuestring) : NULL, pdu_session_id ? true : false, pdu_session_id ? pdu_session_id->valuedouble : 0, s_nssai ? s_nssai_local_nonprim : NULL, @@ -379,12 +378,12 @@ OpenAPI_sm_context_created_data_t *OpenAPI_sm_context_created_data_parseFromJSON n2_sm_info_type ? n2_sm_info_typeVariable : 0, allocated_ebi_list ? allocated_ebi_listList : NULL, ho_state ? ho_stateVariable : 0, - gpsi ? ogs_strdup_or_assert(gpsi->valuestring) : NULL, - smf_service_instance_id ? ogs_strdup_or_assert(smf_service_instance_id->valuestring) : NULL, - recovery_time ? ogs_strdup_or_assert(recovery_time->valuestring) : NULL, - supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, - selected_smf_id ? ogs_strdup_or_assert(selected_smf_id->valuestring) : NULL, - selected_old_smf_id ? ogs_strdup_or_assert(selected_old_smf_id->valuestring) : NULL + gpsi ? ogs_strdup(gpsi->valuestring) : NULL, + smf_service_instance_id ? ogs_strdup(smf_service_instance_id->valuestring) : NULL, + recovery_time ? ogs_strdup(recovery_time->valuestring) : NULL, + supported_features ? ogs_strdup(supported_features->valuestring) : NULL, + selected_smf_id ? ogs_strdup(selected_smf_id->valuestring) : NULL, + selected_old_smf_id ? ogs_strdup(selected_old_smf_id->valuestring) : NULL ); return sm_context_created_data_local_var; diff --git a/lib/sbi/openapi/model/sm_context_release_data.c b/lib/sbi/openapi/model/sm_context_release_data.c index 3a7ac6c3e..f23ea5e69 100644 --- a/lib/sbi/openapi/model/sm_context_release_data.c +++ b/lib/sbi/openapi/model/sm_context_release_data.c @@ -20,10 +20,9 @@ OpenAPI_sm_context_release_data_t *OpenAPI_sm_context_release_data_create( int ismf_release_only ) { - OpenAPI_sm_context_release_data_t *sm_context_release_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_sm_context_release_data_t)); - if (!sm_context_release_data_local_var) { - return NULL; - } + OpenAPI_sm_context_release_data_t *sm_context_release_data_local_var = ogs_malloc(sizeof(OpenAPI_sm_context_release_data_t)); + ogs_assert(sm_context_release_data_local_var); + sm_context_release_data_local_var->cause = cause; sm_context_release_data_local_var->ng_ap_cause = ng_ap_cause; sm_context_release_data_local_var->is__5g_mm_cause_value = is__5g_mm_cause_value; @@ -258,7 +257,7 @@ OpenAPI_sm_context_release_data_t *OpenAPI_sm_context_release_data_parseFromJSON _5g_mm_cause_value ? true : false, _5g_mm_cause_value ? _5g_mm_cause_value->valuedouble : 0, ue_location ? ue_location_local_nonprim : NULL, - ue_time_zone ? ogs_strdup_or_assert(ue_time_zone->valuestring) : NULL, + ue_time_zone ? ogs_strdup(ue_time_zone->valuestring) : NULL, add_ue_location ? add_ue_location_local_nonprim : NULL, vsmf_release_only ? true : false, vsmf_release_only ? vsmf_release_only->valueint : 0, diff --git a/lib/sbi/openapi/model/sm_context_released_data.c b/lib/sbi/openapi/model/sm_context_released_data.c index 889cdb360..366b30c02 100644 --- a/lib/sbi/openapi/model/sm_context_released_data.c +++ b/lib/sbi/openapi/model/sm_context_released_data.c @@ -9,10 +9,9 @@ OpenAPI_sm_context_released_data_t *OpenAPI_sm_context_released_data_create( OpenAPI_apn_rate_status_t *apn_rate_status ) { - OpenAPI_sm_context_released_data_t *sm_context_released_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_sm_context_released_data_t)); - if (!sm_context_released_data_local_var) { - return NULL; - } + OpenAPI_sm_context_released_data_t *sm_context_released_data_local_var = ogs_malloc(sizeof(OpenAPI_sm_context_released_data_t)); + ogs_assert(sm_context_released_data_local_var); + sm_context_released_data_local_var->small_data_rate_status = small_data_rate_status; sm_context_released_data_local_var->apn_rate_status = apn_rate_status; diff --git a/lib/sbi/openapi/model/sm_context_retrieve_data.c b/lib/sbi/openapi/model/sm_context_retrieve_data.c index 8fa2c6135..2455d9869 100644 --- a/lib/sbi/openapi/model/sm_context_retrieve_data.c +++ b/lib/sbi/openapi/model/sm_context_retrieve_data.c @@ -13,10 +13,9 @@ OpenAPI_sm_context_retrieve_data_t *OpenAPI_sm_context_retrieve_data_create( int ran_unchanged_ind ) { - OpenAPI_sm_context_retrieve_data_t *sm_context_retrieve_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_sm_context_retrieve_data_t)); - if (!sm_context_retrieve_data_local_var) { - return NULL; - } + OpenAPI_sm_context_retrieve_data_t *sm_context_retrieve_data_local_var = ogs_malloc(sizeof(OpenAPI_sm_context_retrieve_data_t)); + ogs_assert(sm_context_retrieve_data_local_var); + sm_context_retrieve_data_local_var->target_mme_cap = target_mme_cap; sm_context_retrieve_data_local_var->sm_context_type = sm_context_type; sm_context_retrieve_data_local_var->serving_network = serving_network; diff --git a/lib/sbi/openapi/model/sm_context_retrieved_data.c b/lib/sbi/openapi/model/sm_context_retrieved_data.c index 827d066ab..0d6946a37 100644 --- a/lib/sbi/openapi/model/sm_context_retrieved_data.c +++ b/lib/sbi/openapi/model/sm_context_retrieved_data.c @@ -13,10 +13,9 @@ OpenAPI_sm_context_retrieved_data_t *OpenAPI_sm_context_retrieved_data_create( int dl_data_waiting_ind ) { - OpenAPI_sm_context_retrieved_data_t *sm_context_retrieved_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_sm_context_retrieved_data_t)); - if (!sm_context_retrieved_data_local_var) { - return NULL; - } + OpenAPI_sm_context_retrieved_data_t *sm_context_retrieved_data_local_var = ogs_malloc(sizeof(OpenAPI_sm_context_retrieved_data_t)); + ogs_assert(sm_context_retrieved_data_local_var); + sm_context_retrieved_data_local_var->ue_eps_pdn_connection = ue_eps_pdn_connection; sm_context_retrieved_data_local_var->sm_context = sm_context; sm_context_retrieved_data_local_var->small_data_rate_status = small_data_rate_status; @@ -150,7 +149,7 @@ OpenAPI_sm_context_retrieved_data_t *OpenAPI_sm_context_retrieved_data_parseFrom } sm_context_retrieved_data_local_var = OpenAPI_sm_context_retrieved_data_create ( - ogs_strdup_or_assert(ue_eps_pdn_connection->valuestring), + ogs_strdup(ue_eps_pdn_connection->valuestring), sm_context ? sm_context_local_nonprim : NULL, small_data_rate_status ? small_data_rate_status_local_nonprim : NULL, apn_rate_status ? apn_rate_status_local_nonprim : NULL, diff --git a/lib/sbi/openapi/model/sm_context_status_notification.c b/lib/sbi/openapi/model/sm_context_status_notification.c index beb017798..e396689d8 100644 --- a/lib/sbi/openapi/model/sm_context_status_notification.c +++ b/lib/sbi/openapi/model/sm_context_status_notification.c @@ -19,10 +19,9 @@ OpenAPI_sm_context_status_notification_t *OpenAPI_sm_context_status_notification char *alt_anchor_smf_id ) { - OpenAPI_sm_context_status_notification_t *sm_context_status_notification_local_var = OpenAPI_malloc(sizeof(OpenAPI_sm_context_status_notification_t)); - if (!sm_context_status_notification_local_var) { - return NULL; - } + OpenAPI_sm_context_status_notification_t *sm_context_status_notification_local_var = ogs_malloc(sizeof(OpenAPI_sm_context_status_notification_t)); + ogs_assert(sm_context_status_notification_local_var); + sm_context_status_notification_local_var->status_info = status_info; sm_context_status_notification_local_var->small_data_rate_status = small_data_rate_status; sm_context_status_notification_local_var->apn_rate_status = apn_rate_status; @@ -228,7 +227,7 @@ OpenAPI_sm_context_status_notification_t *OpenAPI_sm_context_status_notification ogs_error("OpenAPI_sm_context_status_notification_parseFromJSON() failed [notify_correlation_ids_forddn_failure]"); goto end; } - OpenAPI_list_add(notify_correlation_ids_forddn_failureList , ogs_strdup_or_assert(notify_correlation_ids_forddn_failure_local->valuestring)); + OpenAPI_list_add(notify_correlation_ids_forddn_failureList , ogs_strdup(notify_correlation_ids_forddn_failure_local->valuestring)); } } @@ -293,12 +292,12 @@ OpenAPI_sm_context_status_notification_t *OpenAPI_sm_context_status_notification ddn_failure_status ? true : false, ddn_failure_status ? ddn_failure_status->valueint : 0, notify_correlation_ids_forddn_failure ? notify_correlation_ids_forddn_failureList : NULL, - new_smf_id ? ogs_strdup_or_assert(new_smf_id->valuestring) : NULL, - new_smf_set_id ? ogs_strdup_or_assert(new_smf_set_id->valuestring) : NULL, - old_smf_id ? ogs_strdup_or_assert(old_smf_id->valuestring) : NULL, - old_sm_context_ref ? ogs_strdup_or_assert(old_sm_context_ref->valuestring) : NULL, - alt_anchor_smf_uri ? ogs_strdup_or_assert(alt_anchor_smf_uri->valuestring) : NULL, - alt_anchor_smf_id ? ogs_strdup_or_assert(alt_anchor_smf_id->valuestring) : NULL + new_smf_id ? ogs_strdup(new_smf_id->valuestring) : NULL, + new_smf_set_id ? ogs_strdup(new_smf_set_id->valuestring) : NULL, + old_smf_id ? ogs_strdup(old_smf_id->valuestring) : NULL, + old_sm_context_ref ? ogs_strdup(old_sm_context_ref->valuestring) : NULL, + alt_anchor_smf_uri ? ogs_strdup(alt_anchor_smf_uri->valuestring) : NULL, + alt_anchor_smf_id ? ogs_strdup(alt_anchor_smf_id->valuestring) : NULL ); return sm_context_status_notification_local_var; diff --git a/lib/sbi/openapi/model/sm_context_update_data.c b/lib/sbi/openapi/model/sm_context_update_data.c index f911db610..d0cb1768e 100644 --- a/lib/sbi/openapi/model/sm_context_update_data.c +++ b/lib/sbi/openapi/model/sm_context_update_data.c @@ -65,10 +65,9 @@ OpenAPI_sm_context_update_data_t *OpenAPI_sm_context_update_data_create( OpenAPI_ddn_failure_subs_t *ddn_failure_subs ) { - OpenAPI_sm_context_update_data_t *sm_context_update_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_sm_context_update_data_t)); - if (!sm_context_update_data_local_var) { - return NULL; - } + OpenAPI_sm_context_update_data_t *sm_context_update_data_local_var = ogs_malloc(sizeof(OpenAPI_sm_context_update_data_t)); + ogs_assert(sm_context_update_data_local_var); + sm_context_update_data_local_var->pei = pei; sm_context_update_data_local_var->serving_nf_id = serving_nf_id; sm_context_update_data_local_var->guami = guami; @@ -1002,7 +1001,7 @@ OpenAPI_sm_context_update_data_t *OpenAPI_sm_context_update_data_parseFromJSON(c ogs_error("OpenAPI_sm_context_update_data_parseFromJSON() failed [eps_bearer_setup]"); goto end; } - OpenAPI_list_add(eps_bearer_setupList , ogs_strdup_or_assert(eps_bearer_setup_local->valuestring)); + OpenAPI_list_add(eps_bearer_setupList , ogs_strdup(eps_bearer_setup_local->valuestring)); } } @@ -1200,7 +1199,7 @@ OpenAPI_sm_context_update_data_t *OpenAPI_sm_context_update_data_parseFromJSON(c ogs_error("OpenAPI_sm_context_update_data_parseFromJSON() failed [forwarding_bearer_contexts]"); goto end; } - OpenAPI_list_add(forwarding_bearer_contextsList , ogs_strdup_or_assert(forwarding_bearer_contexts_local->valuestring)); + OpenAPI_list_add(forwarding_bearer_contextsList , ogs_strdup(forwarding_bearer_contexts_local->valuestring)); } } @@ -1212,8 +1211,8 @@ OpenAPI_sm_context_update_data_t *OpenAPI_sm_context_update_data_parseFromJSON(c } sm_context_update_data_local_var = OpenAPI_sm_context_update_data_create ( - pei ? ogs_strdup_or_assert(pei->valuestring) : NULL, - serving_nf_id ? ogs_strdup_or_assert(serving_nf_id->valuestring) : NULL, + pei ? ogs_strdup(pei->valuestring) : NULL, + serving_nf_id ? ogs_strdup(serving_nf_id->valuestring) : NULL, guami ? guami_local_nonprim : NULL, serving_network ? serving_network_local_nonprim : NULL, backup_amf_info ? backup_amf_infoList : NULL, @@ -1223,7 +1222,7 @@ OpenAPI_sm_context_update_data_t *OpenAPI_sm_context_update_data_parseFromJSON(c rat_type ? rat_typeVariable : 0, presence_in_ladn ? presence_in_ladnVariable : 0, ue_location ? ue_location_local_nonprim : NULL, - ue_time_zone ? ogs_strdup_or_assert(ue_time_zone->valuestring) : NULL, + ue_time_zone ? ogs_strdup(ue_time_zone->valuestring) : NULL, add_ue_location ? add_ue_location_local_nonprim : NULL, up_cnx_state ? up_cnx_stateVariable : 0, ho_state ? ho_stateVariable : 0, @@ -1235,8 +1234,8 @@ OpenAPI_sm_context_update_data_t *OpenAPI_sm_context_update_data_parseFromJSON(c n2_sm_info ? n2_sm_info_local_nonprim : NULL, n2_sm_info_type ? n2_sm_info_typeVariable : 0, target_id ? target_id_local_nonprim : NULL, - target_serving_nf_id ? ogs_strdup_or_assert(target_serving_nf_id->valuestring) : NULL, - sm_context_status_uri ? ogs_strdup_or_assert(sm_context_status_uri->valuestring) : NULL, + target_serving_nf_id ? ogs_strdup(target_serving_nf_id->valuestring) : NULL, + sm_context_status_uri ? ogs_strdup(sm_context_status_uri->valuestring) : NULL, data_forwarding ? true : false, data_forwarding ? data_forwarding->valueint : 0, n9_forwarding_tunnel ? n9_forwarding_tunnel_local_nonprim : NULL, @@ -1263,7 +1262,7 @@ OpenAPI_sm_context_update_data_t *OpenAPI_sm_context_update_data_parseFromJSON(c ma_request_ind ? true : false, ma_request_ind ? ma_request_ind->valueint : 0, exemption_ind ? exemption_ind_local_nonprim : NULL, - supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, + supported_features ? ogs_strdup(supported_features->valuestring) : NULL, mo_exp_data_counter ? mo_exp_data_counter_local_nonprim : NULL, extended_nas_sm_timer_ind ? true : false, extended_nas_sm_timer_ind ? extended_nas_sm_timer_ind->valueint : 0, diff --git a/lib/sbi/openapi/model/sm_context_update_error.c b/lib/sbi/openapi/model/sm_context_update_error.c index 38b6edab6..b7a86937f 100644 --- a/lib/sbi/openapi/model/sm_context_update_error.c +++ b/lib/sbi/openapi/model/sm_context_update_error.c @@ -13,10 +13,9 @@ OpenAPI_sm_context_update_error_t *OpenAPI_sm_context_update_error_create( char *recovery_time ) { - OpenAPI_sm_context_update_error_t *sm_context_update_error_local_var = OpenAPI_malloc(sizeof(OpenAPI_sm_context_update_error_t)); - if (!sm_context_update_error_local_var) { - return NULL; - } + OpenAPI_sm_context_update_error_t *sm_context_update_error_local_var = ogs_malloc(sizeof(OpenAPI_sm_context_update_error_t)); + ogs_assert(sm_context_update_error_local_var); + sm_context_update_error_local_var->error = error; sm_context_update_error_local_var->n1_sm_msg = n1_sm_msg; sm_context_update_error_local_var->n2_sm_info = n2_sm_info; @@ -175,7 +174,7 @@ OpenAPI_sm_context_update_error_t *OpenAPI_sm_context_update_error_parseFromJSON n2_sm_info ? n2_sm_info_local_nonprim : NULL, n2_sm_info_type ? n2_sm_info_typeVariable : 0, up_cnx_state ? up_cnx_stateVariable : 0, - recovery_time ? ogs_strdup_or_assert(recovery_time->valuestring) : NULL + recovery_time ? ogs_strdup(recovery_time->valuestring) : NULL ); return sm_context_update_error_local_var; diff --git a/lib/sbi/openapi/model/sm_context_updated_data.c b/lib/sbi/openapi/model/sm_context_updated_data.c index d4dbead1f..8ac94886c 100644 --- a/lib/sbi/openapi/model/sm_context_updated_data.c +++ b/lib/sbi/openapi/model/sm_context_updated_data.c @@ -28,10 +28,9 @@ OpenAPI_sm_context_updated_data_t *OpenAPI_sm_context_updated_data_create( char *selected_old_smf_id ) { - OpenAPI_sm_context_updated_data_t *sm_context_updated_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_sm_context_updated_data_t)); - if (!sm_context_updated_data_local_var) { - return NULL; - } + OpenAPI_sm_context_updated_data_t *sm_context_updated_data_local_var = ogs_malloc(sizeof(OpenAPI_sm_context_updated_data_t)); + ogs_assert(sm_context_updated_data_local_var); + sm_context_updated_data_local_var->up_cnx_state = up_cnx_state; sm_context_updated_data_local_var->ho_state = ho_state; sm_context_updated_data_local_var->release_ebi_list = release_ebi_list; @@ -469,7 +468,7 @@ OpenAPI_sm_context_updated_data_t *OpenAPI_sm_context_updated_data_parseFromJSON ogs_error("OpenAPI_sm_context_updated_data_parseFromJSON() failed [eps_bearer_setup]"); goto end; } - OpenAPI_list_add(eps_bearer_setupList , ogs_strdup_or_assert(eps_bearer_setup_local->valuestring)); + OpenAPI_list_add(eps_bearer_setupList , ogs_strdup(eps_bearer_setup_local->valuestring)); } } @@ -582,7 +581,7 @@ OpenAPI_sm_context_updated_data_t *OpenAPI_sm_context_updated_data_parseFromJSON ogs_error("OpenAPI_sm_context_updated_data_parseFromJSON() failed [forwarding_bearer_contexts]"); goto end; } - OpenAPI_list_add(forwarding_bearer_contextsList , ogs_strdup_or_assert(forwarding_bearer_contexts_local->valuestring)); + OpenAPI_list_add(forwarding_bearer_contextsList , ogs_strdup(forwarding_bearer_contexts_local->valuestring)); } } @@ -621,11 +620,11 @@ OpenAPI_sm_context_updated_data_t *OpenAPI_sm_context_updated_data_parseFromJSON cause ? causeVariable : 0, ma_accepted_ind ? true : false, ma_accepted_ind ? ma_accepted_ind->valueint : 0, - supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, + supported_features ? ogs_strdup(supported_features->valuestring) : NULL, forwarding_f_teid ? forwarding_f_teid->valueint : 0, forwarding_bearer_contexts ? forwarding_bearer_contextsList : NULL, - selected_smf_id ? ogs_strdup_or_assert(selected_smf_id->valuestring) : NULL, - selected_old_smf_id ? ogs_strdup_or_assert(selected_old_smf_id->valuestring) : NULL + selected_smf_id ? ogs_strdup(selected_smf_id->valuestring) : NULL, + selected_old_smf_id ? ogs_strdup(selected_old_smf_id->valuestring) : NULL ); return sm_context_updated_data_local_var; diff --git a/lib/sbi/openapi/model/sm_policy_context_data.c b/lib/sbi/openapi/model/sm_policy_context_data.c index c0d0ba769..f293f45c4 100644 --- a/lib/sbi/openapi/model/sm_policy_context_data.c +++ b/lib/sbi/openapi/model/sm_policy_context_data.c @@ -55,10 +55,9 @@ OpenAPI_sm_policy_context_data_t *OpenAPI_sm_policy_context_data_create( OpenAPI_list_t *ipv6_frame_route_list ) { - OpenAPI_sm_policy_context_data_t *sm_policy_context_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_sm_policy_context_data_t)); - if (!sm_policy_context_data_local_var) { - return NULL; - } + OpenAPI_sm_policy_context_data_t *sm_policy_context_data_local_var = ogs_malloc(sizeof(OpenAPI_sm_policy_context_data_t)); + ogs_assert(sm_policy_context_data_local_var); + sm_policy_context_data_local_var->acc_net_ch_id = acc_net_ch_id; sm_policy_context_data_local_var->charg_entity_addr = charg_entity_addr; sm_policy_context_data_local_var->gpsi = gpsi; @@ -615,7 +614,7 @@ OpenAPI_sm_policy_context_data_t *OpenAPI_sm_policy_context_data_parseFromJSON(c ogs_error("OpenAPI_sm_policy_context_data_parseFromJSON() failed [inter_grp_ids]"); goto end; } - OpenAPI_list_add(inter_grp_idsList , ogs_strdup_or_assert(inter_grp_ids_local->valuestring)); + OpenAPI_list_add(inter_grp_idsList , ogs_strdup(inter_grp_ids_local->valuestring)); } } @@ -943,7 +942,7 @@ OpenAPI_sm_policy_context_data_t *OpenAPI_sm_policy_context_data_parseFromJSON(c ogs_error("OpenAPI_sm_policy_context_data_parseFromJSON() failed [ipv4_frame_route_list]"); goto end; } - OpenAPI_list_add(ipv4_frame_route_listList , ogs_strdup_or_assert(ipv4_frame_route_list_local->valuestring)); + OpenAPI_list_add(ipv4_frame_route_listList , ogs_strdup(ipv4_frame_route_list_local->valuestring)); } } @@ -963,37 +962,37 @@ OpenAPI_sm_policy_context_data_t *OpenAPI_sm_policy_context_data_parseFromJSON(c ogs_error("OpenAPI_sm_policy_context_data_parseFromJSON() failed [ipv6_frame_route_list]"); goto end; } - OpenAPI_list_add(ipv6_frame_route_listList , ogs_strdup_or_assert(ipv6_frame_route_list_local->valuestring)); + OpenAPI_list_add(ipv6_frame_route_listList , ogs_strdup(ipv6_frame_route_list_local->valuestring)); } } sm_policy_context_data_local_var = OpenAPI_sm_policy_context_data_create ( acc_net_ch_id ? acc_net_ch_id_local_nonprim : NULL, charg_entity_addr ? charg_entity_addr_local_nonprim : NULL, - gpsi ? ogs_strdup_or_assert(gpsi->valuestring) : NULL, - ogs_strdup_or_assert(supi->valuestring), + gpsi ? ogs_strdup(gpsi->valuestring) : NULL, + ogs_strdup(supi->valuestring), invalid_supi ? true : false, invalid_supi ? invalid_supi->valueint : 0, inter_grp_ids ? inter_grp_idsList : NULL, pdu_session_id->valuedouble, pdu_session_typeVariable, - chargingcharacteristics ? ogs_strdup_or_assert(chargingcharacteristics->valuestring) : NULL, - ogs_strdup_or_assert(dnn->valuestring), + chargingcharacteristics ? ogs_strdup(chargingcharacteristics->valuestring) : NULL, + ogs_strdup(dnn->valuestring), dnn_sel_mode ? dnn_sel_modeVariable : 0, - ogs_strdup_or_assert(notification_uri->valuestring), + ogs_strdup(notification_uri->valuestring), access_type ? access_typeVariable : 0, rat_type ? rat_typeVariable : 0, add_access_info ? add_access_info_local_nonprim : NULL, serving_network ? serving_network_local_nonprim : NULL, user_location_info ? user_location_info_local_nonprim : NULL, - ue_time_zone ? ogs_strdup_or_assert(ue_time_zone->valuestring) : NULL, - pei ? ogs_strdup_or_assert(pei->valuestring) : NULL, - ipv4_address ? ogs_strdup_or_assert(ipv4_address->valuestring) : NULL, - ipv6_address_prefix ? ogs_strdup_or_assert(ipv6_address_prefix->valuestring) : NULL, - ip_domain ? ogs_strdup_or_assert(ip_domain->valuestring) : NULL, + ue_time_zone ? ogs_strdup(ue_time_zone->valuestring) : NULL, + pei ? ogs_strdup(pei->valuestring) : NULL, + ipv4_address ? ogs_strdup(ipv4_address->valuestring) : NULL, + ipv6_address_prefix ? ogs_strdup(ipv6_address_prefix->valuestring) : NULL, + ip_domain ? ogs_strdup(ip_domain->valuestring) : NULL, subs_sess_ambr ? subs_sess_ambr_local_nonprim : NULL, - auth_prof_index ? ogs_strdup_or_assert(auth_prof_index->valuestring) : NULL, + auth_prof_index ? ogs_strdup(auth_prof_index->valuestring) : NULL, subs_def_qos ? subs_def_qos_local_nonprim : NULL, vplmn_qos ? vplmn_qos_local_nonprim : NULL, num_of_pack_filter ? true : false, @@ -1010,9 +1009,9 @@ OpenAPI_sm_policy_context_data_t *OpenAPI_sm_policy_context_data_parseFromJSON(c slice_info_local_nonprim, qos_flow_usage ? qos_flow_usageVariable : 0, serv_nf_id ? serv_nf_id_local_nonprim : NULL, - supp_feat ? ogs_strdup_or_assert(supp_feat->valuestring) : NULL, - smf_id ? ogs_strdup_or_assert(smf_id->valuestring) : NULL, - recovery_time ? ogs_strdup_or_assert(recovery_time->valuestring) : NULL, + supp_feat ? ogs_strdup(supp_feat->valuestring) : NULL, + smf_id ? ogs_strdup(smf_id->valuestring) : NULL, + recovery_time ? ogs_strdup(recovery_time->valuestring) : NULL, ma_pdu_ind ? ma_pdu_indVariable : 0, atsss_capab ? atsss_capab_local_nonprim : NULL, ipv4_frame_route_list ? ipv4_frame_route_listList : NULL, diff --git a/lib/sbi/openapi/model/sm_policy_control.c b/lib/sbi/openapi/model/sm_policy_control.c index 7cec6e471..8c7a3fc21 100644 --- a/lib/sbi/openapi/model/sm_policy_control.c +++ b/lib/sbi/openapi/model/sm_policy_control.c @@ -9,10 +9,9 @@ OpenAPI_sm_policy_control_t *OpenAPI_sm_policy_control_create( OpenAPI_sm_policy_decision_t *policy ) { - OpenAPI_sm_policy_control_t *sm_policy_control_local_var = OpenAPI_malloc(sizeof(OpenAPI_sm_policy_control_t)); - if (!sm_policy_control_local_var) { - return NULL; - } + OpenAPI_sm_policy_control_t *sm_policy_control_local_var = ogs_malloc(sizeof(OpenAPI_sm_policy_control_t)); + ogs_assert(sm_policy_control_local_var); + sm_policy_control_local_var->context = context; sm_policy_control_local_var->policy = policy; diff --git a/lib/sbi/openapi/model/sm_policy_data.c b/lib/sbi/openapi/model/sm_policy_data.c index b4623db99..c2d15d829 100644 --- a/lib/sbi/openapi/model/sm_policy_data.c +++ b/lib/sbi/openapi/model/sm_policy_data.c @@ -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; diff --git a/lib/sbi/openapi/model/sm_policy_data_patch.c b/lib/sbi/openapi/model/sm_policy_data_patch.c index f04a27e6b..3eded94ed 100644 --- a/lib/sbi/openapi/model/sm_policy_data_patch.c +++ b/lib/sbi/openapi/model/sm_policy_data_patch.c @@ -9,10 +9,9 @@ OpenAPI_sm_policy_data_patch_t *OpenAPI_sm_policy_data_patch_create( OpenAPI_list_t* sm_policy_snssai_data ) { - OpenAPI_sm_policy_data_patch_t *sm_policy_data_patch_local_var = OpenAPI_malloc(sizeof(OpenAPI_sm_policy_data_patch_t)); - if (!sm_policy_data_patch_local_var) { - return NULL; - } + OpenAPI_sm_policy_data_patch_t *sm_policy_data_patch_local_var = ogs_malloc(sizeof(OpenAPI_sm_policy_data_patch_t)); + ogs_assert(sm_policy_data_patch_local_var); + sm_policy_data_patch_local_var->um_data = um_data; sm_policy_data_patch_local_var->sm_policy_snssai_data = sm_policy_snssai_data; @@ -27,12 +26,14 @@ void OpenAPI_sm_policy_data_patch_free(OpenAPI_sm_policy_data_patch_t *sm_policy OpenAPI_lnode_t *node; OpenAPI_list_for_each(sm_policy_data_patch->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); } OpenAPI_list_free(sm_policy_data_patch->um_data); OpenAPI_list_for_each(sm_policy_data_patch->sm_policy_snssai_data, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_sm_policy_snssai_data_patch_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -118,9 +119,9 @@ OpenAPI_sm_policy_data_patch_t *OpenAPI_sm_policy_data_patch_parseFromJSON(cJSON 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_patch_parseFromJSON() failed [um_data]"); goto end; @@ -144,9 +145,9 @@ OpenAPI_sm_policy_data_patch_t *OpenAPI_sm_policy_data_patch_parseFromJSON(cJSON 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_patch_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_sm_policy_snssai_data_patch_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_patch_parseFromJSON() failed [sm_policy_snssai_data]"); goto end; diff --git a/lib/sbi/openapi/model/sm_policy_decision.c b/lib/sbi/openapi/model/sm_policy_decision.c index 84759207f..4c49dbb5b 100644 --- a/lib/sbi/openapi/model/sm_policy_decision.c +++ b/lib/sbi/openapi/model/sm_policy_decision.c @@ -42,10 +42,9 @@ OpenAPI_sm_policy_decision_t *OpenAPI_sm_policy_decision_create( int red_sess_indication ) { - OpenAPI_sm_policy_decision_t *sm_policy_decision_local_var = OpenAPI_malloc(sizeof(OpenAPI_sm_policy_decision_t)); - if (!sm_policy_decision_local_var) { - return NULL; - } + OpenAPI_sm_policy_decision_t *sm_policy_decision_local_var = ogs_malloc(sizeof(OpenAPI_sm_policy_decision_t)); + ogs_assert(sm_policy_decision_local_var); + sm_policy_decision_local_var->sess_rules = sess_rules; sm_policy_decision_local_var->pcc_rules = pcc_rules; sm_policy_decision_local_var->is_pcscf_rest_indication = is_pcscf_rest_indication; @@ -93,24 +92,28 @@ void OpenAPI_sm_policy_decision_free(OpenAPI_sm_policy_decision_t *sm_policy_dec OpenAPI_lnode_t *node; OpenAPI_list_for_each(sm_policy_decision->sess_rules, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_session_rule_free(localKeyValue->value); ogs_free(localKeyValue); } OpenAPI_list_free(sm_policy_decision->sess_rules); OpenAPI_list_for_each(sm_policy_decision->pcc_rules, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_pcc_rule_free(localKeyValue->value); ogs_free(localKeyValue); } OpenAPI_list_free(sm_policy_decision->pcc_rules); OpenAPI_list_for_each(sm_policy_decision->qos_decs, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_qos_data_free(localKeyValue->value); ogs_free(localKeyValue); } OpenAPI_list_free(sm_policy_decision->qos_decs); OpenAPI_list_for_each(sm_policy_decision->chg_decs, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_charging_data_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -118,30 +121,35 @@ void OpenAPI_sm_policy_decision_free(OpenAPI_sm_policy_decision_t *sm_policy_dec OpenAPI_charging_information_free(sm_policy_decision->charging_info); OpenAPI_list_for_each(sm_policy_decision->traff_cont_decs, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_traffic_control_data_free(localKeyValue->value); ogs_free(localKeyValue); } OpenAPI_list_free(sm_policy_decision->traff_cont_decs); OpenAPI_list_for_each(sm_policy_decision->um_decs, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_usage_monitoring_data_free(localKeyValue->value); ogs_free(localKeyValue); } OpenAPI_list_free(sm_policy_decision->um_decs); OpenAPI_list_for_each(sm_policy_decision->qos_chars, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_qos_characteristics_free(localKeyValue->value); ogs_free(localKeyValue); } OpenAPI_list_free(sm_policy_decision->qos_chars); OpenAPI_list_for_each(sm_policy_decision->qos_mon_decs, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_qos_monitoring_data_free(localKeyValue->value); ogs_free(localKeyValue); } OpenAPI_list_free(sm_policy_decision->qos_mon_decs); OpenAPI_list_for_each(sm_policy_decision->conds, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_condition_data_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -155,6 +163,7 @@ void OpenAPI_sm_policy_decision_free(OpenAPI_sm_policy_decision_t *sm_policy_dec OpenAPI_requested_usage_data_free(sm_policy_decision->last_req_usage_data); OpenAPI_list_for_each(sm_policy_decision->pra_infos, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_presence_info_rm_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -615,9 +624,9 @@ OpenAPI_sm_policy_decision_t *OpenAPI_sm_policy_decision_parseFromJSON(cJSON *sm cJSON *localMapObject = sess_rules_local_map; if (cJSON_IsObject(sess_rules_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_session_rule_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_session_rule_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(sess_rules_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_sm_policy_decision_parseFromJSON() failed [sess_rules]"); goto end; @@ -641,9 +650,9 @@ OpenAPI_sm_policy_decision_t *OpenAPI_sm_policy_decision_parseFromJSON(cJSON *sm cJSON *localMapObject = pcc_rules_local_map; if (cJSON_IsObject(pcc_rules_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_pcc_rule_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_pcc_rule_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(pcc_rules_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_sm_policy_decision_parseFromJSON() failed [pcc_rules]"); goto end; @@ -676,9 +685,9 @@ OpenAPI_sm_policy_decision_t *OpenAPI_sm_policy_decision_parseFromJSON(cJSON *sm cJSON *localMapObject = qos_decs_local_map; if (cJSON_IsObject(qos_decs_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_qos_data_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_qos_data_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(qos_decs_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_sm_policy_decision_parseFromJSON() failed [qos_decs]"); goto end; @@ -702,9 +711,9 @@ OpenAPI_sm_policy_decision_t *OpenAPI_sm_policy_decision_parseFromJSON(cJSON *sm cJSON *localMapObject = chg_decs_local_map; if (cJSON_IsObject(chg_decs_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_charging_data_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_charging_data_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(chg_decs_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_sm_policy_decision_parseFromJSON() failed [chg_decs]"); goto end; @@ -735,9 +744,9 @@ OpenAPI_sm_policy_decision_t *OpenAPI_sm_policy_decision_parseFromJSON(cJSON *sm cJSON *localMapObject = traff_cont_decs_local_map; if (cJSON_IsObject(traff_cont_decs_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_traffic_control_data_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_traffic_control_data_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(traff_cont_decs_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_sm_policy_decision_parseFromJSON() failed [traff_cont_decs]"); goto end; @@ -761,9 +770,9 @@ OpenAPI_sm_policy_decision_t *OpenAPI_sm_policy_decision_parseFromJSON(cJSON *sm cJSON *localMapObject = um_decs_local_map; if (cJSON_IsObject(um_decs_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_usage_monitoring_data_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_usage_monitoring_data_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(um_decs_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_sm_policy_decision_parseFromJSON() failed [um_decs]"); goto end; @@ -787,9 +796,9 @@ OpenAPI_sm_policy_decision_t *OpenAPI_sm_policy_decision_parseFromJSON(cJSON *sm cJSON *localMapObject = qos_chars_local_map; if (cJSON_IsObject(qos_chars_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_qos_characteristics_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_qos_characteristics_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(qos_chars_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_sm_policy_decision_parseFromJSON() failed [qos_chars]"); goto end; @@ -813,9 +822,9 @@ OpenAPI_sm_policy_decision_t *OpenAPI_sm_policy_decision_parseFromJSON(cJSON *sm cJSON *localMapObject = qos_mon_decs_local_map; if (cJSON_IsObject(qos_mon_decs_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_qos_monitoring_data_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_qos_monitoring_data_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(qos_mon_decs_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_sm_policy_decision_parseFromJSON() failed [qos_mon_decs]"); goto end; @@ -848,9 +857,9 @@ OpenAPI_sm_policy_decision_t *OpenAPI_sm_policy_decision_parseFromJSON(cJSON *sm cJSON *localMapObject = conds_local_map; if (cJSON_IsObject(conds_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_condition_data_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_condition_data_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(conds_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_sm_policy_decision_parseFromJSON() failed [conds]"); goto end; @@ -953,9 +962,9 @@ OpenAPI_sm_policy_decision_t *OpenAPI_sm_policy_decision_parseFromJSON(cJSON *sm cJSON *localMapObject = pra_infos_local_map; if (cJSON_IsObject(pra_infos_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_presence_info_rm_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_presence_info_rm_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(pra_infos_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_sm_policy_decision_parseFromJSON() failed [pra_infos]"); goto end; @@ -1074,7 +1083,7 @@ OpenAPI_sm_policy_decision_t *OpenAPI_sm_policy_decision_parseFromJSON(cJSON *sm reflective_qo_s_timer ? true : false, reflective_qo_s_timer ? reflective_qo_s_timer->valuedouble : 0, conds ? condsList : NULL, - revalidation_time ? ogs_strdup_or_assert(revalidation_time->valuestring) : NULL, + revalidation_time ? ogs_strdup(revalidation_time->valuestring) : NULL, offline ? true : false, offline ? offline->valueint : 0, online ? true : false, @@ -1089,7 +1098,7 @@ OpenAPI_sm_policy_decision_t *OpenAPI_sm_policy_decision_parseFromJSON(cJSON *sm ipv6_index ? ipv6_index->valuedouble : 0, qos_flow_usage ? qos_flow_usageVariable : 0, rel_cause ? rel_causeVariable : 0, - supp_feat ? ogs_strdup_or_assert(supp_feat->valuestring) : NULL, + supp_feat ? ogs_strdup(supp_feat->valuestring) : NULL, tsn_bridge_man_cont ? tsn_bridge_man_cont_local_nonprim : NULL, tsn_port_man_cont_dstt ? tsn_port_man_cont_dstt_local_nonprim : NULL, tsn_port_man_cont_nwtts ? tsn_port_man_cont_nwttsList : NULL, diff --git a/lib/sbi/openapi/model/sm_policy_delete_data.c b/lib/sbi/openapi/model/sm_policy_delete_data.c index 6e986f887..946a80494 100644 --- a/lib/sbi/openapi/model/sm_policy_delete_data.c +++ b/lib/sbi/openapi/model/sm_policy_delete_data.c @@ -15,10 +15,9 @@ OpenAPI_sm_policy_delete_data_t *OpenAPI_sm_policy_delete_data_create( OpenAPI_list_t *qos_mon_reports ) { - OpenAPI_sm_policy_delete_data_t *sm_policy_delete_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_sm_policy_delete_data_t)); - if (!sm_policy_delete_data_local_var) { - return NULL; - } + OpenAPI_sm_policy_delete_data_t *sm_policy_delete_data_local_var = ogs_malloc(sizeof(OpenAPI_sm_policy_delete_data_t)); + ogs_assert(sm_policy_delete_data_local_var); + sm_policy_delete_data_local_var->user_location_info = user_location_info; sm_policy_delete_data_local_var->ue_time_zone = ue_time_zone; sm_policy_delete_data_local_var->serving_network = serving_network; @@ -294,9 +293,9 @@ OpenAPI_sm_policy_delete_data_t *OpenAPI_sm_policy_delete_data_parseFromJSON(cJS sm_policy_delete_data_local_var = OpenAPI_sm_policy_delete_data_create ( user_location_info ? user_location_info_local_nonprim : NULL, - ue_time_zone ? ogs_strdup_or_assert(ue_time_zone->valuestring) : NULL, + ue_time_zone ? ogs_strdup(ue_time_zone->valuestring) : NULL, serving_network ? serving_network_local_nonprim : NULL, - user_location_info_time ? ogs_strdup_or_assert(user_location_info_time->valuestring) : NULL, + user_location_info_time ? ogs_strdup(user_location_info_time->valuestring) : NULL, ran_nas_rel_causes ? ran_nas_rel_causesList : NULL, accu_usage_reports ? accu_usage_reportsList : NULL, pdu_sess_rel_cause ? pdu_sess_rel_causeVariable : 0, diff --git a/lib/sbi/openapi/model/sm_policy_dnn_data.c b/lib/sbi/openapi/model/sm_policy_dnn_data.c index 7af7487e3..1c40c1359 100644 --- a/lib/sbi/openapi/model/sm_policy_dnn_data.c +++ b/lib/sbi/openapi/model/sm_policy_dnn_data.c @@ -40,10 +40,9 @@ OpenAPI_sm_policy_dnn_data_t *OpenAPI_sm_policy_dnn_data_create( int loc_rout_not_allowed ) { - OpenAPI_sm_policy_dnn_data_t *sm_policy_dnn_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_sm_policy_dnn_data_t)); - if (!sm_policy_dnn_data_local_var) { - return NULL; - } + OpenAPI_sm_policy_dnn_data_t *sm_policy_dnn_data_local_var = ogs_malloc(sizeof(OpenAPI_sm_policy_dnn_data_t)); + ogs_assert(sm_policy_dnn_data_local_var); + sm_policy_dnn_data_local_var->dnn = dnn; sm_policy_dnn_data_local_var->allowed_services = allowed_services; sm_policy_dnn_data_local_var->subsc_cats = subsc_cats; @@ -101,18 +100,21 @@ void OpenAPI_sm_policy_dnn_data_free(OpenAPI_sm_policy_dnn_data_t *sm_policy_dnn OpenAPI_charging_information_free(sm_policy_dnn_data->chf_info); OpenAPI_list_for_each(sm_policy_dnn_data->ref_um_data_limit_ids, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_limit_id_to_monitoring_key_free(localKeyValue->value); ogs_free(localKeyValue); } OpenAPI_list_free(sm_policy_dnn_data->ref_um_data_limit_ids); OpenAPI_list_for_each(sm_policy_dnn_data->pra_infos, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_presence_info_free(localKeyValue->value); ogs_free(localKeyValue); } OpenAPI_list_free(sm_policy_dnn_data->pra_infos); OpenAPI_list_for_each(sm_policy_dnn_data->bdt_ref_ids, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); ogs_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -373,7 +375,7 @@ OpenAPI_sm_policy_dnn_data_t *OpenAPI_sm_policy_dnn_data_parseFromJSON(cJSON *sm ogs_error("OpenAPI_sm_policy_dnn_data_parseFromJSON() failed [allowed_services]"); goto end; } - OpenAPI_list_add(allowed_servicesList , ogs_strdup_or_assert(allowed_services_local->valuestring)); + OpenAPI_list_add(allowed_servicesList , ogs_strdup(allowed_services_local->valuestring)); } } @@ -393,7 +395,7 @@ OpenAPI_sm_policy_dnn_data_t *OpenAPI_sm_policy_dnn_data_parseFromJSON(cJSON *sm ogs_error("OpenAPI_sm_policy_dnn_data_parseFromJSON() failed [subsc_cats]"); goto end; } - OpenAPI_list_add(subsc_catsList , ogs_strdup_or_assert(subsc_cats_local->valuestring)); + OpenAPI_list_add(subsc_catsList , ogs_strdup(subsc_cats_local->valuestring)); } } @@ -491,9 +493,9 @@ OpenAPI_sm_policy_dnn_data_t *OpenAPI_sm_policy_dnn_data_parseFromJSON(cJSON *sm cJSON *localMapObject = ref_um_data_limit_ids_local_map; if (cJSON_IsObject(ref_um_data_limit_ids_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_limit_id_to_monitoring_key_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_limit_id_to_monitoring_key_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(ref_um_data_limit_ids_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_sm_policy_dnn_data_parseFromJSON() failed [ref_um_data_limit_ids]"); goto end; @@ -562,9 +564,9 @@ OpenAPI_sm_policy_dnn_data_t *OpenAPI_sm_policy_dnn_data_parseFromJSON(cJSON *sm cJSON *localMapObject = pra_infos_local_map; if (cJSON_IsObject(pra_infos_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_presence_info_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_presence_info_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(pra_infos_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_sm_policy_dnn_data_parseFromJSON() failed [pra_infos]"); goto end; @@ -600,11 +602,11 @@ OpenAPI_sm_policy_dnn_data_t *OpenAPI_sm_policy_dnn_data_parseFromJSON(cJSON *sm } sm_policy_dnn_data_local_var = OpenAPI_sm_policy_dnn_data_create ( - ogs_strdup_or_assert(dnn->valuestring), + ogs_strdup(dnn->valuestring), allowed_services ? allowed_servicesList : NULL, subsc_cats ? subsc_catsList : NULL, - gbr_ul ? ogs_strdup_or_assert(gbr_ul->valuestring) : NULL, - gbr_dl ? ogs_strdup_or_assert(gbr_dl->valuestring) : NULL, + gbr_ul ? ogs_strdup(gbr_ul->valuestring) : NULL, + gbr_dl ? ogs_strdup(gbr_dl->valuestring) : NULL, adc_support ? true : false, adc_support ? adc_support->valueint : 0, subsc_spending_limits ? true : false, diff --git a/lib/sbi/openapi/model/sm_policy_dnn_data_patch.c b/lib/sbi/openapi/model/sm_policy_dnn_data_patch.c index d20f96068..6f5d330ae 100644 --- a/lib/sbi/openapi/model/sm_policy_dnn_data_patch.c +++ b/lib/sbi/openapi/model/sm_policy_dnn_data_patch.c @@ -9,10 +9,9 @@ OpenAPI_sm_policy_dnn_data_patch_t *OpenAPI_sm_policy_dnn_data_patch_create( OpenAPI_list_t* bdt_ref_ids ) { - OpenAPI_sm_policy_dnn_data_patch_t *sm_policy_dnn_data_patch_local_var = OpenAPI_malloc(sizeof(OpenAPI_sm_policy_dnn_data_patch_t)); - if (!sm_policy_dnn_data_patch_local_var) { - return NULL; - } + OpenAPI_sm_policy_dnn_data_patch_t *sm_policy_dnn_data_patch_local_var = ogs_malloc(sizeof(OpenAPI_sm_policy_dnn_data_patch_t)); + ogs_assert(sm_policy_dnn_data_patch_local_var); + sm_policy_dnn_data_patch_local_var->dnn = dnn; sm_policy_dnn_data_patch_local_var->bdt_ref_ids = bdt_ref_ids; @@ -28,6 +27,7 @@ void OpenAPI_sm_policy_dnn_data_patch_free(OpenAPI_sm_policy_dnn_data_patch_t *s ogs_free(sm_policy_dnn_data_patch->dnn); OpenAPI_list_for_each(sm_policy_dnn_data_patch->bdt_ref_ids, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); ogs_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -101,7 +101,7 @@ OpenAPI_sm_policy_dnn_data_patch_t *OpenAPI_sm_policy_dnn_data_patch_parseFromJS } sm_policy_dnn_data_patch_local_var = OpenAPI_sm_policy_dnn_data_patch_create ( - ogs_strdup_or_assert(dnn->valuestring), + ogs_strdup(dnn->valuestring), bdt_ref_ids ? bdt_ref_idsList : NULL ); diff --git a/lib/sbi/openapi/model/sm_policy_notification.c b/lib/sbi/openapi/model/sm_policy_notification.c index 798f7641a..514517ab3 100644 --- a/lib/sbi/openapi/model/sm_policy_notification.c +++ b/lib/sbi/openapi/model/sm_policy_notification.c @@ -9,10 +9,9 @@ OpenAPI_sm_policy_notification_t *OpenAPI_sm_policy_notification_create( OpenAPI_sm_policy_decision_t *sm_policy_decision ) { - OpenAPI_sm_policy_notification_t *sm_policy_notification_local_var = OpenAPI_malloc(sizeof(OpenAPI_sm_policy_notification_t)); - if (!sm_policy_notification_local_var) { - return NULL; - } + OpenAPI_sm_policy_notification_t *sm_policy_notification_local_var = ogs_malloc(sizeof(OpenAPI_sm_policy_notification_t)); + ogs_assert(sm_policy_notification_local_var); + sm_policy_notification_local_var->resource_uri = resource_uri; sm_policy_notification_local_var->sm_policy_decision = sm_policy_decision; @@ -84,7 +83,7 @@ OpenAPI_sm_policy_notification_t *OpenAPI_sm_policy_notification_parseFromJSON(c } sm_policy_notification_local_var = OpenAPI_sm_policy_notification_create ( - resource_uri ? ogs_strdup_or_assert(resource_uri->valuestring) : NULL, + resource_uri ? ogs_strdup(resource_uri->valuestring) : NULL, sm_policy_decision ? sm_policy_decision_local_nonprim : NULL ); diff --git a/lib/sbi/openapi/model/sm_policy_snssai_data.c b/lib/sbi/openapi/model/sm_policy_snssai_data.c index e66712aeb..00089a668 100644 --- a/lib/sbi/openapi/model/sm_policy_snssai_data.c +++ b/lib/sbi/openapi/model/sm_policy_snssai_data.c @@ -9,10 +9,9 @@ OpenAPI_sm_policy_snssai_data_t *OpenAPI_sm_policy_snssai_data_create( OpenAPI_list_t* sm_policy_dnn_data ) { - OpenAPI_sm_policy_snssai_data_t *sm_policy_snssai_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_sm_policy_snssai_data_t)); - if (!sm_policy_snssai_data_local_var) { - return NULL; - } + OpenAPI_sm_policy_snssai_data_t *sm_policy_snssai_data_local_var = ogs_malloc(sizeof(OpenAPI_sm_policy_snssai_data_t)); + ogs_assert(sm_policy_snssai_data_local_var); + sm_policy_snssai_data_local_var->snssai = snssai; sm_policy_snssai_data_local_var->sm_policy_dnn_data = sm_policy_dnn_data; @@ -28,6 +27,7 @@ void OpenAPI_sm_policy_snssai_data_free(OpenAPI_sm_policy_snssai_data_t *sm_poli OpenAPI_snssai_free(sm_policy_snssai_data->snssai); OpenAPI_list_for_each(sm_policy_snssai_data->sm_policy_dnn_data, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_sm_policy_dnn_data_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -110,9 +110,9 @@ OpenAPI_sm_policy_snssai_data_t *OpenAPI_sm_policy_snssai_data_parseFromJSON(cJS cJSON *localMapObject = sm_policy_dnn_data_local_map; if (cJSON_IsObject(sm_policy_dnn_data_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_sm_policy_dnn_data_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_sm_policy_dnn_data_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(sm_policy_dnn_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_snssai_data_parseFromJSON() failed [sm_policy_dnn_data]"); goto end; diff --git a/lib/sbi/openapi/model/sm_policy_snssai_data_patch.c b/lib/sbi/openapi/model/sm_policy_snssai_data_patch.c index 57654c2cb..1461c840a 100644 --- a/lib/sbi/openapi/model/sm_policy_snssai_data_patch.c +++ b/lib/sbi/openapi/model/sm_policy_snssai_data_patch.c @@ -9,10 +9,9 @@ OpenAPI_sm_policy_snssai_data_patch_t *OpenAPI_sm_policy_snssai_data_patch_creat OpenAPI_list_t* sm_policy_dnn_data ) { - OpenAPI_sm_policy_snssai_data_patch_t *sm_policy_snssai_data_patch_local_var = OpenAPI_malloc(sizeof(OpenAPI_sm_policy_snssai_data_patch_t)); - if (!sm_policy_snssai_data_patch_local_var) { - return NULL; - } + OpenAPI_sm_policy_snssai_data_patch_t *sm_policy_snssai_data_patch_local_var = ogs_malloc(sizeof(OpenAPI_sm_policy_snssai_data_patch_t)); + ogs_assert(sm_policy_snssai_data_patch_local_var); + sm_policy_snssai_data_patch_local_var->snssai = snssai; sm_policy_snssai_data_patch_local_var->sm_policy_dnn_data = sm_policy_dnn_data; @@ -28,6 +27,7 @@ void OpenAPI_sm_policy_snssai_data_patch_free(OpenAPI_sm_policy_snssai_data_patc OpenAPI_snssai_free(sm_policy_snssai_data_patch->snssai); OpenAPI_list_for_each(sm_policy_snssai_data_patch->sm_policy_dnn_data, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_sm_policy_dnn_data_patch_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -110,9 +110,9 @@ OpenAPI_sm_policy_snssai_data_patch_t *OpenAPI_sm_policy_snssai_data_patch_parse cJSON *localMapObject = sm_policy_dnn_data_local_map; if (cJSON_IsObject(sm_policy_dnn_data_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_sm_policy_dnn_data_patch_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_sm_policy_dnn_data_patch_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(sm_policy_dnn_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_snssai_data_patch_parseFromJSON() failed [sm_policy_dnn_data]"); goto end; diff --git a/lib/sbi/openapi/model/sm_policy_update_context_data.c b/lib/sbi/openapi/model/sm_policy_update_context_data.c index 315c4dd17..6d0fb03c0 100644 --- a/lib/sbi/openapi/model/sm_policy_update_context_data.c +++ b/lib/sbi/openapi/model/sm_policy_update_context_data.c @@ -60,10 +60,9 @@ OpenAPI_sm_policy_update_context_data_t *OpenAPI_sm_policy_update_context_data_c OpenAPI_list_t *types_of_notif ) { - OpenAPI_sm_policy_update_context_data_t *sm_policy_update_context_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_sm_policy_update_context_data_t)); - if (!sm_policy_update_context_data_local_var) { - return NULL; - } + OpenAPI_sm_policy_update_context_data_t *sm_policy_update_context_data_local_var = ogs_malloc(sizeof(OpenAPI_sm_policy_update_context_data_t)); + ogs_assert(sm_policy_update_context_data_local_var); + sm_policy_update_context_data_local_var->rep_policy_ctrl_req_triggers = rep_policy_ctrl_req_triggers; sm_policy_update_context_data_local_var->acc_net_ch_ids = acc_net_ch_ids; sm_policy_update_context_data_local_var->access_type = access_type; @@ -177,6 +176,7 @@ void OpenAPI_sm_policy_update_context_data_free(OpenAPI_sm_policy_update_context ogs_free(sm_policy_update_context_data->user_location_info_time); OpenAPI_list_for_each(sm_policy_update_context_data->rep_pra_infos, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_presence_info_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -1235,9 +1235,9 @@ OpenAPI_sm_policy_update_context_data_t *OpenAPI_sm_policy_update_context_data_p cJSON *localMapObject = rep_pra_infos_local_map; if (cJSON_IsObject(rep_pra_infos_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_presence_info_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_presence_info_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(rep_pra_infos_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_sm_policy_update_context_data_parseFromJSON() failed [rep_pra_infos]"); goto end; @@ -1453,7 +1453,7 @@ OpenAPI_sm_policy_update_context_data_t *OpenAPI_sm_policy_update_context_data_p ogs_error("OpenAPI_sm_policy_update_context_data_parseFromJSON() failed [inter_grp_ids]"); goto end; } - OpenAPI_list_add(inter_grp_idsList , ogs_strdup_or_assert(inter_grp_ids_local->valuestring)); + OpenAPI_list_add(inter_grp_idsList , ogs_strdup(inter_grp_ids_local->valuestring)); } } @@ -1488,18 +1488,18 @@ OpenAPI_sm_policy_update_context_data_t *OpenAPI_sm_policy_update_context_data_p rel_access_info ? rel_access_info_local_nonprim : NULL, serving_network ? serving_network_local_nonprim : NULL, user_location_info ? user_location_info_local_nonprim : NULL, - ue_time_zone ? ogs_strdup_or_assert(ue_time_zone->valuestring) : NULL, - rel_ipv4_address ? ogs_strdup_or_assert(rel_ipv4_address->valuestring) : NULL, - ipv4_address ? ogs_strdup_or_assert(ipv4_address->valuestring) : NULL, - ip_domain ? ogs_strdup_or_assert(ip_domain->valuestring) : NULL, - ipv6_address_prefix ? ogs_strdup_or_assert(ipv6_address_prefix->valuestring) : NULL, - rel_ipv6_address_prefix ? ogs_strdup_or_assert(rel_ipv6_address_prefix->valuestring) : NULL, - add_ipv6_addr_prefixes ? ogs_strdup_or_assert(add_ipv6_addr_prefixes->valuestring) : NULL, - add_rel_ipv6_addr_prefixes ? ogs_strdup_or_assert(add_rel_ipv6_addr_prefixes->valuestring) : NULL, - rel_ue_mac ? ogs_strdup_or_assert(rel_ue_mac->valuestring) : NULL, - ue_mac ? ogs_strdup_or_assert(ue_mac->valuestring) : NULL, + ue_time_zone ? ogs_strdup(ue_time_zone->valuestring) : NULL, + rel_ipv4_address ? ogs_strdup(rel_ipv4_address->valuestring) : NULL, + ipv4_address ? ogs_strdup(ipv4_address->valuestring) : NULL, + ip_domain ? ogs_strdup(ip_domain->valuestring) : NULL, + ipv6_address_prefix ? ogs_strdup(ipv6_address_prefix->valuestring) : NULL, + rel_ipv6_address_prefix ? ogs_strdup(rel_ipv6_address_prefix->valuestring) : NULL, + add_ipv6_addr_prefixes ? ogs_strdup(add_ipv6_addr_prefixes->valuestring) : NULL, + add_rel_ipv6_addr_prefixes ? ogs_strdup(add_rel_ipv6_addr_prefixes->valuestring) : NULL, + rel_ue_mac ? ogs_strdup(rel_ue_mac->valuestring) : NULL, + ue_mac ? ogs_strdup(ue_mac->valuestring) : NULL, subs_sess_ambr ? subs_sess_ambr_local_nonprim : NULL, - auth_prof_index ? ogs_strdup_or_assert(auth_prof_index->valuestring) : NULL, + auth_prof_index ? ogs_strdup(auth_prof_index->valuestring) : NULL, subs_def_qos ? subs_def_qos_local_nonprim : NULL, vplmn_qos ? vplmn_qos_local_nonprim : NULL, num_of_pack_filter ? true : false, @@ -1512,7 +1512,7 @@ OpenAPI_sm_policy_update_context_data_t *OpenAPI_sm_policy_update_context_data_p sess_rule_reports ? sess_rule_reportsList : NULL, qnc_reports ? qnc_reportsList : NULL, qos_mon_reports ? qos_mon_reportsList : NULL, - user_location_info_time ? ogs_strdup_or_assert(user_location_info_time->valuestring) : NULL, + user_location_info_time ? ogs_strdup(user_location_info_time->valuestring) : NULL, rep_pra_infos ? rep_pra_infosList : NULL, ue_init_res_req ? ue_init_res_req_local_nonprim : NULL, ref_qos_indication ? true : false, @@ -1530,7 +1530,7 @@ OpenAPI_sm_policy_update_context_data_t *OpenAPI_sm_policy_update_context_data_p mul_addr_infos ? mul_addr_infosList : NULL, policy_dec_failure_reports ? policy_dec_failure_reportsList : NULL, traffic_descriptors ? traffic_descriptorsList : NULL, - pcc_rule_id ? ogs_strdup_or_assert(pcc_rule_id->valuestring) : NULL, + pcc_rule_id ? ogs_strdup(pcc_rule_id->valuestring) : NULL, inter_grp_ids ? inter_grp_idsList : NULL, types_of_notif ? types_of_notifList : NULL ); diff --git a/lib/sbi/openapi/model/small_data_rate_status.c b/lib/sbi/openapi/model/small_data_rate_status.c index 3ef58b6ab..8479b4934 100644 --- a/lib/sbi/openapi/model/small_data_rate_status.c +++ b/lib/sbi/openapi/model/small_data_rate_status.c @@ -16,10 +16,9 @@ OpenAPI_small_data_rate_status_t *OpenAPI_small_data_rate_status_create( int remain_ex_reports_dl ) { - OpenAPI_small_data_rate_status_t *small_data_rate_status_local_var = OpenAPI_malloc(sizeof(OpenAPI_small_data_rate_status_t)); - if (!small_data_rate_status_local_var) { - return NULL; - } + OpenAPI_small_data_rate_status_t *small_data_rate_status_local_var = ogs_malloc(sizeof(OpenAPI_small_data_rate_status_t)); + ogs_assert(small_data_rate_status_local_var); + small_data_rate_status_local_var->is_remain_packets_ul = is_remain_packets_ul; small_data_rate_status_local_var->remain_packets_ul = remain_packets_ul; small_data_rate_status_local_var->is_remain_packets_dl = is_remain_packets_dl; @@ -145,7 +144,7 @@ OpenAPI_small_data_rate_status_t *OpenAPI_small_data_rate_status_parseFromJSON(c remain_packets_ul ? remain_packets_ul->valuedouble : 0, remain_packets_dl ? true : false, remain_packets_dl ? remain_packets_dl->valuedouble : 0, - validity_time ? ogs_strdup_or_assert(validity_time->valuestring) : NULL, + validity_time ? ogs_strdup(validity_time->valuestring) : NULL, remain_ex_reports_ul ? true : false, remain_ex_reports_ul ? remain_ex_reports_ul->valuedouble : 0, remain_ex_reports_dl ? true : false, diff --git a/lib/sbi/openapi/model/small_data_rate_status_info.c b/lib/sbi/openapi/model/small_data_rate_status_info.c index e68a685c5..0b70f5e24 100644 --- a/lib/sbi/openapi/model/small_data_rate_status_info.c +++ b/lib/sbi/openapi/model/small_data_rate_status_info.c @@ -10,10 +10,9 @@ OpenAPI_small_data_rate_status_info_t *OpenAPI_small_data_rate_status_info_creat OpenAPI_small_data_rate_status_t *small_data_rate_status ) { - OpenAPI_small_data_rate_status_info_t *small_data_rate_status_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_small_data_rate_status_info_t)); - if (!small_data_rate_status_info_local_var) { - return NULL; - } + OpenAPI_small_data_rate_status_info_t *small_data_rate_status_info_local_var = ogs_malloc(sizeof(OpenAPI_small_data_rate_status_info_t)); + ogs_assert(small_data_rate_status_info_local_var); + small_data_rate_status_info_local_var->snssai = snssai; small_data_rate_status_info_local_var->dnn = dnn; small_data_rate_status_info_local_var->small_data_rate_status = small_data_rate_status; @@ -108,7 +107,7 @@ OpenAPI_small_data_rate_status_info_t *OpenAPI_small_data_rate_status_info_parse small_data_rate_status_info_local_var = OpenAPI_small_data_rate_status_info_create ( snssai_local_nonprim, - ogs_strdup_or_assert(dnn->valuestring), + ogs_strdup(dnn->valuestring), small_data_rate_status_local_nonprim ); diff --git a/lib/sbi/openapi/model/smf_change_info.c b/lib/sbi/openapi/model/smf_change_info.c index 10fa9de8f..a5c6b7f5b 100644 --- a/lib/sbi/openapi/model/smf_change_info.c +++ b/lib/sbi/openapi/model/smf_change_info.c @@ -9,10 +9,9 @@ OpenAPI_smf_change_info_t *OpenAPI_smf_change_info_create( OpenAPI_smf_change_indication_e smf_change_ind ) { - OpenAPI_smf_change_info_t *smf_change_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_smf_change_info_t)); - if (!smf_change_info_local_var) { - return NULL; - } + OpenAPI_smf_change_info_t *smf_change_info_local_var = ogs_malloc(sizeof(OpenAPI_smf_change_info_t)); + ogs_assert(smf_change_info_local_var); + smf_change_info_local_var->pdu_session_id_list = pdu_session_id_list; smf_change_info_local_var->smf_change_ind = smf_change_ind; diff --git a/lib/sbi/openapi/model/smf_info.c b/lib/sbi/openapi/model/smf_info.c index 58c1454bd..caa4760dc 100644 --- a/lib/sbi/openapi/model/smf_info.c +++ b/lib/sbi/openapi/model/smf_info.c @@ -16,10 +16,9 @@ OpenAPI_smf_info_t *OpenAPI_smf_info_create( int vsmf_support_ind ) { - OpenAPI_smf_info_t *smf_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_smf_info_t)); - if (!smf_info_local_var) { - return NULL; - } + OpenAPI_smf_info_t *smf_info_local_var = ogs_malloc(sizeof(OpenAPI_smf_info_t)); + ogs_assert(smf_info_local_var); + smf_info_local_var->s_nssai_smf_info_list = s_nssai_smf_info_list; smf_info_local_var->tai_list = tai_list; smf_info_local_var->tai_range_list = tai_range_list; @@ -291,7 +290,7 @@ OpenAPI_smf_info_t *OpenAPI_smf_info_parseFromJSON(cJSON *smf_infoJSON) s_nssai_smf_info_listList, tai_list ? tai_listList : NULL, tai_range_list ? tai_range_listList : NULL, - pgw_fqdn ? ogs_strdup_or_assert(pgw_fqdn->valuestring) : NULL, + pgw_fqdn ? ogs_strdup(pgw_fqdn->valuestring) : NULL, access_type ? access_typeList : NULL, priority ? true : false, priority ? priority->valuedouble : 0, diff --git a/lib/sbi/openapi/model/smf_registration.c b/lib/sbi/openapi/model/smf_registration.c index 6705b7131..1b7eee39e 100644 --- a/lib/sbi/openapi/model/smf_registration.c +++ b/lib/sbi/openapi/model/smf_registration.c @@ -24,10 +24,9 @@ OpenAPI_smf_registration_t *OpenAPI_smf_registration_create( OpenAPI_context_info_t *context_info ) { - OpenAPI_smf_registration_t *smf_registration_local_var = OpenAPI_malloc(sizeof(OpenAPI_smf_registration_t)); - if (!smf_registration_local_var) { - return NULL; - } + OpenAPI_smf_registration_t *smf_registration_local_var = ogs_malloc(sizeof(OpenAPI_smf_registration_t)); + ogs_assert(smf_registration_local_var); + smf_registration_local_var->smf_instance_id = smf_instance_id; smf_registration_local_var->smf_set_id = smf_set_id; smf_registration_local_var->supported_features = supported_features; @@ -341,23 +340,23 @@ OpenAPI_smf_registration_t *OpenAPI_smf_registration_parseFromJSON(cJSON *smf_re } smf_registration_local_var = OpenAPI_smf_registration_create ( - ogs_strdup_or_assert(smf_instance_id->valuestring), - smf_set_id ? ogs_strdup_or_assert(smf_set_id->valuestring) : NULL, - supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, + ogs_strdup(smf_instance_id->valuestring), + smf_set_id ? ogs_strdup(smf_set_id->valuestring) : NULL, + supported_features ? ogs_strdup(supported_features->valuestring) : NULL, pdu_session_id->valuedouble, single_nssai_local_nonprim, - dnn ? ogs_strdup_or_assert(dnn->valuestring) : NULL, + dnn ? ogs_strdup(dnn->valuestring) : NULL, emergency_services ? true : false, emergency_services ? emergency_services->valueint : 0, - pcscf_restoration_callback_uri ? ogs_strdup_or_assert(pcscf_restoration_callback_uri->valuestring) : NULL, + pcscf_restoration_callback_uri ? ogs_strdup(pcscf_restoration_callback_uri->valuestring) : NULL, plmn_id_local_nonprim, - pgw_fqdn ? ogs_strdup_or_assert(pgw_fqdn->valuestring) : NULL, + pgw_fqdn ? ogs_strdup(pgw_fqdn->valuestring) : NULL, epdg_ind ? true : false, epdg_ind ? epdg_ind->valueint : 0, - dereg_callback_uri ? ogs_strdup_or_assert(dereg_callback_uri->valuestring) : NULL, + dereg_callback_uri ? ogs_strdup(dereg_callback_uri->valuestring) : NULL, registration_reason ? registration_reasonVariable : 0, - registration_time ? ogs_strdup_or_assert(registration_time->valuestring) : NULL, + registration_time ? ogs_strdup(registration_time->valuestring) : NULL, context_info ? context_info_local_nonprim : NULL ); diff --git a/lib/sbi/openapi/model/smf_registration_info.c b/lib/sbi/openapi/model/smf_registration_info.c index 21c7ff723..e4b5f5fa8 100644 --- a/lib/sbi/openapi/model/smf_registration_info.c +++ b/lib/sbi/openapi/model/smf_registration_info.c @@ -8,10 +8,9 @@ OpenAPI_smf_registration_info_t *OpenAPI_smf_registration_info_create( OpenAPI_list_t *smf_registration_list ) { - OpenAPI_smf_registration_info_t *smf_registration_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_smf_registration_info_t)); - if (!smf_registration_info_local_var) { - return NULL; - } + OpenAPI_smf_registration_info_t *smf_registration_info_local_var = ogs_malloc(sizeof(OpenAPI_smf_registration_info_t)); + ogs_assert(smf_registration_info_local_var); + smf_registration_info_local_var->smf_registration_list = smf_registration_list; return smf_registration_info_local_var; diff --git a/lib/sbi/openapi/model/smf_selection_data.c b/lib/sbi/openapi/model/smf_selection_data.c index 4612f5325..cab348b23 100644 --- a/lib/sbi/openapi/model/smf_selection_data.c +++ b/lib/sbi/openapi/model/smf_selection_data.c @@ -13,10 +13,9 @@ OpenAPI_smf_selection_data_t *OpenAPI_smf_selection_data_create( char *dnn ) { - OpenAPI_smf_selection_data_t *smf_selection_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_smf_selection_data_t)); - if (!smf_selection_data_local_var) { - return NULL; - } + OpenAPI_smf_selection_data_t *smf_selection_data_local_var = ogs_malloc(sizeof(OpenAPI_smf_selection_data_t)); + ogs_assert(smf_selection_data_local_var); + smf_selection_data_local_var->is_unsupp_dnn = is_unsupp_dnn; smf_selection_data_local_var->unsupp_dnn = unsupp_dnn; smf_selection_data_local_var->candidates = candidates; @@ -35,6 +34,7 @@ void OpenAPI_smf_selection_data_free(OpenAPI_smf_selection_data_t *smf_selection OpenAPI_lnode_t *node; OpenAPI_list_for_each(smf_selection_data->candidates, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_candidate_for_replacement_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -149,9 +149,9 @@ OpenAPI_smf_selection_data_t *OpenAPI_smf_selection_data_parseFromJSON(cJSON *sm cJSON *localMapObject = candidates_local_map; if (cJSON_IsObject(candidates_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_candidate_for_replacement_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_candidate_for_replacement_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(candidates_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_smf_selection_data_parseFromJSON() failed [candidates]"); goto end; @@ -189,7 +189,7 @@ OpenAPI_smf_selection_data_t *OpenAPI_smf_selection_data_parseFromJSON(cJSON *sm candidates ? candidatesList : NULL, snssai ? snssai_local_nonprim : NULL, mapping_snssai ? mapping_snssai_local_nonprim : NULL, - dnn ? ogs_strdup_or_assert(dnn->valuestring) : NULL + dnn ? ogs_strdup(dnn->valuestring) : NULL ); return smf_selection_data_local_var; diff --git a/lib/sbi/openapi/model/smf_selection_subscription_data.c b/lib/sbi/openapi/model/smf_selection_subscription_data.c index 03cb83f59..6565aea4f 100644 --- a/lib/sbi/openapi/model/smf_selection_subscription_data.c +++ b/lib/sbi/openapi/model/smf_selection_subscription_data.c @@ -10,10 +10,9 @@ OpenAPI_smf_selection_subscription_data_t *OpenAPI_smf_selection_subscription_da char *shared_snssai_infos_id ) { - OpenAPI_smf_selection_subscription_data_t *smf_selection_subscription_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_smf_selection_subscription_data_t)); - if (!smf_selection_subscription_data_local_var) { - return NULL; - } + OpenAPI_smf_selection_subscription_data_t *smf_selection_subscription_data_local_var = ogs_malloc(sizeof(OpenAPI_smf_selection_subscription_data_t)); + ogs_assert(smf_selection_subscription_data_local_var); + smf_selection_subscription_data_local_var->supported_features = supported_features; smf_selection_subscription_data_local_var->subscribed_snssai_infos = subscribed_snssai_infos; smf_selection_subscription_data_local_var->shared_snssai_infos_id = shared_snssai_infos_id; @@ -30,6 +29,7 @@ void OpenAPI_smf_selection_subscription_data_free(OpenAPI_smf_selection_subscrip ogs_free(smf_selection_subscription_data->supported_features); OpenAPI_list_for_each(smf_selection_subscription_data->subscribed_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); } @@ -116,9 +116,9 @@ OpenAPI_smf_selection_subscription_data_t *OpenAPI_smf_selection_subscription_da cJSON *localMapObject = subscribed_snssai_infos_local_map; if (cJSON_IsObject(subscribed_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(subscribed_snssai_infos_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_smf_selection_subscription_data_parseFromJSON() failed [subscribed_snssai_infos]"); goto end; @@ -137,9 +137,9 @@ OpenAPI_smf_selection_subscription_data_t *OpenAPI_smf_selection_subscription_da } smf_selection_subscription_data_local_var = OpenAPI_smf_selection_subscription_data_create ( - supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, + supported_features ? ogs_strdup(supported_features->valuestring) : NULL, subscribed_snssai_infos ? subscribed_snssai_infosList : NULL, - shared_snssai_infos_id ? ogs_strdup_or_assert(shared_snssai_infos_id->valuestring) : NULL + shared_snssai_infos_id ? ogs_strdup(shared_snssai_infos_id->valuestring) : NULL ); return smf_selection_subscription_data_local_var; diff --git a/lib/sbi/openapi/model/smf_selection_subscription_data_1.c b/lib/sbi/openapi/model/smf_selection_subscription_data_1.c index d2edfa8a9..a43eac2ce 100644 --- a/lib/sbi/openapi/model/smf_selection_subscription_data_1.c +++ b/lib/sbi/openapi/model/smf_selection_subscription_data_1.c @@ -10,10 +10,9 @@ OpenAPI_smf_selection_subscription_data_1_t *OpenAPI_smf_selection_subscription_ char *shared_snssai_infos_id ) { - OpenAPI_smf_selection_subscription_data_1_t *smf_selection_subscription_data_1_local_var = OpenAPI_malloc(sizeof(OpenAPI_smf_selection_subscription_data_1_t)); - if (!smf_selection_subscription_data_1_local_var) { - return NULL; - } + OpenAPI_smf_selection_subscription_data_1_t *smf_selection_subscription_data_1_local_var = ogs_malloc(sizeof(OpenAPI_smf_selection_subscription_data_1_t)); + ogs_assert(smf_selection_subscription_data_1_local_var); + smf_selection_subscription_data_1_local_var->supported_features = supported_features; smf_selection_subscription_data_1_local_var->subscribed_snssai_infos = subscribed_snssai_infos; smf_selection_subscription_data_1_local_var->shared_snssai_infos_id = shared_snssai_infos_id; @@ -30,6 +29,7 @@ void OpenAPI_smf_selection_subscription_data_1_free(OpenAPI_smf_selection_subscr ogs_free(smf_selection_subscription_data_1->supported_features); OpenAPI_list_for_each(smf_selection_subscription_data_1->subscribed_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); } @@ -116,9 +116,9 @@ OpenAPI_smf_selection_subscription_data_1_t *OpenAPI_smf_selection_subscription_ cJSON *localMapObject = subscribed_snssai_infos_local_map; if (cJSON_IsObject(subscribed_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(subscribed_snssai_infos_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_smf_selection_subscription_data_1_parseFromJSON() failed [subscribed_snssai_infos]"); goto end; @@ -137,9 +137,9 @@ OpenAPI_smf_selection_subscription_data_1_t *OpenAPI_smf_selection_subscription_ } smf_selection_subscription_data_1_local_var = OpenAPI_smf_selection_subscription_data_1_create ( - supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, + supported_features ? ogs_strdup(supported_features->valuestring) : NULL, subscribed_snssai_infos ? subscribed_snssai_infosList : NULL, - shared_snssai_infos_id ? ogs_strdup_or_assert(shared_snssai_infos_id->valuestring) : NULL + shared_snssai_infos_id ? ogs_strdup(shared_snssai_infos_id->valuestring) : NULL ); return smf_selection_subscription_data_1_local_var; diff --git a/lib/sbi/openapi/model/smf_subscription_info.c b/lib/sbi/openapi/model/smf_subscription_info.c index e880fbe7a..3dfabfd09 100644 --- a/lib/sbi/openapi/model/smf_subscription_info.c +++ b/lib/sbi/openapi/model/smf_subscription_info.c @@ -8,10 +8,9 @@ OpenAPI_smf_subscription_info_t *OpenAPI_smf_subscription_info_create( OpenAPI_list_t *smf_subscription_list ) { - OpenAPI_smf_subscription_info_t *smf_subscription_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_smf_subscription_info_t)); - if (!smf_subscription_info_local_var) { - return NULL; - } + OpenAPI_smf_subscription_info_t *smf_subscription_info_local_var = ogs_malloc(sizeof(OpenAPI_smf_subscription_info_t)); + ogs_assert(smf_subscription_info_local_var); + smf_subscription_info_local_var->smf_subscription_list = smf_subscription_list; return smf_subscription_info_local_var; diff --git a/lib/sbi/openapi/model/smf_subscription_item.c b/lib/sbi/openapi/model/smf_subscription_item.c index 39f50e335..3d5d9af2e 100644 --- a/lib/sbi/openapi/model/smf_subscription_item.c +++ b/lib/sbi/openapi/model/smf_subscription_item.c @@ -9,10 +9,9 @@ OpenAPI_smf_subscription_item_t *OpenAPI_smf_subscription_item_create( char *subscription_id ) { - OpenAPI_smf_subscription_item_t *smf_subscription_item_local_var = OpenAPI_malloc(sizeof(OpenAPI_smf_subscription_item_t)); - if (!smf_subscription_item_local_var) { - return NULL; - } + OpenAPI_smf_subscription_item_t *smf_subscription_item_local_var = ogs_malloc(sizeof(OpenAPI_smf_subscription_item_t)); + ogs_assert(smf_subscription_item_local_var); + smf_subscription_item_local_var->smf_instance_id = smf_instance_id; smf_subscription_item_local_var->subscription_id = subscription_id; @@ -80,8 +79,8 @@ OpenAPI_smf_subscription_item_t *OpenAPI_smf_subscription_item_parseFromJSON(cJS } smf_subscription_item_local_var = OpenAPI_smf_subscription_item_create ( - ogs_strdup_or_assert(smf_instance_id->valuestring), - ogs_strdup_or_assert(subscription_id->valuestring) + ogs_strdup(smf_instance_id->valuestring), + ogs_strdup(subscription_id->valuestring) ); return smf_subscription_item_local_var; diff --git a/lib/sbi/openapi/model/sms_management_subscription_data.c b/lib/sbi/openapi/model/sms_management_subscription_data.c index 10bfcc502..cb9349690 100644 --- a/lib/sbi/openapi/model/sms_management_subscription_data.c +++ b/lib/sbi/openapi/model/sms_management_subscription_data.c @@ -22,10 +22,9 @@ OpenAPI_sms_management_subscription_data_t *OpenAPI_sms_management_subscription_ OpenAPI_trace_data_1_t *trace_data ) { - OpenAPI_sms_management_subscription_data_t *sms_management_subscription_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_sms_management_subscription_data_t)); - if (!sms_management_subscription_data_local_var) { - return NULL; - } + OpenAPI_sms_management_subscription_data_t *sms_management_subscription_data_local_var = ogs_malloc(sizeof(OpenAPI_sms_management_subscription_data_t)); + ogs_assert(sms_management_subscription_data_local_var); + sms_management_subscription_data_local_var->supported_features = supported_features; sms_management_subscription_data_local_var->is_mt_sms_subscribed = is_mt_sms_subscribed; sms_management_subscription_data_local_var->mt_sms_subscribed = mt_sms_subscribed; @@ -234,7 +233,7 @@ OpenAPI_sms_management_subscription_data_t *OpenAPI_sms_management_subscription_ ogs_error("OpenAPI_sms_management_subscription_data_parseFromJSON() failed [shared_sms_mng_data_ids]"); goto end; } - OpenAPI_list_add(shared_sms_mng_data_idsList , ogs_strdup_or_assert(shared_sms_mng_data_ids_local->valuestring)); + OpenAPI_list_add(shared_sms_mng_data_idsList , ogs_strdup(shared_sms_mng_data_ids_local->valuestring)); } } @@ -246,7 +245,7 @@ OpenAPI_sms_management_subscription_data_t *OpenAPI_sms_management_subscription_ } sms_management_subscription_data_local_var = OpenAPI_sms_management_subscription_data_create ( - supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, + supported_features ? ogs_strdup(supported_features->valuestring) : NULL, mt_sms_subscribed ? true : false, mt_sms_subscribed ? mt_sms_subscribed->valueint : 0, mt_sms_barring_all ? true : false, diff --git a/lib/sbi/openapi/model/sms_management_subscription_data_1.c b/lib/sbi/openapi/model/sms_management_subscription_data_1.c index 48c2a3de0..9ee0faed7 100644 --- a/lib/sbi/openapi/model/sms_management_subscription_data_1.c +++ b/lib/sbi/openapi/model/sms_management_subscription_data_1.c @@ -22,10 +22,9 @@ OpenAPI_sms_management_subscription_data_1_t *OpenAPI_sms_management_subscriptio OpenAPI_trace_data_t *trace_data ) { - OpenAPI_sms_management_subscription_data_1_t *sms_management_subscription_data_1_local_var = OpenAPI_malloc(sizeof(OpenAPI_sms_management_subscription_data_1_t)); - if (!sms_management_subscription_data_1_local_var) { - return NULL; - } + OpenAPI_sms_management_subscription_data_1_t *sms_management_subscription_data_1_local_var = ogs_malloc(sizeof(OpenAPI_sms_management_subscription_data_1_t)); + ogs_assert(sms_management_subscription_data_1_local_var); + sms_management_subscription_data_1_local_var->supported_features = supported_features; sms_management_subscription_data_1_local_var->is_mt_sms_subscribed = is_mt_sms_subscribed; sms_management_subscription_data_1_local_var->mt_sms_subscribed = mt_sms_subscribed; @@ -234,7 +233,7 @@ OpenAPI_sms_management_subscription_data_1_t *OpenAPI_sms_management_subscriptio ogs_error("OpenAPI_sms_management_subscription_data_1_parseFromJSON() failed [shared_sms_mng_data_ids]"); goto end; } - OpenAPI_list_add(shared_sms_mng_data_idsList , ogs_strdup_or_assert(shared_sms_mng_data_ids_local->valuestring)); + OpenAPI_list_add(shared_sms_mng_data_idsList , ogs_strdup(shared_sms_mng_data_ids_local->valuestring)); } } @@ -246,7 +245,7 @@ OpenAPI_sms_management_subscription_data_1_t *OpenAPI_sms_management_subscriptio } sms_management_subscription_data_1_local_var = OpenAPI_sms_management_subscription_data_1_create ( - supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, + supported_features ? ogs_strdup(supported_features->valuestring) : NULL, mt_sms_subscribed ? true : false, mt_sms_subscribed ? mt_sms_subscribed->valueint : 0, mt_sms_barring_all ? true : false, diff --git a/lib/sbi/openapi/model/sms_subscription_data.c b/lib/sbi/openapi/model/sms_subscription_data.c index 716d4cee0..bf0c66ac9 100644 --- a/lib/sbi/openapi/model/sms_subscription_data.c +++ b/lib/sbi/openapi/model/sms_subscription_data.c @@ -10,10 +10,9 @@ OpenAPI_sms_subscription_data_t *OpenAPI_sms_subscription_data_create( char *shared_sms_subs_data_id ) { - OpenAPI_sms_subscription_data_t *sms_subscription_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_sms_subscription_data_t)); - if (!sms_subscription_data_local_var) { - return NULL; - } + OpenAPI_sms_subscription_data_t *sms_subscription_data_local_var = ogs_malloc(sizeof(OpenAPI_sms_subscription_data_t)); + ogs_assert(sms_subscription_data_local_var); + sms_subscription_data_local_var->is_sms_subscribed = is_sms_subscribed; sms_subscription_data_local_var->sms_subscribed = sms_subscribed; sms_subscription_data_local_var->shared_sms_subs_data_id = shared_sms_subs_data_id; @@ -83,7 +82,7 @@ OpenAPI_sms_subscription_data_t *OpenAPI_sms_subscription_data_parseFromJSON(cJS sms_subscription_data_local_var = OpenAPI_sms_subscription_data_create ( sms_subscribed ? true : false, sms_subscribed ? sms_subscribed->valueint : 0, - shared_sms_subs_data_id ? ogs_strdup_or_assert(shared_sms_subs_data_id->valuestring) : NULL + shared_sms_subs_data_id ? ogs_strdup(shared_sms_subs_data_id->valuestring) : NULL ); return sms_subscription_data_local_var; diff --git a/lib/sbi/openapi/model/sms_subscription_data_1.c b/lib/sbi/openapi/model/sms_subscription_data_1.c index eb52e3e68..b3bac3768 100644 --- a/lib/sbi/openapi/model/sms_subscription_data_1.c +++ b/lib/sbi/openapi/model/sms_subscription_data_1.c @@ -10,10 +10,9 @@ OpenAPI_sms_subscription_data_1_t *OpenAPI_sms_subscription_data_1_create( char *shared_sms_subs_data_id ) { - OpenAPI_sms_subscription_data_1_t *sms_subscription_data_1_local_var = OpenAPI_malloc(sizeof(OpenAPI_sms_subscription_data_1_t)); - if (!sms_subscription_data_1_local_var) { - return NULL; - } + OpenAPI_sms_subscription_data_1_t *sms_subscription_data_1_local_var = ogs_malloc(sizeof(OpenAPI_sms_subscription_data_1_t)); + ogs_assert(sms_subscription_data_1_local_var); + sms_subscription_data_1_local_var->is_sms_subscribed = is_sms_subscribed; sms_subscription_data_1_local_var->sms_subscribed = sms_subscribed; sms_subscription_data_1_local_var->shared_sms_subs_data_id = shared_sms_subs_data_id; @@ -83,7 +82,7 @@ OpenAPI_sms_subscription_data_1_t *OpenAPI_sms_subscription_data_1_parseFromJSON sms_subscription_data_1_local_var = OpenAPI_sms_subscription_data_1_create ( sms_subscribed ? true : false, sms_subscribed ? sms_subscribed->valueint : 0, - shared_sms_subs_data_id ? ogs_strdup_or_assert(shared_sms_subs_data_id->valuestring) : NULL + shared_sms_subs_data_id ? ogs_strdup(shared_sms_subs_data_id->valuestring) : NULL ); return sms_subscription_data_1_local_var; diff --git a/lib/sbi/openapi/model/smsc_data.c b/lib/sbi/openapi/model/smsc_data.c index d32c99907..39e704ee2 100644 --- a/lib/sbi/openapi/model/smsc_data.c +++ b/lib/sbi/openapi/model/smsc_data.c @@ -9,10 +9,9 @@ OpenAPI_smsc_data_t *OpenAPI_smsc_data_create( OpenAPI_network_node_diameter_address_1_t *smsc_diameter_address ) { - OpenAPI_smsc_data_t *smsc_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_smsc_data_t)); - if (!smsc_data_local_var) { - return NULL; - } + OpenAPI_smsc_data_t *smsc_data_local_var = ogs_malloc(sizeof(OpenAPI_smsc_data_t)); + ogs_assert(smsc_data_local_var); + smsc_data_local_var->smsc_map_address = smsc_map_address; smsc_data_local_var->smsc_diameter_address = smsc_diameter_address; @@ -84,7 +83,7 @@ OpenAPI_smsc_data_t *OpenAPI_smsc_data_parseFromJSON(cJSON *smsc_dataJSON) } smsc_data_local_var = OpenAPI_smsc_data_create ( - smsc_map_address ? ogs_strdup_or_assert(smsc_map_address->valuestring) : NULL, + smsc_map_address ? ogs_strdup(smsc_map_address->valuestring) : NULL, smsc_diameter_address ? smsc_diameter_address_local_nonprim : NULL ); diff --git a/lib/sbi/openapi/model/smsf_info.c b/lib/sbi/openapi/model/smsf_info.c index b8f42fb8a..e947f5e09 100644 --- a/lib/sbi/openapi/model/smsf_info.c +++ b/lib/sbi/openapi/model/smsf_info.c @@ -9,10 +9,9 @@ OpenAPI_smsf_info_t *OpenAPI_smsf_info_create( OpenAPI_plmn_id_t *plmn_id ) { - OpenAPI_smsf_info_t *smsf_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_smsf_info_t)); - if (!smsf_info_local_var) { - return NULL; - } + OpenAPI_smsf_info_t *smsf_info_local_var = ogs_malloc(sizeof(OpenAPI_smsf_info_t)); + ogs_assert(smsf_info_local_var); + smsf_info_local_var->smsf_instance_id = smsf_instance_id; smsf_info_local_var->plmn_id = plmn_id; @@ -84,7 +83,7 @@ OpenAPI_smsf_info_t *OpenAPI_smsf_info_parseFromJSON(cJSON *smsf_infoJSON) plmn_id_local_nonprim = OpenAPI_plmn_id_parseFromJSON(plmn_id); smsf_info_local_var = OpenAPI_smsf_info_create ( - ogs_strdup_or_assert(smsf_instance_id->valuestring), + ogs_strdup(smsf_instance_id->valuestring), plmn_id_local_nonprim ); diff --git a/lib/sbi/openapi/model/smsf_info_1.c b/lib/sbi/openapi/model/smsf_info_1.c index 2f8c44484..c8b174757 100644 --- a/lib/sbi/openapi/model/smsf_info_1.c +++ b/lib/sbi/openapi/model/smsf_info_1.c @@ -9,10 +9,9 @@ OpenAPI_smsf_info_1_t *OpenAPI_smsf_info_1_create( OpenAPI_plmn_id_1_t *plmn_id ) { - OpenAPI_smsf_info_1_t *smsf_info_1_local_var = OpenAPI_malloc(sizeof(OpenAPI_smsf_info_1_t)); - if (!smsf_info_1_local_var) { - return NULL; - } + OpenAPI_smsf_info_1_t *smsf_info_1_local_var = ogs_malloc(sizeof(OpenAPI_smsf_info_1_t)); + ogs_assert(smsf_info_1_local_var); + smsf_info_1_local_var->smsf_instance_id = smsf_instance_id; smsf_info_1_local_var->plmn_id = plmn_id; @@ -84,7 +83,7 @@ OpenAPI_smsf_info_1_t *OpenAPI_smsf_info_1_parseFromJSON(cJSON *smsf_info_1JSON) plmn_id_local_nonprim = OpenAPI_plmn_id_1_parseFromJSON(plmn_id); smsf_info_1_local_var = OpenAPI_smsf_info_1_create ( - ogs_strdup_or_assert(smsf_instance_id->valuestring), + ogs_strdup(smsf_instance_id->valuestring), plmn_id_local_nonprim ); diff --git a/lib/sbi/openapi/model/smsf_registration.c b/lib/sbi/openapi/model/smsf_registration.c index d0689e1b0..0f7bb59c0 100644 --- a/lib/sbi/openapi/model/smsf_registration.c +++ b/lib/sbi/openapi/model/smsf_registration.c @@ -15,10 +15,9 @@ OpenAPI_smsf_registration_t *OpenAPI_smsf_registration_create( OpenAPI_context_info_t *context_info ) { - OpenAPI_smsf_registration_t *smsf_registration_local_var = OpenAPI_malloc(sizeof(OpenAPI_smsf_registration_t)); - if (!smsf_registration_local_var) { - return NULL; - } + OpenAPI_smsf_registration_t *smsf_registration_local_var = ogs_malloc(sizeof(OpenAPI_smsf_registration_t)); + ogs_assert(smsf_registration_local_var); + smsf_registration_local_var->smsf_instance_id = smsf_instance_id; smsf_registration_local_var->smsf_set_id = smsf_set_id; smsf_registration_local_var->supported_features = supported_features; @@ -206,13 +205,13 @@ OpenAPI_smsf_registration_t *OpenAPI_smsf_registration_parseFromJSON(cJSON *smsf } smsf_registration_local_var = OpenAPI_smsf_registration_create ( - ogs_strdup_or_assert(smsf_instance_id->valuestring), - smsf_set_id ? ogs_strdup_or_assert(smsf_set_id->valuestring) : NULL, - supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, + ogs_strdup(smsf_instance_id->valuestring), + smsf_set_id ? ogs_strdup(smsf_set_id->valuestring) : NULL, + supported_features ? ogs_strdup(supported_features->valuestring) : NULL, plmn_id_local_nonprim, - smsf_map_address ? ogs_strdup_or_assert(smsf_map_address->valuestring) : NULL, + smsf_map_address ? ogs_strdup(smsf_map_address->valuestring) : NULL, smsf_diameter_address ? smsf_diameter_address_local_nonprim : NULL, - registration_time ? ogs_strdup_or_assert(registration_time->valuestring) : NULL, + registration_time ? ogs_strdup(registration_time->valuestring) : NULL, context_info ? context_info_local_nonprim : NULL ); diff --git a/lib/sbi/openapi/model/snssai.c b/lib/sbi/openapi/model/snssai.c index abb45d134..5c80c6541 100644 --- a/lib/sbi/openapi/model/snssai.c +++ b/lib/sbi/openapi/model/snssai.c @@ -9,10 +9,9 @@ OpenAPI_snssai_t *OpenAPI_snssai_create( char *sd ) { - OpenAPI_snssai_t *snssai_local_var = OpenAPI_malloc(sizeof(OpenAPI_snssai_t)); - if (!snssai_local_var) { - return NULL; - } + OpenAPI_snssai_t *snssai_local_var = ogs_malloc(sizeof(OpenAPI_snssai_t)); + ogs_assert(snssai_local_var); + snssai_local_var->sst = sst; snssai_local_var->sd = sd; @@ -81,7 +80,7 @@ OpenAPI_snssai_t *OpenAPI_snssai_parseFromJSON(cJSON *snssaiJSON) snssai_local_var = OpenAPI_snssai_create ( sst->valuedouble, - sd ? ogs_strdup_or_assert(sd->valuestring) : NULL + sd ? ogs_strdup(sd->valuestring) : NULL ); return snssai_local_var; diff --git a/lib/sbi/openapi/model/snssai_extension.c b/lib/sbi/openapi/model/snssai_extension.c index 7faa0af02..45815537c 100644 --- a/lib/sbi/openapi/model/snssai_extension.c +++ b/lib/sbi/openapi/model/snssai_extension.c @@ -10,10 +10,9 @@ OpenAPI_snssai_extension_t *OpenAPI_snssai_extension_create( int wildcard_sd ) { - OpenAPI_snssai_extension_t *snssai_extension_local_var = OpenAPI_malloc(sizeof(OpenAPI_snssai_extension_t)); - if (!snssai_extension_local_var) { - return NULL; - } + OpenAPI_snssai_extension_t *snssai_extension_local_var = ogs_malloc(sizeof(OpenAPI_snssai_extension_t)); + ogs_assert(snssai_extension_local_var); + snssai_extension_local_var->sd_ranges = sd_ranges; snssai_extension_local_var->is_wildcard_sd = is_wildcard_sd; snssai_extension_local_var->wildcard_sd = wildcard_sd; diff --git a/lib/sbi/openapi/model/snssai_info.c b/lib/sbi/openapi/model/snssai_info.c index b4c650a29..c524620b6 100644 --- a/lib/sbi/openapi/model/snssai_info.c +++ b/lib/sbi/openapi/model/snssai_info.c @@ -8,10 +8,9 @@ OpenAPI_snssai_info_t *OpenAPI_snssai_info_create( OpenAPI_list_t *dnn_infos ) { - OpenAPI_snssai_info_t *snssai_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_snssai_info_t)); - if (!snssai_info_local_var) { - return NULL; - } + OpenAPI_snssai_info_t *snssai_info_local_var = ogs_malloc(sizeof(OpenAPI_snssai_info_t)); + ogs_assert(snssai_info_local_var); + snssai_info_local_var->dnn_infos = dnn_infos; return snssai_info_local_var; diff --git a/lib/sbi/openapi/model/snssai_route_selection_descriptor.c b/lib/sbi/openapi/model/snssai_route_selection_descriptor.c index 1f4476aa1..af6ca47df 100644 --- a/lib/sbi/openapi/model/snssai_route_selection_descriptor.c +++ b/lib/sbi/openapi/model/snssai_route_selection_descriptor.c @@ -9,10 +9,9 @@ OpenAPI_snssai_route_selection_descriptor_t *OpenAPI_snssai_route_selection_desc OpenAPI_list_t *dnn_route_sel_descs ) { - OpenAPI_snssai_route_selection_descriptor_t *snssai_route_selection_descriptor_local_var = OpenAPI_malloc(sizeof(OpenAPI_snssai_route_selection_descriptor_t)); - if (!snssai_route_selection_descriptor_local_var) { - return NULL; - } + OpenAPI_snssai_route_selection_descriptor_t *snssai_route_selection_descriptor_local_var = ogs_malloc(sizeof(OpenAPI_snssai_route_selection_descriptor_t)); + ogs_assert(snssai_route_selection_descriptor_local_var); + snssai_route_selection_descriptor_local_var->snssai = snssai; snssai_route_selection_descriptor_local_var->dnn_route_sel_descs = dnn_route_sel_descs; diff --git a/lib/sbi/openapi/model/snssai_smf_info_item.c b/lib/sbi/openapi/model/snssai_smf_info_item.c index 6b13a4dfa..2aa41eccb 100644 --- a/lib/sbi/openapi/model/snssai_smf_info_item.c +++ b/lib/sbi/openapi/model/snssai_smf_info_item.c @@ -9,10 +9,9 @@ OpenAPI_snssai_smf_info_item_t *OpenAPI_snssai_smf_info_item_create( OpenAPI_list_t *dnn_smf_info_list ) { - OpenAPI_snssai_smf_info_item_t *snssai_smf_info_item_local_var = OpenAPI_malloc(sizeof(OpenAPI_snssai_smf_info_item_t)); - if (!snssai_smf_info_item_local_var) { - return NULL; - } + OpenAPI_snssai_smf_info_item_t *snssai_smf_info_item_local_var = ogs_malloc(sizeof(OpenAPI_snssai_smf_info_item_t)); + ogs_assert(snssai_smf_info_item_local_var); + snssai_smf_info_item_local_var->s_nssai = s_nssai; snssai_smf_info_item_local_var->dnn_smf_info_list = dnn_smf_info_list; diff --git a/lib/sbi/openapi/model/snssai_upf_info_item.c b/lib/sbi/openapi/model/snssai_upf_info_item.c index cb2b0b9cb..d8d7218cf 100644 --- a/lib/sbi/openapi/model/snssai_upf_info_item.c +++ b/lib/sbi/openapi/model/snssai_upf_info_item.c @@ -11,10 +11,9 @@ OpenAPI_snssai_upf_info_item_t *OpenAPI_snssai_upf_info_item_create( int redundant_transport ) { - OpenAPI_snssai_upf_info_item_t *snssai_upf_info_item_local_var = OpenAPI_malloc(sizeof(OpenAPI_snssai_upf_info_item_t)); - if (!snssai_upf_info_item_local_var) { - return NULL; - } + OpenAPI_snssai_upf_info_item_t *snssai_upf_info_item_local_var = ogs_malloc(sizeof(OpenAPI_snssai_upf_info_item_t)); + ogs_assert(snssai_upf_info_item_local_var); + snssai_upf_info_item_local_var->s_nssai = s_nssai; snssai_upf_info_item_local_var->dnn_upf_info_list = dnn_upf_info_list; snssai_upf_info_item_local_var->is_redundant_transport = is_redundant_transport; diff --git a/lib/sbi/openapi/model/sor_data.c b/lib/sbi/openapi/model/sor_data.c index c77ab02ce..c74911b9e 100644 --- a/lib/sbi/openapi/model/sor_data.c +++ b/lib/sbi/openapi/model/sor_data.c @@ -11,10 +11,9 @@ OpenAPI_sor_data_t *OpenAPI_sor_data_create( char *sor_mac_iue ) { - OpenAPI_sor_data_t *sor_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_sor_data_t)); - if (!sor_data_local_var) { - return NULL; - } + OpenAPI_sor_data_t *sor_data_local_var = ogs_malloc(sizeof(OpenAPI_sor_data_t)); + ogs_assert(sor_data_local_var); + sor_data_local_var->provisioning_time = provisioning_time; sor_data_local_var->ue_update_status = ue_update_status; sor_data_local_var->sor_xmac_iue = sor_xmac_iue; @@ -119,10 +118,10 @@ OpenAPI_sor_data_t *OpenAPI_sor_data_parseFromJSON(cJSON *sor_dataJSON) } sor_data_local_var = OpenAPI_sor_data_create ( - ogs_strdup_or_assert(provisioning_time->valuestring), + ogs_strdup(provisioning_time->valuestring), ue_update_statusVariable, - sor_xmac_iue ? ogs_strdup_or_assert(sor_xmac_iue->valuestring) : NULL, - sor_mac_iue ? ogs_strdup_or_assert(sor_mac_iue->valuestring) : NULL + sor_xmac_iue ? ogs_strdup(sor_xmac_iue->valuestring) : NULL, + sor_mac_iue ? ogs_strdup(sor_mac_iue->valuestring) : NULL ); return sor_data_local_var; diff --git a/lib/sbi/openapi/model/sor_info.c b/lib/sbi/openapi/model/sor_info.c index bbb99987a..3ca14fac0 100644 --- a/lib/sbi/openapi/model/sor_info.c +++ b/lib/sbi/openapi/model/sor_info.c @@ -12,10 +12,9 @@ OpenAPI_sor_info_t *OpenAPI_sor_info_create( char *provisioning_time ) { - OpenAPI_sor_info_t *sor_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_sor_info_t)); - if (!sor_info_local_var) { - return NULL; - } + OpenAPI_sor_info_t *sor_info_local_var = ogs_malloc(sizeof(OpenAPI_sor_info_t)); + ogs_assert(sor_info_local_var); + sor_info_local_var->steering_container = steering_container; sor_info_local_var->ack_ind = ack_ind; sor_info_local_var->sor_mac_iausf = sor_mac_iausf; @@ -143,9 +142,9 @@ OpenAPI_sor_info_t *OpenAPI_sor_info_parseFromJSON(cJSON *sor_infoJSON) steering_container ? steering_container_local_nonprim : NULL, ack_ind->valueint, - sor_mac_iausf ? ogs_strdup_or_assert(sor_mac_iausf->valuestring) : NULL, - countersor ? ogs_strdup_or_assert(countersor->valuestring) : NULL, - ogs_strdup_or_assert(provisioning_time->valuestring) + sor_mac_iausf ? ogs_strdup(sor_mac_iausf->valuestring) : NULL, + countersor ? ogs_strdup(countersor->valuestring) : NULL, + ogs_strdup(provisioning_time->valuestring) ); return sor_info_local_var; diff --git a/lib/sbi/openapi/model/sor_info_1.c b/lib/sbi/openapi/model/sor_info_1.c index e2b2004f8..2ee2ad841 100644 --- a/lib/sbi/openapi/model/sor_info_1.c +++ b/lib/sbi/openapi/model/sor_info_1.c @@ -12,10 +12,9 @@ OpenAPI_sor_info_1_t *OpenAPI_sor_info_1_create( char *provisioning_time ) { - OpenAPI_sor_info_1_t *sor_info_1_local_var = OpenAPI_malloc(sizeof(OpenAPI_sor_info_1_t)); - if (!sor_info_1_local_var) { - return NULL; - } + OpenAPI_sor_info_1_t *sor_info_1_local_var = ogs_malloc(sizeof(OpenAPI_sor_info_1_t)); + ogs_assert(sor_info_1_local_var); + sor_info_1_local_var->steering_container = steering_container; sor_info_1_local_var->ack_ind = ack_ind; sor_info_1_local_var->sor_mac_iausf = sor_mac_iausf; @@ -143,9 +142,9 @@ OpenAPI_sor_info_1_t *OpenAPI_sor_info_1_parseFromJSON(cJSON *sor_info_1JSON) steering_container ? steering_container_local_nonprim : NULL, ack_ind->valueint, - sor_mac_iausf ? ogs_strdup_or_assert(sor_mac_iausf->valuestring) : NULL, - countersor ? ogs_strdup_or_assert(countersor->valuestring) : NULL, - ogs_strdup_or_assert(provisioning_time->valuestring) + sor_mac_iausf ? ogs_strdup(sor_mac_iausf->valuestring) : NULL, + countersor ? ogs_strdup(countersor->valuestring) : NULL, + ogs_strdup(provisioning_time->valuestring) ); return sor_info_1_local_var; diff --git a/lib/sbi/openapi/model/sor_update_info.c b/lib/sbi/openapi/model/sor_update_info.c index 7a0923b43..ce53b3168 100644 --- a/lib/sbi/openapi/model/sor_update_info.c +++ b/lib/sbi/openapi/model/sor_update_info.c @@ -8,10 +8,9 @@ OpenAPI_sor_update_info_t *OpenAPI_sor_update_info_create( OpenAPI_plmn_id_t *vplmn_id ) { - OpenAPI_sor_update_info_t *sor_update_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_sor_update_info_t)); - if (!sor_update_info_local_var) { - return NULL; - } + OpenAPI_sor_update_info_t *sor_update_info_local_var = ogs_malloc(sizeof(OpenAPI_sor_update_info_t)); + ogs_assert(sor_update_info_local_var); + sor_update_info_local_var->vplmn_id = vplmn_id; return sor_update_info_local_var; diff --git a/lib/sbi/openapi/model/spatial_validity.c b/lib/sbi/openapi/model/spatial_validity.c index edc8dd19b..fa15f09f5 100644 --- a/lib/sbi/openapi/model/spatial_validity.c +++ b/lib/sbi/openapi/model/spatial_validity.c @@ -8,10 +8,9 @@ OpenAPI_spatial_validity_t *OpenAPI_spatial_validity_create( OpenAPI_list_t* presence_info_list ) { - OpenAPI_spatial_validity_t *spatial_validity_local_var = OpenAPI_malloc(sizeof(OpenAPI_spatial_validity_t)); - if (!spatial_validity_local_var) { - return NULL; - } + OpenAPI_spatial_validity_t *spatial_validity_local_var = ogs_malloc(sizeof(OpenAPI_spatial_validity_t)); + ogs_assert(spatial_validity_local_var); + spatial_validity_local_var->presence_info_list = presence_info_list; return spatial_validity_local_var; @@ -25,6 +24,7 @@ void OpenAPI_spatial_validity_free(OpenAPI_spatial_validity_t *spatial_validity) OpenAPI_lnode_t *node; OpenAPI_list_for_each(spatial_validity->presence_info_list, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_presence_info_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -88,9 +88,9 @@ OpenAPI_spatial_validity_t *OpenAPI_spatial_validity_parseFromJSON(cJSON *spatia cJSON *localMapObject = presence_info_list_local_map; if (cJSON_IsObject(presence_info_list_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_presence_info_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_presence_info_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(presence_info_list_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_spatial_validity_parseFromJSON() failed [presence_info_list]"); goto end; diff --git a/lib/sbi/openapi/model/spatial_validity_rm.c b/lib/sbi/openapi/model/spatial_validity_rm.c index 0bd073db8..b1c813116 100644 --- a/lib/sbi/openapi/model/spatial_validity_rm.c +++ b/lib/sbi/openapi/model/spatial_validity_rm.c @@ -8,10 +8,9 @@ OpenAPI_spatial_validity_rm_t *OpenAPI_spatial_validity_rm_create( OpenAPI_list_t* presence_info_list ) { - OpenAPI_spatial_validity_rm_t *spatial_validity_rm_local_var = OpenAPI_malloc(sizeof(OpenAPI_spatial_validity_rm_t)); - if (!spatial_validity_rm_local_var) { - return NULL; - } + OpenAPI_spatial_validity_rm_t *spatial_validity_rm_local_var = ogs_malloc(sizeof(OpenAPI_spatial_validity_rm_t)); + ogs_assert(spatial_validity_rm_local_var); + spatial_validity_rm_local_var->presence_info_list = presence_info_list; return spatial_validity_rm_local_var; @@ -25,6 +24,7 @@ void OpenAPI_spatial_validity_rm_free(OpenAPI_spatial_validity_rm_t *spatial_val OpenAPI_lnode_t *node; OpenAPI_list_for_each(spatial_validity_rm->presence_info_list, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_presence_info_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -88,9 +88,9 @@ OpenAPI_spatial_validity_rm_t *OpenAPI_spatial_validity_rm_parseFromJSON(cJSON * cJSON *localMapObject = presence_info_list_local_map; if (cJSON_IsObject(presence_info_list_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_presence_info_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_presence_info_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(presence_info_list_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_spatial_validity_rm_parseFromJSON() failed [presence_info_list]"); goto end; diff --git a/lib/sbi/openapi/model/sponsor_connectivity_data.c b/lib/sbi/openapi/model/sponsor_connectivity_data.c index e811800c1..8cdcdd03d 100644 --- a/lib/sbi/openapi/model/sponsor_connectivity_data.c +++ b/lib/sbi/openapi/model/sponsor_connectivity_data.c @@ -8,10 +8,9 @@ OpenAPI_sponsor_connectivity_data_t *OpenAPI_sponsor_connectivity_data_create( OpenAPI_list_t *asp_ids ) { - OpenAPI_sponsor_connectivity_data_t *sponsor_connectivity_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_sponsor_connectivity_data_t)); - if (!sponsor_connectivity_data_local_var) { - return NULL; - } + OpenAPI_sponsor_connectivity_data_t *sponsor_connectivity_data_local_var = ogs_malloc(sizeof(OpenAPI_sponsor_connectivity_data_t)); + ogs_assert(sponsor_connectivity_data_local_var); + sponsor_connectivity_data_local_var->asp_ids = asp_ids; return sponsor_connectivity_data_local_var; @@ -80,7 +79,7 @@ OpenAPI_sponsor_connectivity_data_t *OpenAPI_sponsor_connectivity_data_parseFrom ogs_error("OpenAPI_sponsor_connectivity_data_parseFromJSON() failed [asp_ids]"); goto end; } - OpenAPI_list_add(asp_idsList , ogs_strdup_or_assert(asp_ids_local->valuestring)); + OpenAPI_list_add(asp_idsList , ogs_strdup(asp_ids_local->valuestring)); } sponsor_connectivity_data_local_var = OpenAPI_sponsor_connectivity_data_create ( diff --git a/lib/sbi/openapi/model/ssc_modes.c b/lib/sbi/openapi/model/ssc_modes.c index c5e7dc123..956fd9306 100644 --- a/lib/sbi/openapi/model/ssc_modes.c +++ b/lib/sbi/openapi/model/ssc_modes.c @@ -9,10 +9,9 @@ OpenAPI_ssc_modes_t *OpenAPI_ssc_modes_create( OpenAPI_list_t *allowed_ssc_modes ) { - OpenAPI_ssc_modes_t *ssc_modes_local_var = OpenAPI_malloc(sizeof(OpenAPI_ssc_modes_t)); - if (!ssc_modes_local_var) { - return NULL; - } + OpenAPI_ssc_modes_t *ssc_modes_local_var = ogs_malloc(sizeof(OpenAPI_ssc_modes_t)); + ogs_assert(ssc_modes_local_var); + ssc_modes_local_var->default_ssc_mode = default_ssc_mode; ssc_modes_local_var->allowed_ssc_modes = allowed_ssc_modes; diff --git a/lib/sbi/openapi/model/ssc_modes_1.c b/lib/sbi/openapi/model/ssc_modes_1.c index 4dddbdf95..bf81a2964 100644 --- a/lib/sbi/openapi/model/ssc_modes_1.c +++ b/lib/sbi/openapi/model/ssc_modes_1.c @@ -9,10 +9,9 @@ OpenAPI_ssc_modes_1_t *OpenAPI_ssc_modes_1_create( OpenAPI_list_t *allowed_ssc_modes ) { - OpenAPI_ssc_modes_1_t *ssc_modes_1_local_var = OpenAPI_malloc(sizeof(OpenAPI_ssc_modes_1_t)); - if (!ssc_modes_1_local_var) { - return NULL; - } + OpenAPI_ssc_modes_1_t *ssc_modes_1_local_var = ogs_malloc(sizeof(OpenAPI_ssc_modes_1_t)); + ogs_assert(ssc_modes_1_local_var); + ssc_modes_1_local_var->default_ssc_mode = default_ssc_mode; ssc_modes_1_local_var->allowed_ssc_modes = allowed_ssc_modes; diff --git a/lib/sbi/openapi/model/stationary_indication_rm.c b/lib/sbi/openapi/model/stationary_indication_rm.c index ad18d1798..88b851329 100644 --- a/lib/sbi/openapi/model/stationary_indication_rm.c +++ b/lib/sbi/openapi/model/stationary_indication_rm.c @@ -7,10 +7,9 @@ OpenAPI_stationary_indication_rm_t *OpenAPI_stationary_indication_rm_create( ) { - OpenAPI_stationary_indication_rm_t *stationary_indication_rm_local_var = OpenAPI_malloc(sizeof(OpenAPI_stationary_indication_rm_t)); - if (!stationary_indication_rm_local_var) { - return NULL; - } + OpenAPI_stationary_indication_rm_t *stationary_indication_rm_local_var = ogs_malloc(sizeof(OpenAPI_stationary_indication_rm_t)); + ogs_assert(stationary_indication_rm_local_var); + return stationary_indication_rm_local_var; } diff --git a/lib/sbi/openapi/model/status_info.c b/lib/sbi/openapi/model/status_info.c index ee5a321bd..c654b07d6 100644 --- a/lib/sbi/openapi/model/status_info.c +++ b/lib/sbi/openapi/model/status_info.c @@ -11,10 +11,9 @@ OpenAPI_status_info_t *OpenAPI_status_info_create( OpenAPI_access_type_e an_type ) { - OpenAPI_status_info_t *status_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_status_info_t)); - if (!status_info_local_var) { - return NULL; - } + OpenAPI_status_info_t *status_info_local_var = ogs_malloc(sizeof(OpenAPI_status_info_t)); + ogs_assert(status_info_local_var); + status_info_local_var->resource_status = resource_status; status_info_local_var->cause = cause; status_info_local_var->cn_assisted_ran_para = cn_assisted_ran_para; diff --git a/lib/sbi/openapi/model/status_notification.c b/lib/sbi/openapi/model/status_notification.c index e4a44ebaa..b2405b06e 100644 --- a/lib/sbi/openapi/model/status_notification.c +++ b/lib/sbi/openapi/model/status_notification.c @@ -10,10 +10,9 @@ OpenAPI_status_notification_t *OpenAPI_status_notification_create( OpenAPI_apn_rate_status_t *apn_rate_status ) { - OpenAPI_status_notification_t *status_notification_local_var = OpenAPI_malloc(sizeof(OpenAPI_status_notification_t)); - if (!status_notification_local_var) { - return NULL; - } + OpenAPI_status_notification_t *status_notification_local_var = ogs_malloc(sizeof(OpenAPI_status_notification_t)); + ogs_assert(status_notification_local_var); + status_notification_local_var->status_info = status_info; status_notification_local_var->small_data_rate_status = small_data_rate_status; status_notification_local_var->apn_rate_status = apn_rate_status; diff --git a/lib/sbi/openapi/model/steering_container.c b/lib/sbi/openapi/model/steering_container.c index 243f22abb..a9526cba8 100644 --- a/lib/sbi/openapi/model/steering_container.c +++ b/lib/sbi/openapi/model/steering_container.c @@ -7,10 +7,9 @@ OpenAPI_steering_container_t *OpenAPI_steering_container_create( ) { - OpenAPI_steering_container_t *steering_container_local_var = OpenAPI_malloc(sizeof(OpenAPI_steering_container_t)); - if (!steering_container_local_var) { - return NULL; - } + OpenAPI_steering_container_t *steering_container_local_var = ogs_malloc(sizeof(OpenAPI_steering_container_t)); + ogs_assert(steering_container_local_var); + return steering_container_local_var; } diff --git a/lib/sbi/openapi/model/steering_info.c b/lib/sbi/openapi/model/steering_info.c index 7d59100a5..5f1897e95 100644 --- a/lib/sbi/openapi/model/steering_info.c +++ b/lib/sbi/openapi/model/steering_info.c @@ -9,10 +9,9 @@ OpenAPI_steering_info_t *OpenAPI_steering_info_create( OpenAPI_list_t *access_tech_list ) { - OpenAPI_steering_info_t *steering_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_steering_info_t)); - if (!steering_info_local_var) { - return NULL; - } + OpenAPI_steering_info_t *steering_info_local_var = ogs_malloc(sizeof(OpenAPI_steering_info_t)); + ogs_assert(steering_info_local_var); + steering_info_local_var->plmn_id = plmn_id; steering_info_local_var->access_tech_list = access_tech_list; diff --git a/lib/sbi/openapi/model/steering_mode.c b/lib/sbi/openapi/model/steering_mode.c index eec5270a6..2049345e1 100644 --- a/lib/sbi/openapi/model/steering_mode.c +++ b/lib/sbi/openapi/model/steering_mode.c @@ -13,10 +13,9 @@ OpenAPI_steering_mode_t *OpenAPI_steering_mode_create( OpenAPI_access_type_e prio_acc ) { - OpenAPI_steering_mode_t *steering_mode_local_var = OpenAPI_malloc(sizeof(OpenAPI_steering_mode_t)); - if (!steering_mode_local_var) { - return NULL; - } + OpenAPI_steering_mode_t *steering_mode_local_var = ogs_malloc(sizeof(OpenAPI_steering_mode_t)); + ogs_assert(steering_mode_local_var); + steering_mode_local_var->steer_mode_value = steer_mode_value; steering_mode_local_var->active = active; steering_mode_local_var->standby = standby; diff --git a/lib/sbi/openapi/model/stored_search_result.c b/lib/sbi/openapi/model/stored_search_result.c index 19c5b2bb1..709b9d3cb 100644 --- a/lib/sbi/openapi/model/stored_search_result.c +++ b/lib/sbi/openapi/model/stored_search_result.c @@ -8,10 +8,9 @@ OpenAPI_stored_search_result_t *OpenAPI_stored_search_result_create( OpenAPI_list_t *nf_instances ) { - OpenAPI_stored_search_result_t *stored_search_result_local_var = OpenAPI_malloc(sizeof(OpenAPI_stored_search_result_t)); - if (!stored_search_result_local_var) { - return NULL; - } + OpenAPI_stored_search_result_t *stored_search_result_local_var = ogs_malloc(sizeof(OpenAPI_stored_search_result_t)); + ogs_assert(stored_search_result_local_var); + stored_search_result_local_var->nf_instances = nf_instances; return stored_search_result_local_var; diff --git a/lib/sbi/openapi/model/subscribed_default_qos.c b/lib/sbi/openapi/model/subscribed_default_qos.c index 37c40b522..93220272f 100644 --- a/lib/sbi/openapi/model/subscribed_default_qos.c +++ b/lib/sbi/openapi/model/subscribed_default_qos.c @@ -11,10 +11,9 @@ OpenAPI_subscribed_default_qos_t *OpenAPI_subscribed_default_qos_create( int priority_level ) { - OpenAPI_subscribed_default_qos_t *subscribed_default_qos_local_var = OpenAPI_malloc(sizeof(OpenAPI_subscribed_default_qos_t)); - if (!subscribed_default_qos_local_var) { - return NULL; - } + OpenAPI_subscribed_default_qos_t *subscribed_default_qos_local_var = ogs_malloc(sizeof(OpenAPI_subscribed_default_qos_t)); + ogs_assert(subscribed_default_qos_local_var); + subscribed_default_qos_local_var->_5qi = _5qi; subscribed_default_qos_local_var->arp = arp; subscribed_default_qos_local_var->is_priority_level = is_priority_level; diff --git a/lib/sbi/openapi/model/subscribed_default_qos_1.c b/lib/sbi/openapi/model/subscribed_default_qos_1.c index 6227a9906..0e1de884d 100644 --- a/lib/sbi/openapi/model/subscribed_default_qos_1.c +++ b/lib/sbi/openapi/model/subscribed_default_qos_1.c @@ -11,10 +11,9 @@ OpenAPI_subscribed_default_qos_1_t *OpenAPI_subscribed_default_qos_1_create( int priority_level ) { - OpenAPI_subscribed_default_qos_1_t *subscribed_default_qos_1_local_var = OpenAPI_malloc(sizeof(OpenAPI_subscribed_default_qos_1_t)); - if (!subscribed_default_qos_1_local_var) { - return NULL; - } + OpenAPI_subscribed_default_qos_1_t *subscribed_default_qos_1_local_var = ogs_malloc(sizeof(OpenAPI_subscribed_default_qos_1_t)); + ogs_assert(subscribed_default_qos_1_local_var); + subscribed_default_qos_1_local_var->_5qi = _5qi; subscribed_default_qos_1_local_var->arp = arp; subscribed_default_qos_1_local_var->is_priority_level = is_priority_level; diff --git a/lib/sbi/openapi/model/subscribed_event.c b/lib/sbi/openapi/model/subscribed_event.c index 03766e6a0..a139abe6c 100644 --- a/lib/sbi/openapi/model/subscribed_event.c +++ b/lib/sbi/openapi/model/subscribed_event.c @@ -7,10 +7,9 @@ OpenAPI_subscribed_event_t *OpenAPI_subscribed_event_create( ) { - OpenAPI_subscribed_event_t *subscribed_event_local_var = OpenAPI_malloc(sizeof(OpenAPI_subscribed_event_t)); - if (!subscribed_event_local_var) { - return NULL; - } + OpenAPI_subscribed_event_t *subscribed_event_local_var = ogs_malloc(sizeof(OpenAPI_subscribed_event_t)); + ogs_assert(subscribed_event_local_var); + return subscribed_event_local_var; } diff --git a/lib/sbi/openapi/model/subscribed_snssai.c b/lib/sbi/openapi/model/subscribed_snssai.c index 43cb0c3ce..8317b5b04 100644 --- a/lib/sbi/openapi/model/subscribed_snssai.c +++ b/lib/sbi/openapi/model/subscribed_snssai.c @@ -10,10 +10,9 @@ OpenAPI_subscribed_snssai_t *OpenAPI_subscribed_snssai_create( int default_indication ) { - OpenAPI_subscribed_snssai_t *subscribed_snssai_local_var = OpenAPI_malloc(sizeof(OpenAPI_subscribed_snssai_t)); - if (!subscribed_snssai_local_var) { - return NULL; - } + OpenAPI_subscribed_snssai_t *subscribed_snssai_local_var = ogs_malloc(sizeof(OpenAPI_subscribed_snssai_t)); + ogs_assert(subscribed_snssai_local_var); + subscribed_snssai_local_var->subscribed_snssai = subscribed_snssai; subscribed_snssai_local_var->is_default_indication = is_default_indication; subscribed_snssai_local_var->default_indication = default_indication; diff --git a/lib/sbi/openapi/model/subscription_data.c b/lib/sbi/openapi/model/subscription_data.c index fa4e20ce8..645d2b79d 100644 --- a/lib/sbi/openapi/model/subscription_data.c +++ b/lib/sbi/openapi/model/subscription_data.c @@ -23,10 +23,9 @@ OpenAPI_subscription_data_t *OpenAPI_subscription_data_create( OpenAPI_list_t *serving_scope ) { - OpenAPI_subscription_data_t *subscription_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_subscription_data_t)); - if (!subscription_data_local_var) { - return NULL; - } + OpenAPI_subscription_data_t *subscription_data_local_var = ogs_malloc(sizeof(OpenAPI_subscription_data_t)); + ogs_assert(subscription_data_local_var); + subscription_data_local_var->nf_status_notification_uri = nf_status_notification_uri; subscription_data_local_var->req_nf_instance_id = req_nf_instance_id; subscription_data_local_var->subscr_cond = subscr_cond; @@ -518,22 +517,22 @@ OpenAPI_subscription_data_t *OpenAPI_subscription_data_parseFromJSON(cJSON *subs ogs_error("OpenAPI_subscription_data_parseFromJSON() failed [serving_scope]"); goto end; } - OpenAPI_list_add(serving_scopeList , ogs_strdup_or_assert(serving_scope_local->valuestring)); + OpenAPI_list_add(serving_scopeList , ogs_strdup(serving_scope_local->valuestring)); } } subscription_data_local_var = OpenAPI_subscription_data_create ( - ogs_strdup_or_assert(nf_status_notification_uri->valuestring), - req_nf_instance_id ? ogs_strdup_or_assert(req_nf_instance_id->valuestring) : NULL, + ogs_strdup(nf_status_notification_uri->valuestring), + req_nf_instance_id ? ogs_strdup(req_nf_instance_id->valuestring) : NULL, subscr_cond ? subscr_cond_local_nonprim : NULL, - subscription_id ? ogs_strdup_or_assert(subscription_id->valuestring) : NULL, - validity_time ? ogs_strdup_or_assert(validity_time->valuestring) : NULL, + subscription_id ? ogs_strdup(subscription_id->valuestring) : NULL, + validity_time ? ogs_strdup(validity_time->valuestring) : NULL, req_notif_events ? req_notif_eventsList : NULL, plmn_id ? plmn_id_local_nonprim : NULL, - nid ? ogs_strdup_or_assert(nid->valuestring) : NULL, + nid ? ogs_strdup(nid->valuestring) : NULL, notif_condition ? notif_condition_local_nonprim : NULL, req_nf_type ? req_nf_typeVariable : 0, - req_nf_fqdn ? ogs_strdup_or_assert(req_nf_fqdn->valuestring) : NULL, + req_nf_fqdn ? ogs_strdup(req_nf_fqdn->valuestring) : NULL, req_snssais ? req_snssaisList : NULL, req_per_plmn_snssais ? req_per_plmn_snssaisList : NULL, req_plmn_list ? req_plmn_listList : NULL, diff --git a/lib/sbi/openapi/model/subscription_data_sets.c b/lib/sbi/openapi/model/subscription_data_sets.c index 632ac5df1..d708dc002 100644 --- a/lib/sbi/openapi/model/subscription_data_sets.c +++ b/lib/sbi/openapi/model/subscription_data_sets.c @@ -20,10 +20,9 @@ OpenAPI_subscription_data_sets_t *OpenAPI_subscription_data_sets_create( OpenAPI_lcs_broadcast_assistance_types_data_t *lcs_broadcast_assistance_types_data ) { - OpenAPI_subscription_data_sets_t *subscription_data_sets_local_var = OpenAPI_malloc(sizeof(OpenAPI_subscription_data_sets_t)); - if (!subscription_data_sets_local_var) { - return NULL; - } + OpenAPI_subscription_data_sets_t *subscription_data_sets_local_var = ogs_malloc(sizeof(OpenAPI_subscription_data_sets_t)); + ogs_assert(subscription_data_sets_local_var); + subscription_data_sets_local_var->am_data = am_data; subscription_data_sets_local_var->smf_sel_data = smf_sel_data; subscription_data_sets_local_var->uec_amf_data = uec_amf_data; diff --git a/lib/sbi/openapi/model/subscription_data_sets_1.c b/lib/sbi/openapi/model/subscription_data_sets_1.c index ea67af5db..9df6b54d1 100644 --- a/lib/sbi/openapi/model/subscription_data_sets_1.c +++ b/lib/sbi/openapi/model/subscription_data_sets_1.c @@ -20,10 +20,9 @@ OpenAPI_subscription_data_sets_1_t *OpenAPI_subscription_data_sets_1_create( OpenAPI_lcs_broadcast_assistance_types_data_1_t *lcs_broadcast_assistance_types_data ) { - OpenAPI_subscription_data_sets_1_t *subscription_data_sets_1_local_var = OpenAPI_malloc(sizeof(OpenAPI_subscription_data_sets_1_t)); - if (!subscription_data_sets_1_local_var) { - return NULL; - } + OpenAPI_subscription_data_sets_1_t *subscription_data_sets_1_local_var = ogs_malloc(sizeof(OpenAPI_subscription_data_sets_1_t)); + ogs_assert(subscription_data_sets_1_local_var); + subscription_data_sets_1_local_var->am_data = am_data; subscription_data_sets_1_local_var->smf_sel_data = smf_sel_data; subscription_data_sets_1_local_var->uec_amf_data = uec_amf_data; diff --git a/lib/sbi/openapi/model/subscription_data_subscr_cond.c b/lib/sbi/openapi/model/subscription_data_subscr_cond.c index e056735dd..16fb9d3d6 100644 --- a/lib/sbi/openapi/model/subscription_data_subscr_cond.c +++ b/lib/sbi/openapi/model/subscription_data_subscr_cond.c @@ -20,10 +20,9 @@ OpenAPI_subscription_data_subscr_cond_t *OpenAPI_subscription_data_subscr_cond_c OpenAPI_list_t *tai_list ) { - OpenAPI_subscription_data_subscr_cond_t *subscription_data_subscr_cond_local_var = OpenAPI_malloc(sizeof(OpenAPI_subscription_data_subscr_cond_t)); - if (!subscription_data_subscr_cond_local_var) { - return NULL; - } + OpenAPI_subscription_data_subscr_cond_t *subscription_data_subscr_cond_local_var = ogs_malloc(sizeof(OpenAPI_subscription_data_subscr_cond_t)); + ogs_assert(subscription_data_subscr_cond_local_var); + subscription_data_subscr_cond_local_var->nf_instance_id = nf_instance_id; subscription_data_subscr_cond_local_var->nf_type = nf_type; subscription_data_subscr_cond_local_var->service_name = service_name; @@ -351,7 +350,7 @@ OpenAPI_subscription_data_subscr_cond_t *OpenAPI_subscription_data_subscr_cond_p ogs_error("OpenAPI_subscription_data_subscr_cond_parseFromJSON() failed [nsi_list]"); goto end; } - OpenAPI_list_add(nsi_listList , ogs_strdup_or_assert(nsi_list_local->valuestring)); + OpenAPI_list_add(nsi_listList , ogs_strdup(nsi_list_local->valuestring)); } } @@ -398,7 +397,7 @@ OpenAPI_subscription_data_subscr_cond_t *OpenAPI_subscription_data_subscr_cond_p ogs_error("OpenAPI_subscription_data_subscr_cond_parseFromJSON() failed [smf_serving_area]"); goto end; } - OpenAPI_list_add(smf_serving_areaList , ogs_strdup_or_assert(smf_serving_area_local->valuestring)); + OpenAPI_list_add(smf_serving_areaList , ogs_strdup(smf_serving_area_local->valuestring)); } } @@ -426,17 +425,17 @@ OpenAPI_subscription_data_subscr_cond_t *OpenAPI_subscription_data_subscr_cond_p } subscription_data_subscr_cond_local_var = OpenAPI_subscription_data_subscr_cond_create ( - nf_instance_id ? ogs_strdup_or_assert(nf_instance_id->valuestring) : NULL, + nf_instance_id ? ogs_strdup(nf_instance_id->valuestring) : NULL, nf_type ? nf_typeVariable : 0, - service_name ? ogs_strdup_or_assert(service_name->valuestring) : NULL, - amf_set_id ? ogs_strdup_or_assert(amf_set_id->valuestring) : NULL, - amf_region_id ? ogs_strdup_or_assert(amf_region_id->valuestring) : NULL, + service_name ? ogs_strdup(service_name->valuestring) : NULL, + amf_set_id ? ogs_strdup(amf_set_id->valuestring) : NULL, + amf_region_id ? ogs_strdup(amf_region_id->valuestring) : NULL, guami_list ? guami_listList : NULL, snssai_list ? snssai_listList : NULL, nsi_list ? nsi_listList : NULL, - nf_group_id ? ogs_strdup_or_assert(nf_group_id->valuestring) : NULL, - nf_set_id ? ogs_strdup_or_assert(nf_set_id->valuestring) : NULL, - nf_service_set_id ? ogs_strdup_or_assert(nf_service_set_id->valuestring) : NULL, + nf_group_id ? ogs_strdup(nf_group_id->valuestring) : NULL, + nf_set_id ? ogs_strdup(nf_set_id->valuestring) : NULL, + nf_service_set_id ? ogs_strdup(nf_service_set_id->valuestring) : NULL, smf_serving_area ? smf_serving_areaList : NULL, tai_list ? tai_listList : NULL ); diff --git a/lib/sbi/openapi/model/subscription_data_subscriptions.c b/lib/sbi/openapi/model/subscription_data_subscriptions.c index 028d382e2..1130d5213 100644 --- a/lib/sbi/openapi/model/subscription_data_subscriptions.c +++ b/lib/sbi/openapi/model/subscription_data_subscriptions.c @@ -15,10 +15,9 @@ OpenAPI_subscription_data_subscriptions_t *OpenAPI_subscription_data_subscriptio char *supported_features ) { - OpenAPI_subscription_data_subscriptions_t *subscription_data_subscriptions_local_var = OpenAPI_malloc(sizeof(OpenAPI_subscription_data_subscriptions_t)); - if (!subscription_data_subscriptions_local_var) { - return NULL; - } + OpenAPI_subscription_data_subscriptions_t *subscription_data_subscriptions_local_var = ogs_malloc(sizeof(OpenAPI_subscription_data_subscriptions_t)); + ogs_assert(subscription_data_subscriptions_local_var); + subscription_data_subscriptions_local_var->ue_id = ue_id; subscription_data_subscriptions_local_var->callback_reference = callback_reference; subscription_data_subscriptions_local_var->original_callback_reference = original_callback_reference; @@ -183,7 +182,7 @@ OpenAPI_subscription_data_subscriptions_t *OpenAPI_subscription_data_subscriptio ogs_error("OpenAPI_subscription_data_subscriptions_parseFromJSON() failed [monitored_resource_uris]"); goto end; } - OpenAPI_list_add(monitored_resource_urisList , ogs_strdup_or_assert(monitored_resource_uris_local->valuestring)); + OpenAPI_list_add(monitored_resource_urisList , ogs_strdup(monitored_resource_uris_local->valuestring)); } cJSON *expiry = cJSON_GetObjectItemCaseSensitive(subscription_data_subscriptionsJSON, "expiry"); @@ -221,14 +220,14 @@ OpenAPI_subscription_data_subscriptions_t *OpenAPI_subscription_data_subscriptio } subscription_data_subscriptions_local_var = OpenAPI_subscription_data_subscriptions_create ( - ue_id ? ogs_strdup_or_assert(ue_id->valuestring) : NULL, - ogs_strdup_or_assert(callback_reference->valuestring), - original_callback_reference ? ogs_strdup_or_assert(original_callback_reference->valuestring) : NULL, + ue_id ? ogs_strdup(ue_id->valuestring) : NULL, + ogs_strdup(callback_reference->valuestring), + original_callback_reference ? ogs_strdup(original_callback_reference->valuestring) : NULL, monitored_resource_urisList, - expiry ? ogs_strdup_or_assert(expiry->valuestring) : NULL, + expiry ? ogs_strdup(expiry->valuestring) : NULL, sdm_subscription ? sdm_subscription_local_nonprim : NULL, - subscription_id ? ogs_strdup_or_assert(subscription_id->valuestring) : NULL, - supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL + subscription_id ? ogs_strdup(subscription_id->valuestring) : NULL, + supported_features ? ogs_strdup(supported_features->valuestring) : NULL ); return subscription_data_subscriptions_local_var; diff --git a/lib/sbi/openapi/model/suggested_packet_num_dl.c b/lib/sbi/openapi/model/suggested_packet_num_dl.c index 9383b74b7..7dfe46c53 100644 --- a/lib/sbi/openapi/model/suggested_packet_num_dl.c +++ b/lib/sbi/openapi/model/suggested_packet_num_dl.c @@ -9,10 +9,9 @@ OpenAPI_suggested_packet_num_dl_t *OpenAPI_suggested_packet_num_dl_create( char *validity_time ) { - OpenAPI_suggested_packet_num_dl_t *suggested_packet_num_dl_local_var = OpenAPI_malloc(sizeof(OpenAPI_suggested_packet_num_dl_t)); - if (!suggested_packet_num_dl_local_var) { - return NULL; - } + OpenAPI_suggested_packet_num_dl_t *suggested_packet_num_dl_local_var = ogs_malloc(sizeof(OpenAPI_suggested_packet_num_dl_t)); + ogs_assert(suggested_packet_num_dl_local_var); + suggested_packet_num_dl_local_var->suggested_packet_num_dl = suggested_packet_num_dl; suggested_packet_num_dl_local_var->validity_time = validity_time; @@ -81,7 +80,7 @@ OpenAPI_suggested_packet_num_dl_t *OpenAPI_suggested_packet_num_dl_parseFromJSON suggested_packet_num_dl_local_var = OpenAPI_suggested_packet_num_dl_create ( suggested_packet_num_dl->valuedouble, - validity_time ? ogs_strdup_or_assert(validity_time->valuestring) : NULL + validity_time ? ogs_strdup(validity_time->valuestring) : NULL ); return suggested_packet_num_dl_local_var; diff --git a/lib/sbi/openapi/model/suggested_packet_num_dl_1.c b/lib/sbi/openapi/model/suggested_packet_num_dl_1.c index 2333f80a0..617d46422 100644 --- a/lib/sbi/openapi/model/suggested_packet_num_dl_1.c +++ b/lib/sbi/openapi/model/suggested_packet_num_dl_1.c @@ -9,10 +9,9 @@ OpenAPI_suggested_packet_num_dl_1_t *OpenAPI_suggested_packet_num_dl_1_create( char *validity_time ) { - OpenAPI_suggested_packet_num_dl_1_t *suggested_packet_num_dl_1_local_var = OpenAPI_malloc(sizeof(OpenAPI_suggested_packet_num_dl_1_t)); - if (!suggested_packet_num_dl_1_local_var) { - return NULL; - } + OpenAPI_suggested_packet_num_dl_1_t *suggested_packet_num_dl_1_local_var = ogs_malloc(sizeof(OpenAPI_suggested_packet_num_dl_1_t)); + ogs_assert(suggested_packet_num_dl_1_local_var); + suggested_packet_num_dl_1_local_var->suggested_packet_num_dl = suggested_packet_num_dl; suggested_packet_num_dl_1_local_var->validity_time = validity_time; @@ -81,7 +80,7 @@ OpenAPI_suggested_packet_num_dl_1_t *OpenAPI_suggested_packet_num_dl_1_parseFrom suggested_packet_num_dl_1_local_var = OpenAPI_suggested_packet_num_dl_1_create ( suggested_packet_num_dl->valuedouble, - validity_time ? ogs_strdup_or_assert(validity_time->valuestring) : NULL + validity_time ? ogs_strdup(validity_time->valuestring) : NULL ); return suggested_packet_num_dl_1_local_var; diff --git a/lib/sbi/openapi/model/supi_range.c b/lib/sbi/openapi/model/supi_range.c index 1986bf9ce..3ba1100f2 100644 --- a/lib/sbi/openapi/model/supi_range.c +++ b/lib/sbi/openapi/model/supi_range.c @@ -10,10 +10,9 @@ OpenAPI_supi_range_t *OpenAPI_supi_range_create( char *pattern ) { - OpenAPI_supi_range_t *supi_range_local_var = OpenAPI_malloc(sizeof(OpenAPI_supi_range_t)); - if (!supi_range_local_var) { - return NULL; - } + OpenAPI_supi_range_t *supi_range_local_var = ogs_malloc(sizeof(OpenAPI_supi_range_t)); + ogs_assert(supi_range_local_var); + supi_range_local_var->start = start; supi_range_local_var->end = end; supi_range_local_var->pattern = pattern; @@ -99,9 +98,9 @@ OpenAPI_supi_range_t *OpenAPI_supi_range_parseFromJSON(cJSON *supi_rangeJSON) } supi_range_local_var = OpenAPI_supi_range_create ( - start ? ogs_strdup_or_assert(start->valuestring) : NULL, - end ? ogs_strdup_or_assert(end->valuestring) : NULL, - pattern ? ogs_strdup_or_assert(pattern->valuestring) : NULL + start ? ogs_strdup(start->valuestring) : NULL, + end ? ogs_strdup(end->valuestring) : NULL, + pattern ? ogs_strdup(pattern->valuestring) : NULL ); return supi_range_local_var; diff --git a/lib/sbi/openapi/model/supported_gad_shapes.c b/lib/sbi/openapi/model/supported_gad_shapes.c index 7271ba936..02c705f6b 100644 --- a/lib/sbi/openapi/model/supported_gad_shapes.c +++ b/lib/sbi/openapi/model/supported_gad_shapes.c @@ -7,10 +7,9 @@ OpenAPI_supported_gad_shapes_t *OpenAPI_supported_gad_shapes_create( ) { - OpenAPI_supported_gad_shapes_t *supported_gad_shapes_local_var = OpenAPI_malloc(sizeof(OpenAPI_supported_gad_shapes_t)); - if (!supported_gad_shapes_local_var) { - return NULL; - } + OpenAPI_supported_gad_shapes_t *supported_gad_shapes_local_var = ogs_malloc(sizeof(OpenAPI_supported_gad_shapes_t)); + ogs_assert(supported_gad_shapes_local_var); + return supported_gad_shapes_local_var; } diff --git a/lib/sbi/openapi/model/tac_info.c b/lib/sbi/openapi/model/tac_info.c index 0b3ebe41f..084efdf1b 100644 --- a/lib/sbi/openapi/model/tac_info.c +++ b/lib/sbi/openapi/model/tac_info.c @@ -8,10 +8,9 @@ OpenAPI_tac_info_t *OpenAPI_tac_info_create( OpenAPI_list_t *tac_list ) { - OpenAPI_tac_info_t *tac_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_tac_info_t)); - if (!tac_info_local_var) { - return NULL; - } + OpenAPI_tac_info_t *tac_info_local_var = ogs_malloc(sizeof(OpenAPI_tac_info_t)); + ogs_assert(tac_info_local_var); + tac_info_local_var->tac_list = tac_list; return tac_info_local_var; @@ -80,7 +79,7 @@ OpenAPI_tac_info_t *OpenAPI_tac_info_parseFromJSON(cJSON *tac_infoJSON) ogs_error("OpenAPI_tac_info_parseFromJSON() failed [tac_list]"); goto end; } - OpenAPI_list_add(tac_listList , ogs_strdup_or_assert(tac_list_local->valuestring)); + OpenAPI_list_add(tac_listList , ogs_strdup(tac_list_local->valuestring)); } tac_info_local_var = OpenAPI_tac_info_create ( diff --git a/lib/sbi/openapi/model/tac_range.c b/lib/sbi/openapi/model/tac_range.c index c5b764bf7..9a65d3940 100644 --- a/lib/sbi/openapi/model/tac_range.c +++ b/lib/sbi/openapi/model/tac_range.c @@ -10,10 +10,9 @@ OpenAPI_tac_range_t *OpenAPI_tac_range_create( char *pattern ) { - OpenAPI_tac_range_t *tac_range_local_var = OpenAPI_malloc(sizeof(OpenAPI_tac_range_t)); - if (!tac_range_local_var) { - return NULL; - } + OpenAPI_tac_range_t *tac_range_local_var = ogs_malloc(sizeof(OpenAPI_tac_range_t)); + ogs_assert(tac_range_local_var); + tac_range_local_var->start = start; tac_range_local_var->end = end; tac_range_local_var->pattern = pattern; @@ -99,9 +98,9 @@ OpenAPI_tac_range_t *OpenAPI_tac_range_parseFromJSON(cJSON *tac_rangeJSON) } tac_range_local_var = OpenAPI_tac_range_create ( - start ? ogs_strdup_or_assert(start->valuestring) : NULL, - end ? ogs_strdup_or_assert(end->valuestring) : NULL, - pattern ? ogs_strdup_or_assert(pattern->valuestring) : NULL + start ? ogs_strdup(start->valuestring) : NULL, + end ? ogs_strdup(end->valuestring) : NULL, + pattern ? ogs_strdup(pattern->valuestring) : NULL ); return tac_range_local_var; diff --git a/lib/sbi/openapi/model/tai.c b/lib/sbi/openapi/model/tai.c index 7eb749159..38fb01cdd 100644 --- a/lib/sbi/openapi/model/tai.c +++ b/lib/sbi/openapi/model/tai.c @@ -10,10 +10,9 @@ OpenAPI_tai_t *OpenAPI_tai_create( char *nid ) { - OpenAPI_tai_t *tai_local_var = OpenAPI_malloc(sizeof(OpenAPI_tai_t)); - if (!tai_local_var) { - return NULL; - } + OpenAPI_tai_t *tai_local_var = ogs_malloc(sizeof(OpenAPI_tai_t)); + ogs_assert(tai_local_var); + tai_local_var->plmn_id = plmn_id; tai_local_var->tac = tac; tai_local_var->nid = nid; @@ -104,8 +103,8 @@ OpenAPI_tai_t *OpenAPI_tai_parseFromJSON(cJSON *taiJSON) tai_local_var = OpenAPI_tai_create ( plmn_id_local_nonprim, - ogs_strdup_or_assert(tac->valuestring), - nid ? ogs_strdup_or_assert(nid->valuestring) : NULL + ogs_strdup(tac->valuestring), + nid ? ogs_strdup(nid->valuestring) : NULL ); return tai_local_var; diff --git a/lib/sbi/openapi/model/tai_1.c b/lib/sbi/openapi/model/tai_1.c index 10695aa97..fc2ee44da 100644 --- a/lib/sbi/openapi/model/tai_1.c +++ b/lib/sbi/openapi/model/tai_1.c @@ -10,10 +10,9 @@ OpenAPI_tai_1_t *OpenAPI_tai_1_create( char *nid ) { - OpenAPI_tai_1_t *tai_1_local_var = OpenAPI_malloc(sizeof(OpenAPI_tai_1_t)); - if (!tai_1_local_var) { - return NULL; - } + OpenAPI_tai_1_t *tai_1_local_var = ogs_malloc(sizeof(OpenAPI_tai_1_t)); + ogs_assert(tai_1_local_var); + tai_1_local_var->plmn_id = plmn_id; tai_1_local_var->tac = tac; tai_1_local_var->nid = nid; @@ -104,8 +103,8 @@ OpenAPI_tai_1_t *OpenAPI_tai_1_parseFromJSON(cJSON *tai_1JSON) tai_1_local_var = OpenAPI_tai_1_create ( plmn_id_local_nonprim, - ogs_strdup_or_assert(tac->valuestring), - nid ? ogs_strdup_or_assert(nid->valuestring) : NULL + ogs_strdup(tac->valuestring), + nid ? ogs_strdup(nid->valuestring) : NULL ); return tai_1_local_var; diff --git a/lib/sbi/openapi/model/tai_range.c b/lib/sbi/openapi/model/tai_range.c index 8c416c1da..ce1ff7835 100644 --- a/lib/sbi/openapi/model/tai_range.c +++ b/lib/sbi/openapi/model/tai_range.c @@ -10,10 +10,9 @@ OpenAPI_tai_range_t *OpenAPI_tai_range_create( char *nid ) { - OpenAPI_tai_range_t *tai_range_local_var = OpenAPI_malloc(sizeof(OpenAPI_tai_range_t)); - if (!tai_range_local_var) { - return NULL; - } + OpenAPI_tai_range_t *tai_range_local_var = ogs_malloc(sizeof(OpenAPI_tai_range_t)); + ogs_assert(tai_range_local_var); + tai_range_local_var->plmn_id = plmn_id; tai_range_local_var->tac_range_list = tac_range_list; tai_range_local_var->nid = nid; @@ -135,7 +134,7 @@ OpenAPI_tai_range_t *OpenAPI_tai_range_parseFromJSON(cJSON *tai_rangeJSON) tai_range_local_var = OpenAPI_tai_range_create ( plmn_id_local_nonprim, tac_range_listList, - nid ? ogs_strdup_or_assert(nid->valuestring) : NULL + nid ? ogs_strdup(nid->valuestring) : NULL ); return tai_range_local_var; diff --git a/lib/sbi/openapi/model/temporal_validity.c b/lib/sbi/openapi/model/temporal_validity.c index 90b0dd418..fc5ad230a 100644 --- a/lib/sbi/openapi/model/temporal_validity.c +++ b/lib/sbi/openapi/model/temporal_validity.c @@ -9,10 +9,9 @@ OpenAPI_temporal_validity_t *OpenAPI_temporal_validity_create( char *stop_time ) { - OpenAPI_temporal_validity_t *temporal_validity_local_var = OpenAPI_malloc(sizeof(OpenAPI_temporal_validity_t)); - if (!temporal_validity_local_var) { - return NULL; - } + OpenAPI_temporal_validity_t *temporal_validity_local_var = ogs_malloc(sizeof(OpenAPI_temporal_validity_t)); + ogs_assert(temporal_validity_local_var); + temporal_validity_local_var->start_time = start_time; temporal_validity_local_var->stop_time = stop_time; @@ -80,8 +79,8 @@ OpenAPI_temporal_validity_t *OpenAPI_temporal_validity_parseFromJSON(cJSON *temp } temporal_validity_local_var = OpenAPI_temporal_validity_create ( - start_time ? ogs_strdup_or_assert(start_time->valuestring) : NULL, - stop_time ? ogs_strdup_or_assert(stop_time->valuestring) : NULL + start_time ? ogs_strdup(start_time->valuestring) : NULL, + stop_time ? ogs_strdup(stop_time->valuestring) : NULL ); return temporal_validity_local_var; diff --git a/lib/sbi/openapi/model/termination_info.c b/lib/sbi/openapi/model/termination_info.c index 9bcb003af..beeb19b95 100644 --- a/lib/sbi/openapi/model/termination_info.c +++ b/lib/sbi/openapi/model/termination_info.c @@ -9,10 +9,9 @@ OpenAPI_termination_info_t *OpenAPI_termination_info_create( char *res_uri ) { - OpenAPI_termination_info_t *termination_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_termination_info_t)); - if (!termination_info_local_var) { - return NULL; - } + OpenAPI_termination_info_t *termination_info_local_var = ogs_malloc(sizeof(OpenAPI_termination_info_t)); + ogs_assert(termination_info_local_var); + termination_info_local_var->term_cause = term_cause; termination_info_local_var->res_uri = res_uri; @@ -82,7 +81,7 @@ OpenAPI_termination_info_t *OpenAPI_termination_info_parseFromJSON(cJSON *termin termination_info_local_var = OpenAPI_termination_info_create ( term_causeVariable, - ogs_strdup_or_assert(res_uri->valuestring) + ogs_strdup(res_uri->valuestring) ); return termination_info_local_var; diff --git a/lib/sbi/openapi/model/termination_notification.c b/lib/sbi/openapi/model/termination_notification.c index 7bca9ad41..54bbd02dd 100644 --- a/lib/sbi/openapi/model/termination_notification.c +++ b/lib/sbi/openapi/model/termination_notification.c @@ -9,10 +9,9 @@ OpenAPI_termination_notification_t *OpenAPI_termination_notification_create( OpenAPI_sm_policy_association_release_cause_e cause ) { - OpenAPI_termination_notification_t *termination_notification_local_var = OpenAPI_malloc(sizeof(OpenAPI_termination_notification_t)); - if (!termination_notification_local_var) { - return NULL; - } + OpenAPI_termination_notification_t *termination_notification_local_var = ogs_malloc(sizeof(OpenAPI_termination_notification_t)); + ogs_assert(termination_notification_local_var); + termination_notification_local_var->resource_uri = resource_uri; termination_notification_local_var->cause = cause; @@ -81,7 +80,7 @@ OpenAPI_termination_notification_t *OpenAPI_termination_notification_parseFromJS causeVariable = OpenAPI_sm_policy_association_release_cause_FromString(cause->valuestring); termination_notification_local_var = OpenAPI_termination_notification_create ( - ogs_strdup_or_assert(resource_uri->valuestring), + ogs_strdup(resource_uri->valuestring), causeVariable ); diff --git a/lib/sbi/openapi/model/time_period.c b/lib/sbi/openapi/model/time_period.c index 01c3b4ee9..0afc9a76f 100644 --- a/lib/sbi/openapi/model/time_period.c +++ b/lib/sbi/openapi/model/time_period.c @@ -10,10 +10,9 @@ OpenAPI_time_period_t *OpenAPI_time_period_create( int max_num_period ) { - OpenAPI_time_period_t *time_period_local_var = OpenAPI_malloc(sizeof(OpenAPI_time_period_t)); - if (!time_period_local_var) { - return NULL; - } + OpenAPI_time_period_t *time_period_local_var = ogs_malloc(sizeof(OpenAPI_time_period_t)); + ogs_assert(time_period_local_var); + time_period_local_var->period = period; time_period_local_var->is_max_num_period = is_max_num_period; time_period_local_var->max_num_period = max_num_period; diff --git a/lib/sbi/openapi/model/time_window.c b/lib/sbi/openapi/model/time_window.c index 3d4dab93d..b7bdb4066 100644 --- a/lib/sbi/openapi/model/time_window.c +++ b/lib/sbi/openapi/model/time_window.c @@ -9,10 +9,9 @@ OpenAPI_time_window_t *OpenAPI_time_window_create( char *stop_time ) { - OpenAPI_time_window_t *time_window_local_var = OpenAPI_malloc(sizeof(OpenAPI_time_window_t)); - if (!time_window_local_var) { - return NULL; - } + OpenAPI_time_window_t *time_window_local_var = ogs_malloc(sizeof(OpenAPI_time_window_t)); + ogs_assert(time_window_local_var); + time_window_local_var->start_time = start_time; time_window_local_var->stop_time = stop_time; @@ -80,8 +79,8 @@ OpenAPI_time_window_t *OpenAPI_time_window_parseFromJSON(cJSON *time_windowJSON) } time_window_local_var = OpenAPI_time_window_create ( - ogs_strdup_or_assert(start_time->valuestring), - ogs_strdup_or_assert(stop_time->valuestring) + ogs_strdup(start_time->valuestring), + ogs_strdup(stop_time->valuestring) ); return time_window_local_var; diff --git a/lib/sbi/openapi/model/tnap_id.c b/lib/sbi/openapi/model/tnap_id.c index cbf3603cc..3b17074b7 100644 --- a/lib/sbi/openapi/model/tnap_id.c +++ b/lib/sbi/openapi/model/tnap_id.c @@ -10,10 +10,9 @@ OpenAPI_tnap_id_t *OpenAPI_tnap_id_create( char civic_address ) { - OpenAPI_tnap_id_t *tnap_id_local_var = OpenAPI_malloc(sizeof(OpenAPI_tnap_id_t)); - if (!tnap_id_local_var) { - return NULL; - } + OpenAPI_tnap_id_t *tnap_id_local_var = ogs_malloc(sizeof(OpenAPI_tnap_id_t)); + ogs_assert(tnap_id_local_var); + tnap_id_local_var->ss_id = ss_id; tnap_id_local_var->bss_id = bss_id; tnap_id_local_var->civic_address = civic_address; @@ -98,8 +97,8 @@ OpenAPI_tnap_id_t *OpenAPI_tnap_id_parseFromJSON(cJSON *tnap_idJSON) } tnap_id_local_var = OpenAPI_tnap_id_create ( - ss_id ? ogs_strdup_or_assert(ss_id->valuestring) : NULL, - bss_id ? ogs_strdup_or_assert(bss_id->valuestring) : NULL, + ss_id ? ogs_strdup(ss_id->valuestring) : NULL, + bss_id ? ogs_strdup(bss_id->valuestring) : NULL, civic_address ? civic_address->valueint : 0 ); diff --git a/lib/sbi/openapi/model/tngf_info.c b/lib/sbi/openapi/model/tngf_info.c index 853728cd1..007c547b9 100644 --- a/lib/sbi/openapi/model/tngf_info.c +++ b/lib/sbi/openapi/model/tngf_info.c @@ -10,10 +10,9 @@ OpenAPI_tngf_info_t *OpenAPI_tngf_info_create( char *endpoint_fqdn ) { - OpenAPI_tngf_info_t *tngf_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_tngf_info_t)); - if (!tngf_info_local_var) { - return NULL; - } + OpenAPI_tngf_info_t *tngf_info_local_var = ogs_malloc(sizeof(OpenAPI_tngf_info_t)); + ogs_assert(tngf_info_local_var); + tngf_info_local_var->ipv4_endpoint_addresses = ipv4_endpoint_addresses; tngf_info_local_var->ipv6_endpoint_addresses = ipv6_endpoint_addresses; tngf_info_local_var->endpoint_fqdn = endpoint_fqdn; @@ -111,7 +110,7 @@ OpenAPI_tngf_info_t *OpenAPI_tngf_info_parseFromJSON(cJSON *tngf_infoJSON) ogs_error("OpenAPI_tngf_info_parseFromJSON() failed [ipv4_endpoint_addresses]"); goto end; } - OpenAPI_list_add(ipv4_endpoint_addressesList , ogs_strdup_or_assert(ipv4_endpoint_addresses_local->valuestring)); + OpenAPI_list_add(ipv4_endpoint_addressesList , ogs_strdup(ipv4_endpoint_addresses_local->valuestring)); } } @@ -131,7 +130,7 @@ OpenAPI_tngf_info_t *OpenAPI_tngf_info_parseFromJSON(cJSON *tngf_infoJSON) ogs_error("OpenAPI_tngf_info_parseFromJSON() failed [ipv6_endpoint_addresses]"); goto end; } - OpenAPI_list_add(ipv6_endpoint_addressesList , ogs_strdup_or_assert(ipv6_endpoint_addresses_local->valuestring)); + OpenAPI_list_add(ipv6_endpoint_addressesList , ogs_strdup(ipv6_endpoint_addresses_local->valuestring)); } } @@ -147,7 +146,7 @@ OpenAPI_tngf_info_t *OpenAPI_tngf_info_parseFromJSON(cJSON *tngf_infoJSON) tngf_info_local_var = OpenAPI_tngf_info_create ( ipv4_endpoint_addresses ? ipv4_endpoint_addressesList : NULL, ipv6_endpoint_addresses ? ipv6_endpoint_addressesList : NULL, - endpoint_fqdn ? ogs_strdup_or_assert(endpoint_fqdn->valuestring) : NULL + endpoint_fqdn ? ogs_strdup(endpoint_fqdn->valuestring) : NULL ); return tngf_info_local_var; diff --git a/lib/sbi/openapi/model/trace_data.c b/lib/sbi/openapi/model/trace_data.c index f9b711eb0..453a405fb 100644 --- a/lib/sbi/openapi/model/trace_data.c +++ b/lib/sbi/openapi/model/trace_data.c @@ -14,10 +14,9 @@ OpenAPI_trace_data_t *OpenAPI_trace_data_create( char *interface_list ) { - OpenAPI_trace_data_t *trace_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_trace_data_t)); - if (!trace_data_local_var) { - return NULL; - } + OpenAPI_trace_data_t *trace_data_local_var = ogs_malloc(sizeof(OpenAPI_trace_data_t)); + ogs_assert(trace_data_local_var); + trace_data_local_var->trace_ref = trace_ref; trace_data_local_var->trace_depth = trace_depth; trace_data_local_var->ne_type_list = ne_type_list; @@ -176,13 +175,13 @@ OpenAPI_trace_data_t *OpenAPI_trace_data_parseFromJSON(cJSON *trace_dataJSON) } trace_data_local_var = OpenAPI_trace_data_create ( - ogs_strdup_or_assert(trace_ref->valuestring), + ogs_strdup(trace_ref->valuestring), trace_depthVariable, - ogs_strdup_or_assert(ne_type_list->valuestring), - ogs_strdup_or_assert(event_list->valuestring), - collection_entity_ipv4_addr ? ogs_strdup_or_assert(collection_entity_ipv4_addr->valuestring) : NULL, - collection_entity_ipv6_addr ? ogs_strdup_or_assert(collection_entity_ipv6_addr->valuestring) : NULL, - interface_list ? ogs_strdup_or_assert(interface_list->valuestring) : NULL + ogs_strdup(ne_type_list->valuestring), + ogs_strdup(event_list->valuestring), + collection_entity_ipv4_addr ? ogs_strdup(collection_entity_ipv4_addr->valuestring) : NULL, + collection_entity_ipv6_addr ? ogs_strdup(collection_entity_ipv6_addr->valuestring) : NULL, + interface_list ? ogs_strdup(interface_list->valuestring) : NULL ); return trace_data_local_var; diff --git a/lib/sbi/openapi/model/trace_data_1.c b/lib/sbi/openapi/model/trace_data_1.c index f7850c758..842ec5f20 100644 --- a/lib/sbi/openapi/model/trace_data_1.c +++ b/lib/sbi/openapi/model/trace_data_1.c @@ -14,10 +14,9 @@ OpenAPI_trace_data_1_t *OpenAPI_trace_data_1_create( char *interface_list ) { - OpenAPI_trace_data_1_t *trace_data_1_local_var = OpenAPI_malloc(sizeof(OpenAPI_trace_data_1_t)); - if (!trace_data_1_local_var) { - return NULL; - } + OpenAPI_trace_data_1_t *trace_data_1_local_var = ogs_malloc(sizeof(OpenAPI_trace_data_1_t)); + ogs_assert(trace_data_1_local_var); + trace_data_1_local_var->trace_ref = trace_ref; trace_data_1_local_var->trace_depth = trace_depth; trace_data_1_local_var->ne_type_list = ne_type_list; @@ -176,13 +175,13 @@ OpenAPI_trace_data_1_t *OpenAPI_trace_data_1_parseFromJSON(cJSON *trace_data_1JS } trace_data_1_local_var = OpenAPI_trace_data_1_create ( - ogs_strdup_or_assert(trace_ref->valuestring), + ogs_strdup(trace_ref->valuestring), trace_depthVariable, - ogs_strdup_or_assert(ne_type_list->valuestring), - ogs_strdup_or_assert(event_list->valuestring), - collection_entity_ipv4_addr ? ogs_strdup_or_assert(collection_entity_ipv4_addr->valuestring) : NULL, - collection_entity_ipv6_addr ? ogs_strdup_or_assert(collection_entity_ipv6_addr->valuestring) : NULL, - interface_list ? ogs_strdup_or_assert(interface_list->valuestring) : NULL + ogs_strdup(ne_type_list->valuestring), + ogs_strdup(event_list->valuestring), + collection_entity_ipv4_addr ? ogs_strdup(collection_entity_ipv4_addr->valuestring) : NULL, + collection_entity_ipv6_addr ? ogs_strdup(collection_entity_ipv6_addr->valuestring) : NULL, + interface_list ? ogs_strdup(interface_list->valuestring) : NULL ); return trace_data_1_local_var; diff --git a/lib/sbi/openapi/model/trace_data_response.c b/lib/sbi/openapi/model/trace_data_response.c index 5a7d58ae1..f66ef3ee4 100644 --- a/lib/sbi/openapi/model/trace_data_response.c +++ b/lib/sbi/openapi/model/trace_data_response.c @@ -9,10 +9,9 @@ OpenAPI_trace_data_response_t *OpenAPI_trace_data_response_create( char *shared_trace_data_id ) { - OpenAPI_trace_data_response_t *trace_data_response_local_var = OpenAPI_malloc(sizeof(OpenAPI_trace_data_response_t)); - if (!trace_data_response_local_var) { - return NULL; - } + OpenAPI_trace_data_response_t *trace_data_response_local_var = ogs_malloc(sizeof(OpenAPI_trace_data_response_t)); + ogs_assert(trace_data_response_local_var); + trace_data_response_local_var->trace_data = trace_data; trace_data_response_local_var->shared_trace_data_id = shared_trace_data_id; @@ -85,7 +84,7 @@ OpenAPI_trace_data_response_t *OpenAPI_trace_data_response_parseFromJSON(cJSON * trace_data_response_local_var = OpenAPI_trace_data_response_create ( trace_data ? trace_data_local_nonprim : NULL, - shared_trace_data_id ? ogs_strdup_or_assert(shared_trace_data_id->valuestring) : NULL + shared_trace_data_id ? ogs_strdup(shared_trace_data_id->valuestring) : NULL ); return trace_data_response_local_var; diff --git a/lib/sbi/openapi/model/traffic_control_data.c b/lib/sbi/openapi/model/traffic_control_data.c index ff8c5f750..332f8cf02 100644 --- a/lib/sbi/openapi/model/traffic_control_data.c +++ b/lib/sbi/openapi/model/traffic_control_data.c @@ -23,10 +23,9 @@ OpenAPI_traffic_control_data_t *OpenAPI_traffic_control_data_create( OpenAPI_multicast_access_control_t *mul_acc_ctrl ) { - OpenAPI_traffic_control_data_t *traffic_control_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_traffic_control_data_t)); - if (!traffic_control_data_local_var) { - return NULL; - } + OpenAPI_traffic_control_data_t *traffic_control_data_local_var = ogs_malloc(sizeof(OpenAPI_traffic_control_data_t)); + ogs_assert(traffic_control_data_local_var); + traffic_control_data_local_var->tc_id = tc_id; traffic_control_data_local_var->flow_status = flow_status; traffic_control_data_local_var->redirect_info = redirect_info; @@ -392,14 +391,14 @@ OpenAPI_traffic_control_data_t *OpenAPI_traffic_control_data_parseFromJSON(cJSON } traffic_control_data_local_var = OpenAPI_traffic_control_data_create ( - ogs_strdup_or_assert(tc_id->valuestring), + ogs_strdup(tc_id->valuestring), flow_status ? flow_statusVariable : 0, redirect_info ? redirect_info_local_nonprim : NULL, add_redirect_info ? add_redirect_infoList : NULL, mute_notif ? true : false, mute_notif ? mute_notif->valueint : 0, - traffic_steering_pol_id_dl ? ogs_strdup_or_assert(traffic_steering_pol_id_dl->valuestring) : NULL, - traffic_steering_pol_id_ul ? ogs_strdup_or_assert(traffic_steering_pol_id_ul->valuestring) : NULL, + traffic_steering_pol_id_dl ? ogs_strdup(traffic_steering_pol_id_dl->valuestring) : NULL, + traffic_steering_pol_id_ul ? ogs_strdup(traffic_steering_pol_id_ul->valuestring) : NULL, route_to_locs ? route_to_locsList : NULL, traff_corre_ind ? true : false, traff_corre_ind ? traff_corre_ind->valueint : 0, diff --git a/lib/sbi/openapi/model/traffic_descriptor.c b/lib/sbi/openapi/model/traffic_descriptor.c index 70d18c6ff..80777bc58 100644 --- a/lib/sbi/openapi/model/traffic_descriptor.c +++ b/lib/sbi/openapi/model/traffic_descriptor.c @@ -10,10 +10,9 @@ OpenAPI_traffic_descriptor_t *OpenAPI_traffic_descriptor_create( OpenAPI_list_t *ddd_traffic_descriptor_list ) { - OpenAPI_traffic_descriptor_t *traffic_descriptor_local_var = OpenAPI_malloc(sizeof(OpenAPI_traffic_descriptor_t)); - if (!traffic_descriptor_local_var) { - return NULL; - } + OpenAPI_traffic_descriptor_t *traffic_descriptor_local_var = ogs_malloc(sizeof(OpenAPI_traffic_descriptor_t)); + ogs_assert(traffic_descriptor_local_var); + traffic_descriptor_local_var->dnn = dnn; traffic_descriptor_local_var->s_nssai = s_nssai; traffic_descriptor_local_var->ddd_traffic_descriptor_list = ddd_traffic_descriptor_list; @@ -133,7 +132,7 @@ OpenAPI_traffic_descriptor_t *OpenAPI_traffic_descriptor_parseFromJSON(cJSON *tr } traffic_descriptor_local_var = OpenAPI_traffic_descriptor_create ( - dnn ? ogs_strdup_or_assert(dnn->valuestring) : NULL, + dnn ? ogs_strdup(dnn->valuestring) : NULL, s_nssai ? s_nssai_local_nonprim : NULL, ddd_traffic_descriptor_list ? ddd_traffic_descriptor_listList : NULL ); diff --git a/lib/sbi/openapi/model/traffic_influ_data.c b/lib/sbi/openapi/model/traffic_influ_data.c index 9ec3b3de4..379c4253d 100644 --- a/lib/sbi/openapi/model/traffic_influ_data.c +++ b/lib/sbi/openapi/model/traffic_influ_data.c @@ -34,10 +34,9 @@ OpenAPI_traffic_influ_data_t *OpenAPI_traffic_influ_data_create( char *res_uri ) { - OpenAPI_traffic_influ_data_t *traffic_influ_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_traffic_influ_data_t)); - if (!traffic_influ_data_local_var) { - return NULL; - } + OpenAPI_traffic_influ_data_t *traffic_influ_data_local_var = ogs_malloc(sizeof(OpenAPI_traffic_influ_data_t)); + ogs_assert(traffic_influ_data_local_var); + traffic_influ_data_local_var->up_path_chg_notif_corre_id = up_path_chg_notif_corre_id; traffic_influ_data_local_var->is_app_relo_ind = is_app_relo_ind; traffic_influ_data_local_var->app_relo_ind = app_relo_ind; @@ -590,7 +589,7 @@ OpenAPI_traffic_influ_data_t *OpenAPI_traffic_influ_data_parseFromJSON(cJSON *tr ogs_error("OpenAPI_traffic_influ_data_parseFromJSON() failed [headers]"); goto end; } - OpenAPI_list_add(headersList , ogs_strdup_or_assert(headers_local->valuestring)); + OpenAPI_list_add(headersList , ogs_strdup(headers_local->valuestring)); } } @@ -665,24 +664,24 @@ OpenAPI_traffic_influ_data_t *OpenAPI_traffic_influ_data_parseFromJSON(cJSON *tr } traffic_influ_data_local_var = OpenAPI_traffic_influ_data_create ( - up_path_chg_notif_corre_id ? ogs_strdup_or_assert(up_path_chg_notif_corre_id->valuestring) : NULL, + up_path_chg_notif_corre_id ? ogs_strdup(up_path_chg_notif_corre_id->valuestring) : NULL, app_relo_ind ? true : false, app_relo_ind ? app_relo_ind->valueint : 0, - af_app_id ? ogs_strdup_or_assert(af_app_id->valuestring) : NULL, - dnn ? ogs_strdup_or_assert(dnn->valuestring) : NULL, + af_app_id ? ogs_strdup(af_app_id->valuestring) : NULL, + dnn ? ogs_strdup(dnn->valuestring) : NULL, eth_traffic_filters ? eth_traffic_filtersList : NULL, snssai ? snssai_local_nonprim : NULL, - inter_group_id ? ogs_strdup_or_assert(inter_group_id->valuestring) : NULL, - supi ? ogs_strdup_or_assert(supi->valuestring) : NULL, + inter_group_id ? ogs_strdup(inter_group_id->valuestring) : NULL, + supi ? ogs_strdup(supi->valuestring) : NULL, traffic_filters ? traffic_filtersList : NULL, traffic_routes ? traffic_routesList : NULL, traff_corre_ind ? true : false, traff_corre_ind ? traff_corre_ind->valueint : 0, - valid_start_time ? ogs_strdup_or_assert(valid_start_time->valuestring) : NULL, - valid_end_time ? ogs_strdup_or_assert(valid_end_time->valuestring) : NULL, + valid_start_time ? ogs_strdup(valid_start_time->valuestring) : NULL, + valid_end_time ? ogs_strdup(valid_end_time->valuestring) : NULL, temp_validities ? temp_validitiesList : NULL, nw_area_info ? nw_area_info_local_nonprim : NULL, - up_path_chg_notif_uri ? ogs_strdup_or_assert(up_path_chg_notif_uri->valuestring) : NULL, + up_path_chg_notif_uri ? ogs_strdup(up_path_chg_notif_uri->valuestring) : NULL, headers ? headersList : NULL, subscribed_events ? subscribed_eventsList : NULL, dnai_chg_type ? dnai_chg_typeVariable : 0, @@ -690,8 +689,8 @@ OpenAPI_traffic_influ_data_t *OpenAPI_traffic_influ_data_parseFromJSON(cJSON *tr af_ack_ind ? af_ack_ind->valueint : 0, addr_preser_ind ? true : false, addr_preser_ind ? addr_preser_ind->valueint : 0, - supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, - res_uri ? ogs_strdup_or_assert(res_uri->valuestring) : NULL + supported_features ? ogs_strdup(supported_features->valuestring) : NULL, + res_uri ? ogs_strdup(res_uri->valuestring) : NULL ); return traffic_influ_data_local_var; diff --git a/lib/sbi/openapi/model/traffic_influ_data_notif.c b/lib/sbi/openapi/model/traffic_influ_data_notif.c index 8f8b6bd47..f92376f64 100644 --- a/lib/sbi/openapi/model/traffic_influ_data_notif.c +++ b/lib/sbi/openapi/model/traffic_influ_data_notif.c @@ -9,10 +9,9 @@ OpenAPI_traffic_influ_data_notif_t *OpenAPI_traffic_influ_data_notif_create( OpenAPI_traffic_influ_data_t *traffic_influ_data ) { - OpenAPI_traffic_influ_data_notif_t *traffic_influ_data_notif_local_var = OpenAPI_malloc(sizeof(OpenAPI_traffic_influ_data_notif_t)); - if (!traffic_influ_data_notif_local_var) { - return NULL; - } + OpenAPI_traffic_influ_data_notif_t *traffic_influ_data_notif_local_var = ogs_malloc(sizeof(OpenAPI_traffic_influ_data_notif_t)); + ogs_assert(traffic_influ_data_notif_local_var); + traffic_influ_data_notif_local_var->res_uri = res_uri; traffic_influ_data_notif_local_var->traffic_influ_data = traffic_influ_data; @@ -84,7 +83,7 @@ OpenAPI_traffic_influ_data_notif_t *OpenAPI_traffic_influ_data_notif_parseFromJS } traffic_influ_data_notif_local_var = OpenAPI_traffic_influ_data_notif_create ( - ogs_strdup_or_assert(res_uri->valuestring), + ogs_strdup(res_uri->valuestring), traffic_influ_data ? traffic_influ_data_local_nonprim : NULL ); diff --git a/lib/sbi/openapi/model/traffic_influ_data_patch.c b/lib/sbi/openapi/model/traffic_influ_data_patch.c index 9d4097889..edfcd29b4 100644 --- a/lib/sbi/openapi/model/traffic_influ_data_patch.c +++ b/lib/sbi/openapi/model/traffic_influ_data_patch.c @@ -29,10 +29,9 @@ OpenAPI_traffic_influ_data_patch_t *OpenAPI_traffic_influ_data_patch_create( int addr_preser_ind ) { - OpenAPI_traffic_influ_data_patch_t *traffic_influ_data_patch_local_var = OpenAPI_malloc(sizeof(OpenAPI_traffic_influ_data_patch_t)); - if (!traffic_influ_data_patch_local_var) { - return NULL; - } + OpenAPI_traffic_influ_data_patch_t *traffic_influ_data_patch_local_var = ogs_malloc(sizeof(OpenAPI_traffic_influ_data_patch_t)); + ogs_assert(traffic_influ_data_patch_local_var); + traffic_influ_data_patch_local_var->up_path_chg_notif_corre_id = up_path_chg_notif_corre_id; traffic_influ_data_patch_local_var->is_app_relo_ind = is_app_relo_ind; traffic_influ_data_patch_local_var->app_relo_ind = app_relo_ind; @@ -516,7 +515,7 @@ OpenAPI_traffic_influ_data_patch_t *OpenAPI_traffic_influ_data_patch_parseFromJS ogs_error("OpenAPI_traffic_influ_data_patch_parseFromJSON() failed [headers]"); goto end; } - OpenAPI_list_add(headersList , ogs_strdup_or_assert(headers_local->valuestring)); + OpenAPI_list_add(headersList , ogs_strdup(headers_local->valuestring)); } } @@ -539,23 +538,23 @@ OpenAPI_traffic_influ_data_patch_t *OpenAPI_traffic_influ_data_patch_parseFromJS } traffic_influ_data_patch_local_var = OpenAPI_traffic_influ_data_patch_create ( - up_path_chg_notif_corre_id ? ogs_strdup_or_assert(up_path_chg_notif_corre_id->valuestring) : NULL, + up_path_chg_notif_corre_id ? ogs_strdup(up_path_chg_notif_corre_id->valuestring) : NULL, app_relo_ind ? true : false, app_relo_ind ? app_relo_ind->valueint : 0, - dnn ? ogs_strdup_or_assert(dnn->valuestring) : NULL, + dnn ? ogs_strdup(dnn->valuestring) : NULL, eth_traffic_filters ? eth_traffic_filtersList : NULL, snssai ? snssai_local_nonprim : NULL, - internal_group_id ? ogs_strdup_or_assert(internal_group_id->valuestring) : NULL, - supi ? ogs_strdup_or_assert(supi->valuestring) : NULL, + internal_group_id ? ogs_strdup(internal_group_id->valuestring) : NULL, + supi ? ogs_strdup(supi->valuestring) : NULL, traffic_filters ? traffic_filtersList : NULL, traffic_routes ? traffic_routesList : NULL, traff_corre_ind ? true : false, traff_corre_ind ? traff_corre_ind->valueint : 0, - valid_start_time ? ogs_strdup_or_assert(valid_start_time->valuestring) : NULL, - valid_end_time ? ogs_strdup_or_assert(valid_end_time->valuestring) : NULL, + valid_start_time ? ogs_strdup(valid_start_time->valuestring) : NULL, + valid_end_time ? ogs_strdup(valid_end_time->valuestring) : NULL, temp_validities ? temp_validitiesList : NULL, nw_area_info ? nw_area_info_local_nonprim : NULL, - up_path_chg_notif_uri ? ogs_strdup_or_assert(up_path_chg_notif_uri->valuestring) : NULL, + up_path_chg_notif_uri ? ogs_strdup(up_path_chg_notif_uri->valuestring) : NULL, headers ? headersList : NULL, af_ack_ind ? true : false, af_ack_ind ? af_ack_ind->valueint : 0, diff --git a/lib/sbi/openapi/model/traffic_influ_sub.c b/lib/sbi/openapi/model/traffic_influ_sub.c index 0b6a465fb..db687f8bd 100644 --- a/lib/sbi/openapi/model/traffic_influ_sub.c +++ b/lib/sbi/openapi/model/traffic_influ_sub.c @@ -14,10 +14,9 @@ OpenAPI_traffic_influ_sub_t *OpenAPI_traffic_influ_sub_create( char *supported_features ) { - OpenAPI_traffic_influ_sub_t *traffic_influ_sub_local_var = OpenAPI_malloc(sizeof(OpenAPI_traffic_influ_sub_t)); - if (!traffic_influ_sub_local_var) { - return NULL; - } + OpenAPI_traffic_influ_sub_t *traffic_influ_sub_local_var = ogs_malloc(sizeof(OpenAPI_traffic_influ_sub_t)); + ogs_assert(traffic_influ_sub_local_var); + traffic_influ_sub_local_var->dnns = dnns; traffic_influ_sub_local_var->snssais = snssais; traffic_influ_sub_local_var->internal_group_ids = internal_group_ids; @@ -177,7 +176,7 @@ OpenAPI_traffic_influ_sub_t *OpenAPI_traffic_influ_sub_parseFromJSON(cJSON *traf ogs_error("OpenAPI_traffic_influ_sub_parseFromJSON() failed [dnns]"); goto end; } - OpenAPI_list_add(dnnsList , ogs_strdup_or_assert(dnns_local->valuestring)); + OpenAPI_list_add(dnnsList , ogs_strdup(dnns_local->valuestring)); } } @@ -220,7 +219,7 @@ OpenAPI_traffic_influ_sub_t *OpenAPI_traffic_influ_sub_parseFromJSON(cJSON *traf ogs_error("OpenAPI_traffic_influ_sub_parseFromJSON() failed [internal_group_ids]"); goto end; } - OpenAPI_list_add(internal_group_idsList , ogs_strdup_or_assert(internal_group_ids_local->valuestring)); + OpenAPI_list_add(internal_group_idsList , ogs_strdup(internal_group_ids_local->valuestring)); } } @@ -240,7 +239,7 @@ OpenAPI_traffic_influ_sub_t *OpenAPI_traffic_influ_sub_parseFromJSON(cJSON *traf ogs_error("OpenAPI_traffic_influ_sub_parseFromJSON() failed [supis]"); goto end; } - OpenAPI_list_add(supisList , ogs_strdup_or_assert(supis_local->valuestring)); + OpenAPI_list_add(supisList , ogs_strdup(supis_local->valuestring)); } } @@ -278,9 +277,9 @@ OpenAPI_traffic_influ_sub_t *OpenAPI_traffic_influ_sub_parseFromJSON(cJSON *traf snssais ? snssaisList : NULL, internal_group_ids ? internal_group_idsList : NULL, supis ? supisList : NULL, - ogs_strdup_or_assert(notification_uri->valuestring), - expiry ? ogs_strdup_or_assert(expiry->valuestring) : NULL, - supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL + ogs_strdup(notification_uri->valuestring), + expiry ? ogs_strdup(expiry->valuestring) : NULL, + supported_features ? ogs_strdup(supported_features->valuestring) : NULL ); return traffic_influ_sub_local_var; diff --git a/lib/sbi/openapi/model/traffic_profile_rm.c b/lib/sbi/openapi/model/traffic_profile_rm.c index c07298cd1..a8ee35c1b 100644 --- a/lib/sbi/openapi/model/traffic_profile_rm.c +++ b/lib/sbi/openapi/model/traffic_profile_rm.c @@ -7,10 +7,9 @@ OpenAPI_traffic_profile_rm_t *OpenAPI_traffic_profile_rm_create( ) { - OpenAPI_traffic_profile_rm_t *traffic_profile_rm_local_var = OpenAPI_malloc(sizeof(OpenAPI_traffic_profile_rm_t)); - if (!traffic_profile_rm_local_var) { - return NULL; - } + OpenAPI_traffic_profile_rm_t *traffic_profile_rm_local_var = ogs_malloc(sizeof(OpenAPI_traffic_profile_rm_t)); + ogs_assert(traffic_profile_rm_local_var); + return traffic_profile_rm_local_var; } diff --git a/lib/sbi/openapi/model/transfer_mo_data_req_data.c b/lib/sbi/openapi/model/transfer_mo_data_req_data.c index 89090a67b..940c3da6e 100644 --- a/lib/sbi/openapi/model/transfer_mo_data_req_data.c +++ b/lib/sbi/openapi/model/transfer_mo_data_req_data.c @@ -10,10 +10,9 @@ OpenAPI_transfer_mo_data_req_data_t *OpenAPI_transfer_mo_data_req_data_create( OpenAPI_user_location_t *ue_location ) { - OpenAPI_transfer_mo_data_req_data_t *transfer_mo_data_req_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_transfer_mo_data_req_data_t)); - if (!transfer_mo_data_req_data_local_var) { - return NULL; - } + OpenAPI_transfer_mo_data_req_data_t *transfer_mo_data_req_data_local_var = ogs_malloc(sizeof(OpenAPI_transfer_mo_data_req_data_t)); + ogs_assert(transfer_mo_data_req_data_local_var); + transfer_mo_data_req_data_local_var->mo_data = mo_data; transfer_mo_data_req_data_local_var->mo_exp_data_counter = mo_exp_data_counter; transfer_mo_data_req_data_local_var->ue_location = ue_location; diff --git a/lib/sbi/openapi/model/transfer_mt_data_add_info.c b/lib/sbi/openapi/model/transfer_mt_data_add_info.c index 90ed84f89..3d4bfb54d 100644 --- a/lib/sbi/openapi/model/transfer_mt_data_add_info.c +++ b/lib/sbi/openapi/model/transfer_mt_data_add_info.c @@ -9,10 +9,9 @@ OpenAPI_transfer_mt_data_add_info_t *OpenAPI_transfer_mt_data_add_info_create( int max_waiting_time ) { - OpenAPI_transfer_mt_data_add_info_t *transfer_mt_data_add_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_transfer_mt_data_add_info_t)); - if (!transfer_mt_data_add_info_local_var) { - return NULL; - } + OpenAPI_transfer_mt_data_add_info_t *transfer_mt_data_add_info_local_var = ogs_malloc(sizeof(OpenAPI_transfer_mt_data_add_info_t)); + ogs_assert(transfer_mt_data_add_info_local_var); + transfer_mt_data_add_info_local_var->is_max_waiting_time = is_max_waiting_time; transfer_mt_data_add_info_local_var->max_waiting_time = max_waiting_time; diff --git a/lib/sbi/openapi/model/transfer_mt_data_error.c b/lib/sbi/openapi/model/transfer_mt_data_error.c index bd8748113..be6fbc15f 100644 --- a/lib/sbi/openapi/model/transfer_mt_data_error.c +++ b/lib/sbi/openapi/model/transfer_mt_data_error.c @@ -21,10 +21,9 @@ OpenAPI_transfer_mt_data_error_t *OpenAPI_transfer_mt_data_error_create( int max_waiting_time ) { - OpenAPI_transfer_mt_data_error_t *transfer_mt_data_error_local_var = OpenAPI_malloc(sizeof(OpenAPI_transfer_mt_data_error_t)); - if (!transfer_mt_data_error_local_var) { - return NULL; - } + OpenAPI_transfer_mt_data_error_t *transfer_mt_data_error_local_var = ogs_malloc(sizeof(OpenAPI_transfer_mt_data_error_t)); + ogs_assert(transfer_mt_data_error_local_var); + transfer_mt_data_error_local_var->type = type; transfer_mt_data_error_local_var->title = title; transfer_mt_data_error_local_var->is_status = is_status; @@ -310,18 +309,18 @@ OpenAPI_transfer_mt_data_error_t *OpenAPI_transfer_mt_data_error_parseFromJSON(c } transfer_mt_data_error_local_var = OpenAPI_transfer_mt_data_error_create ( - type ? ogs_strdup_or_assert(type->valuestring) : NULL, - title ? ogs_strdup_or_assert(title->valuestring) : NULL, + type ? ogs_strdup(type->valuestring) : NULL, + title ? ogs_strdup(title->valuestring) : NULL, status ? true : false, status ? status->valuedouble : 0, - detail ? ogs_strdup_or_assert(detail->valuestring) : NULL, - instance ? ogs_strdup_or_assert(instance->valuestring) : NULL, - cause ? ogs_strdup_or_assert(cause->valuestring) : NULL, + detail ? ogs_strdup(detail->valuestring) : NULL, + instance ? ogs_strdup(instance->valuestring) : NULL, + cause ? ogs_strdup(cause->valuestring) : NULL, invalid_params ? invalid_paramsList : NULL, - supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, + supported_features ? ogs_strdup(supported_features->valuestring) : NULL, access_token_error ? access_token_error_local_nonprim : NULL, access_token_request ? access_token_request_local_nonprim : NULL, - nrf_id ? ogs_strdup_or_assert(nrf_id->valuestring) : NULL, + nrf_id ? ogs_strdup(nrf_id->valuestring) : NULL, max_waiting_time ? true : false, max_waiting_time ? max_waiting_time->valuedouble : 0 ); diff --git a/lib/sbi/openapi/model/transfer_mt_data_req_data.c b/lib/sbi/openapi/model/transfer_mt_data_req_data.c index a00e74a98..201914efb 100644 --- a/lib/sbi/openapi/model/transfer_mt_data_req_data.c +++ b/lib/sbi/openapi/model/transfer_mt_data_req_data.c @@ -8,10 +8,9 @@ OpenAPI_transfer_mt_data_req_data_t *OpenAPI_transfer_mt_data_req_data_create( OpenAPI_ref_to_binary_data_t *mt_data ) { - OpenAPI_transfer_mt_data_req_data_t *transfer_mt_data_req_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_transfer_mt_data_req_data_t)); - if (!transfer_mt_data_req_data_local_var) { - return NULL; - } + OpenAPI_transfer_mt_data_req_data_t *transfer_mt_data_req_data_local_var = ogs_malloc(sizeof(OpenAPI_transfer_mt_data_req_data_t)); + ogs_assert(transfer_mt_data_req_data_local_var); + transfer_mt_data_req_data_local_var->mt_data = mt_data; return transfer_mt_data_req_data_local_var; diff --git a/lib/sbi/openapi/model/transfer_policy.c b/lib/sbi/openapi/model/transfer_policy.c index 058e5f88a..18e3d1a8d 100644 --- a/lib/sbi/openapi/model/transfer_policy.c +++ b/lib/sbi/openapi/model/transfer_policy.c @@ -12,10 +12,9 @@ OpenAPI_transfer_policy_t *OpenAPI_transfer_policy_create( int trans_policy_id ) { - OpenAPI_transfer_policy_t *transfer_policy_local_var = OpenAPI_malloc(sizeof(OpenAPI_transfer_policy_t)); - if (!transfer_policy_local_var) { - return NULL; - } + OpenAPI_transfer_policy_t *transfer_policy_local_var = ogs_malloc(sizeof(OpenAPI_transfer_policy_t)); + ogs_assert(transfer_policy_local_var); + transfer_policy_local_var->max_bit_rate_dl = max_bit_rate_dl; transfer_policy_local_var->max_bit_rate_ul = max_bit_rate_ul; transfer_policy_local_var->rating_group = rating_group; @@ -139,8 +138,8 @@ OpenAPI_transfer_policy_t *OpenAPI_transfer_policy_parseFromJSON(cJSON *transfer } transfer_policy_local_var = OpenAPI_transfer_policy_create ( - max_bit_rate_dl ? ogs_strdup_or_assert(max_bit_rate_dl->valuestring) : NULL, - max_bit_rate_ul ? ogs_strdup_or_assert(max_bit_rate_ul->valuestring) : NULL, + max_bit_rate_dl ? ogs_strdup(max_bit_rate_dl->valuestring) : NULL, + max_bit_rate_ul ? ogs_strdup(max_bit_rate_ul->valuestring) : NULL, rating_group->valuedouble, rec_time_int_local_nonprim, diff --git a/lib/sbi/openapi/model/trigger.c b/lib/sbi/openapi/model/trigger.c index c6190ccdb..b4a599077 100644 --- a/lib/sbi/openapi/model/trigger.c +++ b/lib/sbi/openapi/model/trigger.c @@ -20,10 +20,9 @@ OpenAPI_trigger_t *OpenAPI_trigger_create( char *tariff_time_change ) { - OpenAPI_trigger_t *trigger_local_var = OpenAPI_malloc(sizeof(OpenAPI_trigger_t)); - if (!trigger_local_var) { - return NULL; - } + OpenAPI_trigger_t *trigger_local_var = ogs_malloc(sizeof(OpenAPI_trigger_t)); + ogs_assert(trigger_local_var); + trigger_local_var->trigger_type = trigger_type; trigger_local_var->trigger_category = trigger_category; trigger_local_var->is_time_limit = is_time_limit; @@ -219,7 +218,7 @@ OpenAPI_trigger_t *OpenAPI_trigger_parseFromJSON(cJSON *triggerJSON) event_limit ? event_limit->valuedouble : 0, max_number_ofccc ? true : false, max_number_ofccc ? max_number_ofccc->valuedouble : 0, - tariff_time_change ? ogs_strdup_or_assert(tariff_time_change->valuestring) : NULL + tariff_time_change ? ogs_strdup(tariff_time_change->valuestring) : NULL ); return trigger_local_var; diff --git a/lib/sbi/openapi/model/trigger_category.c b/lib/sbi/openapi/model/trigger_category.c index 89d372989..ee9f24a85 100644 --- a/lib/sbi/openapi/model/trigger_category.c +++ b/lib/sbi/openapi/model/trigger_category.c @@ -7,10 +7,9 @@ OpenAPI_trigger_category_t *OpenAPI_trigger_category_create( ) { - OpenAPI_trigger_category_t *trigger_category_local_var = OpenAPI_malloc(sizeof(OpenAPI_trigger_category_t)); - if (!trigger_category_local_var) { - return NULL; - } + OpenAPI_trigger_category_t *trigger_category_local_var = ogs_malloc(sizeof(OpenAPI_trigger_category_t)); + ogs_assert(trigger_category_local_var); + return trigger_category_local_var; } diff --git a/lib/sbi/openapi/model/trigger_request.c b/lib/sbi/openapi/model/trigger_request.c index 7ce22ba3b..dc9c39226 100644 --- a/lib/sbi/openapi/model/trigger_request.c +++ b/lib/sbi/openapi/model/trigger_request.c @@ -8,10 +8,9 @@ OpenAPI_trigger_request_t *OpenAPI_trigger_request_create( char *supi ) { - OpenAPI_trigger_request_t *trigger_request_local_var = OpenAPI_malloc(sizeof(OpenAPI_trigger_request_t)); - if (!trigger_request_local_var) { - return NULL; - } + OpenAPI_trigger_request_t *trigger_request_local_var = ogs_malloc(sizeof(OpenAPI_trigger_request_t)); + ogs_assert(trigger_request_local_var); + trigger_request_local_var->supi = supi; return trigger_request_local_var; @@ -61,7 +60,7 @@ OpenAPI_trigger_request_t *OpenAPI_trigger_request_parseFromJSON(cJSON *trigger_ } trigger_request_local_var = OpenAPI_trigger_request_create ( - ogs_strdup_or_assert(supi->valuestring) + ogs_strdup(supi->valuestring) ); return trigger_request_local_var; diff --git a/lib/sbi/openapi/model/trigger_type.c b/lib/sbi/openapi/model/trigger_type.c index 4e990bca5..434c9992f 100644 --- a/lib/sbi/openapi/model/trigger_type.c +++ b/lib/sbi/openapi/model/trigger_type.c @@ -7,10 +7,9 @@ OpenAPI_trigger_type_t *OpenAPI_trigger_type_create( ) { - OpenAPI_trigger_type_t *trigger_type_local_var = OpenAPI_malloc(sizeof(OpenAPI_trigger_type_t)); - if (!trigger_type_local_var) { - return NULL; - } + OpenAPI_trigger_type_t *trigger_type_local_var = ogs_malloc(sizeof(OpenAPI_trigger_type_t)); + ogs_assert(trigger_type_local_var); + return trigger_type_local_var; } diff --git a/lib/sbi/openapi/model/tscai_input_container.c b/lib/sbi/openapi/model/tscai_input_container.c index 4152bea98..ef6c4d371 100644 --- a/lib/sbi/openapi/model/tscai_input_container.c +++ b/lib/sbi/openapi/model/tscai_input_container.c @@ -10,10 +10,9 @@ OpenAPI_tscai_input_container_t *OpenAPI_tscai_input_container_create( char *burst_arrival_time ) { - OpenAPI_tscai_input_container_t *tscai_input_container_local_var = OpenAPI_malloc(sizeof(OpenAPI_tscai_input_container_t)); - if (!tscai_input_container_local_var) { - return NULL; - } + OpenAPI_tscai_input_container_t *tscai_input_container_local_var = ogs_malloc(sizeof(OpenAPI_tscai_input_container_t)); + ogs_assert(tscai_input_container_local_var); + tscai_input_container_local_var->is_periodicity = is_periodicity; tscai_input_container_local_var->periodicity = periodicity; tscai_input_container_local_var->burst_arrival_time = burst_arrival_time; @@ -83,7 +82,7 @@ OpenAPI_tscai_input_container_t *OpenAPI_tscai_input_container_parseFromJSON(cJS tscai_input_container_local_var = OpenAPI_tscai_input_container_create ( periodicity ? true : false, periodicity ? periodicity->valuedouble : 0, - burst_arrival_time ? ogs_strdup_or_assert(burst_arrival_time->valuestring) : NULL + burst_arrival_time ? ogs_strdup(burst_arrival_time->valuestring) : NULL ); return tscai_input_container_local_var; diff --git a/lib/sbi/openapi/model/tsn_bridge_info.c b/lib/sbi/openapi/model/tsn_bridge_info.c index f2abc2b78..0d20b67f6 100644 --- a/lib/sbi/openapi/model/tsn_bridge_info.c +++ b/lib/sbi/openapi/model/tsn_bridge_info.c @@ -14,10 +14,9 @@ OpenAPI_tsn_bridge_info_t *OpenAPI_tsn_bridge_info_create( int dstt_resid_time ) { - OpenAPI_tsn_bridge_info_t *tsn_bridge_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_tsn_bridge_info_t)); - if (!tsn_bridge_info_local_var) { - return NULL; - } + OpenAPI_tsn_bridge_info_t *tsn_bridge_info_local_var = ogs_malloc(sizeof(OpenAPI_tsn_bridge_info_t)); + ogs_assert(tsn_bridge_info_local_var); + tsn_bridge_info_local_var->is_bridge_id = is_bridge_id; tsn_bridge_info_local_var->bridge_id = bridge_id; tsn_bridge_info_local_var->dstt_addr = dstt_addr; @@ -123,7 +122,7 @@ OpenAPI_tsn_bridge_info_t *OpenAPI_tsn_bridge_info_parseFromJSON(cJSON *tsn_brid tsn_bridge_info_local_var = OpenAPI_tsn_bridge_info_create ( bridge_id ? true : false, bridge_id ? bridge_id->valuedouble : 0, - dstt_addr ? ogs_strdup_or_assert(dstt_addr->valuestring) : NULL, + dstt_addr ? ogs_strdup(dstt_addr->valuestring) : NULL, dstt_port_num ? true : false, dstt_port_num ? dstt_port_num->valuedouble : 0, dstt_resid_time ? true : false, diff --git a/lib/sbi/openapi/model/tsn_qos_container.c b/lib/sbi/openapi/model/tsn_qos_container.c index 218c29c25..1d1faba56 100644 --- a/lib/sbi/openapi/model/tsn_qos_container.c +++ b/lib/sbi/openapi/model/tsn_qos_container.c @@ -13,10 +13,9 @@ OpenAPI_tsn_qos_container_t *OpenAPI_tsn_qos_container_create( int tsc_prio_level ) { - OpenAPI_tsn_qos_container_t *tsn_qos_container_local_var = OpenAPI_malloc(sizeof(OpenAPI_tsn_qos_container_t)); - if (!tsn_qos_container_local_var) { - return NULL; - } + OpenAPI_tsn_qos_container_t *tsn_qos_container_local_var = ogs_malloc(sizeof(OpenAPI_tsn_qos_container_t)); + ogs_assert(tsn_qos_container_local_var); + tsn_qos_container_local_var->is_max_tsc_burst_size = is_max_tsc_burst_size; tsn_qos_container_local_var->max_tsc_burst_size = max_tsc_burst_size; tsn_qos_container_local_var->is_tsc_pack_delay = is_tsc_pack_delay; diff --git a/lib/sbi/openapi/model/tsn_qos_container_rm.c b/lib/sbi/openapi/model/tsn_qos_container_rm.c index ddbc9d8d7..976064da6 100644 --- a/lib/sbi/openapi/model/tsn_qos_container_rm.c +++ b/lib/sbi/openapi/model/tsn_qos_container_rm.c @@ -13,10 +13,9 @@ OpenAPI_tsn_qos_container_rm_t *OpenAPI_tsn_qos_container_rm_create( int tsc_prio_level ) { - OpenAPI_tsn_qos_container_rm_t *tsn_qos_container_rm_local_var = OpenAPI_malloc(sizeof(OpenAPI_tsn_qos_container_rm_t)); - if (!tsn_qos_container_rm_local_var) { - return NULL; - } + OpenAPI_tsn_qos_container_rm_t *tsn_qos_container_rm_local_var = ogs_malloc(sizeof(OpenAPI_tsn_qos_container_rm_t)); + ogs_assert(tsn_qos_container_rm_local_var); + tsn_qos_container_rm_local_var->is_max_tsc_burst_size = is_max_tsc_burst_size; tsn_qos_container_rm_local_var->max_tsc_burst_size = max_tsc_burst_size; tsn_qos_container_rm_local_var->is_tsc_pack_delay = is_tsc_pack_delay; diff --git a/lib/sbi/openapi/model/tunnel_info.c b/lib/sbi/openapi/model/tunnel_info.c index 1b0e9cfed..f99e97e3e 100644 --- a/lib/sbi/openapi/model/tunnel_info.c +++ b/lib/sbi/openapi/model/tunnel_info.c @@ -11,10 +11,9 @@ OpenAPI_tunnel_info_t *OpenAPI_tunnel_info_create( OpenAPI_access_type_e an_type ) { - OpenAPI_tunnel_info_t *tunnel_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_tunnel_info_t)); - if (!tunnel_info_local_var) { - return NULL; - } + OpenAPI_tunnel_info_t *tunnel_info_local_var = ogs_malloc(sizeof(OpenAPI_tunnel_info_t)); + ogs_assert(tunnel_info_local_var); + tunnel_info_local_var->ipv4_addr = ipv4_addr; tunnel_info_local_var->ipv6_addr = ipv6_addr; tunnel_info_local_var->gtp_teid = gtp_teid; @@ -119,9 +118,9 @@ OpenAPI_tunnel_info_t *OpenAPI_tunnel_info_parseFromJSON(cJSON *tunnel_infoJSON) } tunnel_info_local_var = OpenAPI_tunnel_info_create ( - ipv4_addr ? ogs_strdup_or_assert(ipv4_addr->valuestring) : NULL, - ipv6_addr ? ogs_strdup_or_assert(ipv6_addr->valuestring) : NULL, - ogs_strdup_or_assert(gtp_teid->valuestring), + ipv4_addr ? ogs_strdup(ipv4_addr->valuestring) : NULL, + ipv6_addr ? ogs_strdup(ipv6_addr->valuestring) : NULL, + ogs_strdup(gtp_teid->valuestring), an_type ? an_typeVariable : 0 ); diff --git a/lib/sbi/openapi/model/twap_id.c b/lib/sbi/openapi/model/twap_id.c index 634f97503..455b0295a 100644 --- a/lib/sbi/openapi/model/twap_id.c +++ b/lib/sbi/openapi/model/twap_id.c @@ -10,10 +10,9 @@ OpenAPI_twap_id_t *OpenAPI_twap_id_create( char civic_address ) { - OpenAPI_twap_id_t *twap_id_local_var = OpenAPI_malloc(sizeof(OpenAPI_twap_id_t)); - if (!twap_id_local_var) { - return NULL; - } + OpenAPI_twap_id_t *twap_id_local_var = ogs_malloc(sizeof(OpenAPI_twap_id_t)); + ogs_assert(twap_id_local_var); + twap_id_local_var->ss_id = ss_id; twap_id_local_var->bss_id = bss_id; twap_id_local_var->civic_address = civic_address; @@ -98,8 +97,8 @@ OpenAPI_twap_id_t *OpenAPI_twap_id_parseFromJSON(cJSON *twap_idJSON) } twap_id_local_var = OpenAPI_twap_id_create ( - ogs_strdup_or_assert(ss_id->valuestring), - bss_id ? ogs_strdup_or_assert(bss_id->valuestring) : NULL, + ogs_strdup(ss_id->valuestring), + bss_id ? ogs_strdup(bss_id->valuestring) : NULL, civic_address ? civic_address->valueint : 0 ); diff --git a/lib/sbi/openapi/model/twif_info.c b/lib/sbi/openapi/model/twif_info.c index 1c49f961c..2095a42ee 100644 --- a/lib/sbi/openapi/model/twif_info.c +++ b/lib/sbi/openapi/model/twif_info.c @@ -10,10 +10,9 @@ OpenAPI_twif_info_t *OpenAPI_twif_info_create( char *endpoint_fqdn ) { - OpenAPI_twif_info_t *twif_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_twif_info_t)); - if (!twif_info_local_var) { - return NULL; - } + OpenAPI_twif_info_t *twif_info_local_var = ogs_malloc(sizeof(OpenAPI_twif_info_t)); + ogs_assert(twif_info_local_var); + twif_info_local_var->ipv4_endpoint_addresses = ipv4_endpoint_addresses; twif_info_local_var->ipv6_endpoint_addresses = ipv6_endpoint_addresses; twif_info_local_var->endpoint_fqdn = endpoint_fqdn; @@ -111,7 +110,7 @@ OpenAPI_twif_info_t *OpenAPI_twif_info_parseFromJSON(cJSON *twif_infoJSON) ogs_error("OpenAPI_twif_info_parseFromJSON() failed [ipv4_endpoint_addresses]"); goto end; } - OpenAPI_list_add(ipv4_endpoint_addressesList , ogs_strdup_or_assert(ipv4_endpoint_addresses_local->valuestring)); + OpenAPI_list_add(ipv4_endpoint_addressesList , ogs_strdup(ipv4_endpoint_addresses_local->valuestring)); } } @@ -131,7 +130,7 @@ OpenAPI_twif_info_t *OpenAPI_twif_info_parseFromJSON(cJSON *twif_infoJSON) ogs_error("OpenAPI_twif_info_parseFromJSON() failed [ipv6_endpoint_addresses]"); goto end; } - OpenAPI_list_add(ipv6_endpoint_addressesList , ogs_strdup_or_assert(ipv6_endpoint_addresses_local->valuestring)); + OpenAPI_list_add(ipv6_endpoint_addressesList , ogs_strdup(ipv6_endpoint_addresses_local->valuestring)); } } @@ -147,7 +146,7 @@ OpenAPI_twif_info_t *OpenAPI_twif_info_parseFromJSON(cJSON *twif_infoJSON) twif_info_local_var = OpenAPI_twif_info_create ( ipv4_endpoint_addresses ? ipv4_endpoint_addressesList : NULL, ipv6_endpoint_addresses ? ipv6_endpoint_addressesList : NULL, - endpoint_fqdn ? ogs_strdup_or_assert(endpoint_fqdn->valuestring) : NULL + endpoint_fqdn ? ogs_strdup(endpoint_fqdn->valuestring) : NULL ); return twif_info_local_var; diff --git a/lib/sbi/openapi/model/udm_info.c b/lib/sbi/openapi/model/udm_info.c index c185316d6..4c3dbbc4e 100644 --- a/lib/sbi/openapi/model/udm_info.c +++ b/lib/sbi/openapi/model/udm_info.c @@ -13,10 +13,9 @@ OpenAPI_udm_info_t *OpenAPI_udm_info_create( OpenAPI_list_t *internal_group_identifiers_ranges ) { - OpenAPI_udm_info_t *udm_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_udm_info_t)); - if (!udm_info_local_var) { - return NULL; - } + OpenAPI_udm_info_t *udm_info_local_var = ogs_malloc(sizeof(OpenAPI_udm_info_t)); + ogs_assert(udm_info_local_var); + udm_info_local_var->group_id = group_id; udm_info_local_var->supi_ranges = supi_ranges; udm_info_local_var->gpsi_ranges = gpsi_ranges; @@ -271,7 +270,7 @@ OpenAPI_udm_info_t *OpenAPI_udm_info_parseFromJSON(cJSON *udm_infoJSON) ogs_error("OpenAPI_udm_info_parseFromJSON() failed [routing_indicators]"); goto end; } - OpenAPI_list_add(routing_indicatorsList , ogs_strdup_or_assert(routing_indicators_local->valuestring)); + OpenAPI_list_add(routing_indicatorsList , ogs_strdup(routing_indicators_local->valuestring)); } } @@ -299,7 +298,7 @@ OpenAPI_udm_info_t *OpenAPI_udm_info_parseFromJSON(cJSON *udm_infoJSON) } udm_info_local_var = OpenAPI_udm_info_create ( - group_id ? ogs_strdup_or_assert(group_id->valuestring) : NULL, + group_id ? ogs_strdup(group_id->valuestring) : NULL, supi_ranges ? supi_rangesList : NULL, gpsi_ranges ? gpsi_rangesList : NULL, external_group_identifiers_ranges ? external_group_identifiers_rangesList : NULL, diff --git a/lib/sbi/openapi/model/udr_info.c b/lib/sbi/openapi/model/udr_info.c index c03fd6cd4..4f9db5430 100644 --- a/lib/sbi/openapi/model/udr_info.c +++ b/lib/sbi/openapi/model/udr_info.c @@ -12,10 +12,9 @@ OpenAPI_udr_info_t *OpenAPI_udr_info_create( OpenAPI_list_t *supported_data_sets ) { - OpenAPI_udr_info_t *udr_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_udr_info_t)); - if (!udr_info_local_var) { - return NULL; - } + OpenAPI_udr_info_t *udr_info_local_var = ogs_malloc(sizeof(OpenAPI_udr_info_t)); + ogs_assert(udr_info_local_var); + udr_info_local_var->group_id = group_id; udr_info_local_var->supi_ranges = supi_ranges; udr_info_local_var->gpsi_ranges = gpsi_ranges; @@ -248,7 +247,7 @@ OpenAPI_udr_info_t *OpenAPI_udr_info_parseFromJSON(cJSON *udr_infoJSON) } udr_info_local_var = OpenAPI_udr_info_create ( - group_id ? ogs_strdup_or_assert(group_id->valuestring) : NULL, + group_id ? ogs_strdup(group_id->valuestring) : NULL, supi_ranges ? supi_rangesList : NULL, gpsi_ranges ? gpsi_rangesList : NULL, external_group_identifiers_ranges ? external_group_identifiers_rangesList : NULL, diff --git a/lib/sbi/openapi/model/udsf_info.c b/lib/sbi/openapi/model/udsf_info.c index e601031a5..d9b1b087b 100644 --- a/lib/sbi/openapi/model/udsf_info.c +++ b/lib/sbi/openapi/model/udsf_info.c @@ -10,10 +10,9 @@ OpenAPI_udsf_info_t *OpenAPI_udsf_info_create( OpenAPI_list_t* storage_id_ranges ) { - OpenAPI_udsf_info_t *udsf_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_udsf_info_t)); - if (!udsf_info_local_var) { - return NULL; - } + OpenAPI_udsf_info_t *udsf_info_local_var = ogs_malloc(sizeof(OpenAPI_udsf_info_t)); + ogs_assert(udsf_info_local_var); + udsf_info_local_var->group_id = group_id; udsf_info_local_var->supi_ranges = supi_ranges; udsf_info_local_var->storage_id_ranges = storage_id_ranges; @@ -34,6 +33,7 @@ void OpenAPI_udsf_info_free(OpenAPI_udsf_info_t *udsf_info) OpenAPI_list_free(udsf_info->supi_ranges); OpenAPI_list_for_each(udsf_info->storage_id_ranges, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); ogs_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -150,7 +150,7 @@ OpenAPI_udsf_info_t *OpenAPI_udsf_info_parseFromJSON(cJSON *udsf_infoJSON) } udsf_info_local_var = OpenAPI_udsf_info_create ( - group_id ? ogs_strdup_or_assert(group_id->valuestring) : NULL, + group_id ? ogs_strdup(group_id->valuestring) : NULL, supi_ranges ? supi_rangesList : NULL, storage_id_ranges ? storage_id_rangesList : NULL ); diff --git a/lib/sbi/openapi/model/ue_camping_rep.c b/lib/sbi/openapi/model/ue_camping_rep.c index a65fd0763..ca331f5d3 100644 --- a/lib/sbi/openapi/model/ue_camping_rep.c +++ b/lib/sbi/openapi/model/ue_camping_rep.c @@ -14,10 +14,9 @@ OpenAPI_ue_camping_rep_t *OpenAPI_ue_camping_rep_create( OpenAPI_net_loc_access_support_e net_loc_acc_supp ) { - OpenAPI_ue_camping_rep_t *ue_camping_rep_local_var = OpenAPI_malloc(sizeof(OpenAPI_ue_camping_rep_t)); - if (!ue_camping_rep_local_var) { - return NULL; - } + OpenAPI_ue_camping_rep_t *ue_camping_rep_local_var = ogs_malloc(sizeof(OpenAPI_ue_camping_rep_t)); + ogs_assert(ue_camping_rep_local_var); + ue_camping_rep_local_var->access_type = access_type; ue_camping_rep_local_var->rat_type = rat_type; ue_camping_rep_local_var->serv_nf_id = serv_nf_id; @@ -195,7 +194,7 @@ OpenAPI_ue_camping_rep_t *OpenAPI_ue_camping_rep_parseFromJSON(cJSON *ue_camping serv_nf_id ? serv_nf_id_local_nonprim : NULL, serving_network ? serving_network_local_nonprim : NULL, user_location_info ? user_location_info_local_nonprim : NULL, - ue_time_zone ? ogs_strdup_or_assert(ue_time_zone->valuestring) : NULL, + ue_time_zone ? ogs_strdup(ue_time_zone->valuestring) : NULL, net_loc_acc_supp ? net_loc_acc_suppVariable : 0 ); diff --git a/lib/sbi/openapi/model/ue_context.c b/lib/sbi/openapi/model/ue_context.c index be12ab50c..91231caa3 100644 --- a/lib/sbi/openapi/model/ue_context.c +++ b/lib/sbi/openapi/model/ue_context.c @@ -66,10 +66,9 @@ OpenAPI_ue_context_t *OpenAPI_ue_context_create( int iab_operation_allowed ) { - OpenAPI_ue_context_t *ue_context_local_var = OpenAPI_malloc(sizeof(OpenAPI_ue_context_t)); - if (!ue_context_local_var) { - return NULL; - } + OpenAPI_ue_context_t *ue_context_local_var = ogs_malloc(sizeof(OpenAPI_ue_context_t)); + ogs_assert(ue_context_local_var); + ue_context_local_var->supi = supi; ue_context_local_var->is_supi_unauth_ind = is_supi_unauth_ind; ue_context_local_var->supi_unauth_ind = supi_unauth_ind; @@ -812,7 +811,7 @@ OpenAPI_ue_context_t *OpenAPI_ue_context_parseFromJSON(cJSON *ue_contextJSON) ogs_error("OpenAPI_ue_context_parseFromJSON() failed [gpsi_list]"); goto end; } - OpenAPI_list_add(gpsi_listList , ogs_strdup_or_assert(gpsi_list_local->valuestring)); + OpenAPI_list_add(gpsi_listList , ogs_strdup(gpsi_list_local->valuestring)); } } @@ -877,7 +876,7 @@ OpenAPI_ue_context_t *OpenAPI_ue_context_parseFromJSON(cJSON *ue_contextJSON) ogs_error("OpenAPI_ue_context_parseFromJSON() failed [group_list]"); goto end; } - OpenAPI_list_add(group_listList , ogs_strdup_or_assert(group_list_local->valuestring)); + OpenAPI_list_add(group_listList , ogs_strdup(group_list_local->valuestring)); } } @@ -1407,15 +1406,15 @@ OpenAPI_ue_context_t *OpenAPI_ue_context_parseFromJSON(cJSON *ue_contextJSON) } ue_context_local_var = OpenAPI_ue_context_create ( - supi ? ogs_strdup_or_assert(supi->valuestring) : NULL, + supi ? ogs_strdup(supi->valuestring) : NULL, supi_unauth_ind ? true : false, supi_unauth_ind ? supi_unauth_ind->valueint : 0, gpsi_list ? gpsi_listList : NULL, - pei ? ogs_strdup_or_assert(pei->valuestring) : NULL, - udm_group_id ? ogs_strdup_or_assert(udm_group_id->valuestring) : NULL, - ausf_group_id ? ogs_strdup_or_assert(ausf_group_id->valuestring) : NULL, - pcf_group_id ? ogs_strdup_or_assert(pcf_group_id->valuestring) : NULL, - routing_indicator ? ogs_strdup_or_assert(routing_indicator->valuestring) : NULL, + pei ? ogs_strdup(pei->valuestring) : NULL, + udm_group_id ? ogs_strdup(udm_group_id->valuestring) : NULL, + ausf_group_id ? ogs_strdup(ausf_group_id->valuestring) : NULL, + pcf_group_id ? ogs_strdup(pcf_group_id->valuestring) : NULL, + routing_indicator ? ogs_strdup(routing_indicator->valuestring) : NULL, group_list ? group_listList : NULL, drx_parameter ? drx_parameter->valueint : 0, sub_rfsp ? true : false, @@ -1423,20 +1422,20 @@ OpenAPI_ue_context_t *OpenAPI_ue_context_parseFromJSON(cJSON *ue_contextJSON) used_rfsp ? true : false, used_rfsp ? used_rfsp->valuedouble : 0, sub_ue_ambr ? sub_ue_ambr_local_nonprim : NULL, - smsf_id ? ogs_strdup_or_assert(smsf_id->valuestring) : NULL, + smsf_id ? ogs_strdup(smsf_id->valuestring) : NULL, seaf_data ? seaf_data_local_nonprim : NULL, _5g_mm_capability ? _5g_mm_capability->valueint : 0, - pcf_id ? ogs_strdup_or_assert(pcf_id->valuestring) : NULL, - pcf_set_id ? ogs_strdup_or_assert(pcf_set_id->valuestring) : NULL, - pcf_amp_service_set_id ? ogs_strdup_or_assert(pcf_amp_service_set_id->valuestring) : NULL, - pcf_uep_service_set_id ? ogs_strdup_or_assert(pcf_uep_service_set_id->valuestring) : NULL, + pcf_id ? ogs_strdup(pcf_id->valuestring) : NULL, + pcf_set_id ? ogs_strdup(pcf_set_id->valuestring) : NULL, + pcf_amp_service_set_id ? ogs_strdup(pcf_amp_service_set_id->valuestring) : NULL, + pcf_uep_service_set_id ? ogs_strdup(pcf_uep_service_set_id->valuestring) : NULL, pcf_binding ? pcf_bindingVariable : 0, - pcf_am_policy_uri ? ogs_strdup_or_assert(pcf_am_policy_uri->valuestring) : NULL, + pcf_am_policy_uri ? ogs_strdup(pcf_am_policy_uri->valuestring) : NULL, am_policy_req_trigger_list ? am_policy_req_trigger_listList : NULL, - pcf_ue_policy_uri ? ogs_strdup_or_assert(pcf_ue_policy_uri->valuestring) : NULL, + pcf_ue_policy_uri ? ogs_strdup(pcf_ue_policy_uri->valuestring) : NULL, ue_policy_req_trigger_list ? ue_policy_req_trigger_listList : NULL, - hpcf_id ? ogs_strdup_or_assert(hpcf_id->valuestring) : NULL, - hpcf_set_id ? ogs_strdup_or_assert(hpcf_set_id->valuestring) : NULL, + hpcf_id ? ogs_strdup(hpcf_id->valuestring) : NULL, + hpcf_set_id ? ogs_strdup(hpcf_set_id->valuestring) : NULL, restricted_rat_list ? restricted_rat_listList : NULL, forbidden_area_list ? forbidden_area_listList : NULL, service_area_restriction ? service_area_restriction_local_nonprim : NULL, @@ -1445,9 +1444,9 @@ OpenAPI_ue_context_t *OpenAPI_ue_context_parseFromJSON(cJSON *ue_contextJSON) mm_context_list ? mm_context_listList : NULL, session_context_list ? session_context_listList : NULL, trace_data ? trace_data_local_nonprim : NULL, - service_gap_expiry_time ? ogs_strdup_or_assert(service_gap_expiry_time->valuestring) : NULL, - stn_sr ? ogs_strdup_or_assert(stn_sr->valuestring) : NULL, - c_msisdn ? ogs_strdup_or_assert(c_msisdn->valuestring) : NULL, + service_gap_expiry_time ? ogs_strdup(service_gap_expiry_time->valuestring) : NULL, + stn_sr ? ogs_strdup(stn_sr->valuestring) : NULL, + c_msisdn ? ogs_strdup(c_msisdn->valuestring) : NULL, ms_classmark2 ? ms_classmark2->valueint : 0, supported_codec_list ? supported_codec_listList : NULL, small_data_rate_status_infos ? small_data_rate_status_infosList : NULL, diff --git a/lib/sbi/openapi/model/ue_context_cancel_relocate_data.c b/lib/sbi/openapi/model/ue_context_cancel_relocate_data.c index 5ef550eab..e1f560bd5 100644 --- a/lib/sbi/openapi/model/ue_context_cancel_relocate_data.c +++ b/lib/sbi/openapi/model/ue_context_cancel_relocate_data.c @@ -9,10 +9,9 @@ OpenAPI_ue_context_cancel_relocate_data_t *OpenAPI_ue_context_cancel_relocate_da OpenAPI_ref_to_binary_data_t *relocation_cancel_request ) { - OpenAPI_ue_context_cancel_relocate_data_t *ue_context_cancel_relocate_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_ue_context_cancel_relocate_data_t)); - if (!ue_context_cancel_relocate_data_local_var) { - return NULL; - } + OpenAPI_ue_context_cancel_relocate_data_t *ue_context_cancel_relocate_data_local_var = ogs_malloc(sizeof(OpenAPI_ue_context_cancel_relocate_data_t)); + ogs_assert(ue_context_cancel_relocate_data_local_var); + ue_context_cancel_relocate_data_local_var->supi = supi; ue_context_cancel_relocate_data_local_var->relocation_cancel_request = relocation_cancel_request; @@ -84,7 +83,7 @@ OpenAPI_ue_context_cancel_relocate_data_t *OpenAPI_ue_context_cancel_relocate_da relocation_cancel_request_local_nonprim = OpenAPI_ref_to_binary_data_parseFromJSON(relocation_cancel_request); ue_context_cancel_relocate_data_local_var = OpenAPI_ue_context_cancel_relocate_data_create ( - supi ? ogs_strdup_or_assert(supi->valuestring) : NULL, + supi ? ogs_strdup(supi->valuestring) : NULL, relocation_cancel_request_local_nonprim ); diff --git a/lib/sbi/openapi/model/ue_context_create_data.c b/lib/sbi/openapi/model/ue_context_create_data.c index 1479938ca..b1603d6bc 100644 --- a/lib/sbi/openapi/model/ue_context_create_data.c +++ b/lib/sbi/openapi/model/ue_context_create_data.c @@ -16,10 +16,9 @@ OpenAPI_ue_context_create_data_t *OpenAPI_ue_context_create_data_create( OpenAPI_plmn_id_nid_t *serving_network ) { - OpenAPI_ue_context_create_data_t *ue_context_create_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_ue_context_create_data_t)); - if (!ue_context_create_data_local_var) { - return NULL; - } + OpenAPI_ue_context_create_data_t *ue_context_create_data_local_var = ogs_malloc(sizeof(OpenAPI_ue_context_create_data_t)); + ogs_assert(ue_context_create_data_local_var); + ue_context_create_data_local_var->ue_context = ue_context; ue_context_create_data_local_var->target_id = target_id; ue_context_create_data_local_var->source_to_target_data = source_to_target_data; @@ -271,10 +270,10 @@ OpenAPI_ue_context_create_data_t *OpenAPI_ue_context_create_data_parseFromJSON(c target_id_local_nonprim, source_to_target_data_local_nonprim, pdu_session_listList, - n2_notify_uri ? ogs_strdup_or_assert(n2_notify_uri->valuestring) : NULL, + n2_notify_uri ? ogs_strdup(n2_notify_uri->valuestring) : NULL, ue_radio_capability ? ue_radio_capability_local_nonprim : NULL, ngap_cause ? ngap_cause_local_nonprim : NULL, - supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, + supported_features ? ogs_strdup(supported_features->valuestring) : NULL, serving_network ? serving_network_local_nonprim : NULL ); diff --git a/lib/sbi/openapi/model/ue_context_create_error.c b/lib/sbi/openapi/model/ue_context_create_error.c index 1b1fb00a8..7ba9a0113 100644 --- a/lib/sbi/openapi/model/ue_context_create_error.c +++ b/lib/sbi/openapi/model/ue_context_create_error.c @@ -10,10 +10,9 @@ OpenAPI_ue_context_create_error_t *OpenAPI_ue_context_create_error_create( OpenAPI_n2_info_content_t *target_to_source_failure_data ) { - OpenAPI_ue_context_create_error_t *ue_context_create_error_local_var = OpenAPI_malloc(sizeof(OpenAPI_ue_context_create_error_t)); - if (!ue_context_create_error_local_var) { - return NULL; - } + OpenAPI_ue_context_create_error_t *ue_context_create_error_local_var = ogs_malloc(sizeof(OpenAPI_ue_context_create_error_t)); + ogs_assert(ue_context_create_error_local_var); + ue_context_create_error_local_var->error = error; ue_context_create_error_local_var->ngap_cause = ngap_cause; ue_context_create_error_local_var->target_to_source_failure_data = target_to_source_failure_data; diff --git a/lib/sbi/openapi/model/ue_context_created_data.c b/lib/sbi/openapi/model/ue_context_created_data.c index 112d21fcb..7b559cc71 100644 --- a/lib/sbi/openapi/model/ue_context_created_data.c +++ b/lib/sbi/openapi/model/ue_context_created_data.c @@ -14,10 +14,9 @@ OpenAPI_ue_context_created_data_t *OpenAPI_ue_context_created_data_create( int pcf_reselected_ind ) { - OpenAPI_ue_context_created_data_t *ue_context_created_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_ue_context_created_data_t)); - if (!ue_context_created_data_local_var) { - return NULL; - } + OpenAPI_ue_context_created_data_t *ue_context_created_data_local_var = ogs_malloc(sizeof(OpenAPI_ue_context_created_data_t)); + ogs_assert(ue_context_created_data_local_var); + ue_context_created_data_local_var->ue_context = ue_context; ue_context_created_data_local_var->target_to_source_data = target_to_source_data; ue_context_created_data_local_var->pdu_session_list = pdu_session_list; @@ -229,7 +228,7 @@ OpenAPI_ue_context_created_data_t *OpenAPI_ue_context_created_data_parseFromJSON target_to_source_data_local_nonprim, pdu_session_listList, failed_session_list ? failed_session_listList : NULL, - supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, + supported_features ? ogs_strdup(supported_features->valuestring) : NULL, pcf_reselected_ind ? true : false, pcf_reselected_ind ? pcf_reselected_ind->valueint : 0 ); diff --git a/lib/sbi/openapi/model/ue_context_in_amf_data.c b/lib/sbi/openapi/model/ue_context_in_amf_data.c index a37f3e200..caf434aba 100644 --- a/lib/sbi/openapi/model/ue_context_in_amf_data.c +++ b/lib/sbi/openapi/model/ue_context_in_amf_data.c @@ -8,10 +8,9 @@ OpenAPI_ue_context_in_amf_data_t *OpenAPI_ue_context_in_amf_data_create( OpenAPI_eps_interworking_info_t *eps_interworking_info ) { - OpenAPI_ue_context_in_amf_data_t *ue_context_in_amf_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_ue_context_in_amf_data_t)); - if (!ue_context_in_amf_data_local_var) { - return NULL; - } + OpenAPI_ue_context_in_amf_data_t *ue_context_in_amf_data_local_var = ogs_malloc(sizeof(OpenAPI_ue_context_in_amf_data_t)); + ogs_assert(ue_context_in_amf_data_local_var); + ue_context_in_amf_data_local_var->eps_interworking_info = eps_interworking_info; return ue_context_in_amf_data_local_var; diff --git a/lib/sbi/openapi/model/ue_context_in_amf_data_1.c b/lib/sbi/openapi/model/ue_context_in_amf_data_1.c index 962942dc5..c5cb4f0d1 100644 --- a/lib/sbi/openapi/model/ue_context_in_amf_data_1.c +++ b/lib/sbi/openapi/model/ue_context_in_amf_data_1.c @@ -8,10 +8,9 @@ OpenAPI_ue_context_in_amf_data_1_t *OpenAPI_ue_context_in_amf_data_1_create( OpenAPI_eps_interworking_info_t *eps_interworking_info ) { - OpenAPI_ue_context_in_amf_data_1_t *ue_context_in_amf_data_1_local_var = OpenAPI_malloc(sizeof(OpenAPI_ue_context_in_amf_data_1_t)); - if (!ue_context_in_amf_data_1_local_var) { - return NULL; - } + OpenAPI_ue_context_in_amf_data_1_t *ue_context_in_amf_data_1_local_var = ogs_malloc(sizeof(OpenAPI_ue_context_in_amf_data_1_t)); + ogs_assert(ue_context_in_amf_data_1_local_var); + ue_context_in_amf_data_1_local_var->eps_interworking_info = eps_interworking_info; return ue_context_in_amf_data_1_local_var; diff --git a/lib/sbi/openapi/model/ue_context_in_smf_data.c b/lib/sbi/openapi/model/ue_context_in_smf_data.c index f5459e637..0b7dd9ca9 100644 --- a/lib/sbi/openapi/model/ue_context_in_smf_data.c +++ b/lib/sbi/openapi/model/ue_context_in_smf_data.c @@ -10,10 +10,9 @@ OpenAPI_ue_context_in_smf_data_t *OpenAPI_ue_context_in_smf_data_create( OpenAPI_emergency_info_t *emergency_info ) { - OpenAPI_ue_context_in_smf_data_t *ue_context_in_smf_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_ue_context_in_smf_data_t)); - if (!ue_context_in_smf_data_local_var) { - return NULL; - } + OpenAPI_ue_context_in_smf_data_t *ue_context_in_smf_data_local_var = ogs_malloc(sizeof(OpenAPI_ue_context_in_smf_data_t)); + ogs_assert(ue_context_in_smf_data_local_var); + ue_context_in_smf_data_local_var->pdu_sessions = pdu_sessions; ue_context_in_smf_data_local_var->pgw_info = pgw_info; ue_context_in_smf_data_local_var->emergency_info = emergency_info; @@ -29,6 +28,7 @@ void OpenAPI_ue_context_in_smf_data_free(OpenAPI_ue_context_in_smf_data_t *ue_co OpenAPI_lnode_t *node; OpenAPI_list_for_each(ue_context_in_smf_data->pdu_sessions, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_pdu_session_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -129,9 +129,9 @@ OpenAPI_ue_context_in_smf_data_t *OpenAPI_ue_context_in_smf_data_parseFromJSON(c cJSON *localMapObject = pdu_sessions_local_map; if (cJSON_IsObject(pdu_sessions_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_pdu_session_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_pdu_session_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(pdu_sessions_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_ue_context_in_smf_data_parseFromJSON() failed [pdu_sessions]"); goto end; diff --git a/lib/sbi/openapi/model/ue_context_in_smf_data_1.c b/lib/sbi/openapi/model/ue_context_in_smf_data_1.c index fd1bcab8f..224fc6948 100644 --- a/lib/sbi/openapi/model/ue_context_in_smf_data_1.c +++ b/lib/sbi/openapi/model/ue_context_in_smf_data_1.c @@ -10,10 +10,9 @@ OpenAPI_ue_context_in_smf_data_1_t *OpenAPI_ue_context_in_smf_data_1_create( OpenAPI_emergency_info_1_t *emergency_info ) { - OpenAPI_ue_context_in_smf_data_1_t *ue_context_in_smf_data_1_local_var = OpenAPI_malloc(sizeof(OpenAPI_ue_context_in_smf_data_1_t)); - if (!ue_context_in_smf_data_1_local_var) { - return NULL; - } + OpenAPI_ue_context_in_smf_data_1_t *ue_context_in_smf_data_1_local_var = ogs_malloc(sizeof(OpenAPI_ue_context_in_smf_data_1_t)); + ogs_assert(ue_context_in_smf_data_1_local_var); + ue_context_in_smf_data_1_local_var->pdu_sessions = pdu_sessions; ue_context_in_smf_data_1_local_var->pgw_info = pgw_info; ue_context_in_smf_data_1_local_var->emergency_info = emergency_info; @@ -29,6 +28,7 @@ void OpenAPI_ue_context_in_smf_data_1_free(OpenAPI_ue_context_in_smf_data_1_t *u OpenAPI_lnode_t *node; OpenAPI_list_for_each(ue_context_in_smf_data_1->pdu_sessions, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_pdu_session_1_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -129,9 +129,9 @@ OpenAPI_ue_context_in_smf_data_1_t *OpenAPI_ue_context_in_smf_data_1_parseFromJS cJSON *localMapObject = pdu_sessions_local_map; if (cJSON_IsObject(pdu_sessions_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_pdu_session_1_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_pdu_session_1_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(pdu_sessions_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_ue_context_in_smf_data_1_parseFromJSON() failed [pdu_sessions]"); goto end; diff --git a/lib/sbi/openapi/model/ue_context_in_smsf_data.c b/lib/sbi/openapi/model/ue_context_in_smsf_data.c index 8137aa442..2224575ac 100644 --- a/lib/sbi/openapi/model/ue_context_in_smsf_data.c +++ b/lib/sbi/openapi/model/ue_context_in_smsf_data.c @@ -9,10 +9,9 @@ OpenAPI_ue_context_in_smsf_data_t *OpenAPI_ue_context_in_smsf_data_create( OpenAPI_smsf_info_t *smsf_info_non3_gpp_access ) { - OpenAPI_ue_context_in_smsf_data_t *ue_context_in_smsf_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_ue_context_in_smsf_data_t)); - if (!ue_context_in_smsf_data_local_var) { - return NULL; - } + OpenAPI_ue_context_in_smsf_data_t *ue_context_in_smsf_data_local_var = ogs_malloc(sizeof(OpenAPI_ue_context_in_smsf_data_t)); + ogs_assert(ue_context_in_smsf_data_local_var); + ue_context_in_smsf_data_local_var->smsf_info3_gpp_access = smsf_info3_gpp_access; ue_context_in_smsf_data_local_var->smsf_info_non3_gpp_access = smsf_info_non3_gpp_access; diff --git a/lib/sbi/openapi/model/ue_context_in_smsf_data_1.c b/lib/sbi/openapi/model/ue_context_in_smsf_data_1.c index ddc3dc262..f89389147 100644 --- a/lib/sbi/openapi/model/ue_context_in_smsf_data_1.c +++ b/lib/sbi/openapi/model/ue_context_in_smsf_data_1.c @@ -9,10 +9,9 @@ OpenAPI_ue_context_in_smsf_data_1_t *OpenAPI_ue_context_in_smsf_data_1_create( OpenAPI_smsf_info_1_t *smsf_info_non3_gpp_access ) { - OpenAPI_ue_context_in_smsf_data_1_t *ue_context_in_smsf_data_1_local_var = OpenAPI_malloc(sizeof(OpenAPI_ue_context_in_smsf_data_1_t)); - if (!ue_context_in_smsf_data_1_local_var) { - return NULL; - } + OpenAPI_ue_context_in_smsf_data_1_t *ue_context_in_smsf_data_1_local_var = ogs_malloc(sizeof(OpenAPI_ue_context_in_smsf_data_1_t)); + ogs_assert(ue_context_in_smsf_data_1_local_var); + ue_context_in_smsf_data_1_local_var->smsf_info3_gpp_access = smsf_info3_gpp_access; ue_context_in_smsf_data_1_local_var->smsf_info_non3_gpp_access = smsf_info_non3_gpp_access; diff --git a/lib/sbi/openapi/model/ue_context_release.c b/lib/sbi/openapi/model/ue_context_release.c index 804b97d58..fdfb679f2 100644 --- a/lib/sbi/openapi/model/ue_context_release.c +++ b/lib/sbi/openapi/model/ue_context_release.c @@ -11,10 +11,9 @@ OpenAPI_ue_context_release_t *OpenAPI_ue_context_release_create( OpenAPI_ng_ap_cause_t *ngap_cause ) { - OpenAPI_ue_context_release_t *ue_context_release_local_var = OpenAPI_malloc(sizeof(OpenAPI_ue_context_release_t)); - if (!ue_context_release_local_var) { - return NULL; - } + OpenAPI_ue_context_release_t *ue_context_release_local_var = ogs_malloc(sizeof(OpenAPI_ue_context_release_t)); + ogs_assert(ue_context_release_local_var); + ue_context_release_local_var->supi = supi; ue_context_release_local_var->is_unauthenticated_supi = is_unauthenticated_supi; ue_context_release_local_var->unauthenticated_supi = unauthenticated_supi; @@ -104,7 +103,7 @@ OpenAPI_ue_context_release_t *OpenAPI_ue_context_release_parseFromJSON(cJSON *ue ngap_cause_local_nonprim = OpenAPI_ng_ap_cause_parseFromJSON(ngap_cause); ue_context_release_local_var = OpenAPI_ue_context_release_create ( - supi ? ogs_strdup_or_assert(supi->valuestring) : NULL, + supi ? ogs_strdup(supi->valuestring) : NULL, unauthenticated_supi ? true : false, unauthenticated_supi ? unauthenticated_supi->valueint : 0, ngap_cause_local_nonprim diff --git a/lib/sbi/openapi/model/ue_context_relocate_data.c b/lib/sbi/openapi/model/ue_context_relocate_data.c index 192c918f2..f2d636630 100644 --- a/lib/sbi/openapi/model/ue_context_relocate_data.c +++ b/lib/sbi/openapi/model/ue_context_relocate_data.c @@ -15,10 +15,9 @@ OpenAPI_ue_context_relocate_data_t *OpenAPI_ue_context_relocate_data_create( char *supported_features ) { - OpenAPI_ue_context_relocate_data_t *ue_context_relocate_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_ue_context_relocate_data_t)); - if (!ue_context_relocate_data_local_var) { - return NULL; - } + OpenAPI_ue_context_relocate_data_t *ue_context_relocate_data_local_var = ogs_malloc(sizeof(OpenAPI_ue_context_relocate_data_t)); + ogs_assert(ue_context_relocate_data_local_var); + ue_context_relocate_data_local_var->ue_context = ue_context; ue_context_relocate_data_local_var->target_id = target_id; ue_context_relocate_data_local_var->source_to_target_data = source_to_target_data; @@ -255,7 +254,7 @@ OpenAPI_ue_context_relocate_data_t *OpenAPI_ue_context_relocate_data_parseFromJS pdu_session_list ? pdu_session_listList : NULL, ue_radio_capability ? ue_radio_capability_local_nonprim : NULL, ngap_cause ? ngap_cause_local_nonprim : NULL, - supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL + supported_features ? ogs_strdup(supported_features->valuestring) : NULL ); return ue_context_relocate_data_local_var; diff --git a/lib/sbi/openapi/model/ue_context_relocated_data.c b/lib/sbi/openapi/model/ue_context_relocated_data.c index 66c31186d..efe3a25b4 100644 --- a/lib/sbi/openapi/model/ue_context_relocated_data.c +++ b/lib/sbi/openapi/model/ue_context_relocated_data.c @@ -8,10 +8,9 @@ OpenAPI_ue_context_relocated_data_t *OpenAPI_ue_context_relocated_data_create( OpenAPI_ue_context_t *ue_context ) { - OpenAPI_ue_context_relocated_data_t *ue_context_relocated_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_ue_context_relocated_data_t)); - if (!ue_context_relocated_data_local_var) { - return NULL; - } + OpenAPI_ue_context_relocated_data_t *ue_context_relocated_data_local_var = ogs_malloc(sizeof(OpenAPI_ue_context_relocated_data_t)); + ogs_assert(ue_context_relocated_data_local_var); + ue_context_relocated_data_local_var->ue_context = ue_context; return ue_context_relocated_data_local_var; diff --git a/lib/sbi/openapi/model/ue_context_transfer_req_data.c b/lib/sbi/openapi/model/ue_context_transfer_req_data.c index cd6a9c0a1..6a91ee691 100644 --- a/lib/sbi/openapi/model/ue_context_transfer_req_data.c +++ b/lib/sbi/openapi/model/ue_context_transfer_req_data.c @@ -12,10 +12,9 @@ OpenAPI_ue_context_transfer_req_data_t *OpenAPI_ue_context_transfer_req_data_cre char *supported_features ) { - OpenAPI_ue_context_transfer_req_data_t *ue_context_transfer_req_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_ue_context_transfer_req_data_t)); - if (!ue_context_transfer_req_data_local_var) { - return NULL; - } + OpenAPI_ue_context_transfer_req_data_t *ue_context_transfer_req_data_local_var = ogs_malloc(sizeof(OpenAPI_ue_context_transfer_req_data_t)); + ogs_assert(ue_context_transfer_req_data_local_var); + ue_context_transfer_req_data_local_var->reason = reason; ue_context_transfer_req_data_local_var->access_type = access_type; ue_context_transfer_req_data_local_var->plmn_id = plmn_id; @@ -151,7 +150,7 @@ OpenAPI_ue_context_transfer_req_data_t *OpenAPI_ue_context_transfer_req_data_par access_typeVariable, plmn_id ? plmn_id_local_nonprim : NULL, reg_request ? reg_request_local_nonprim : NULL, - supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL + supported_features ? ogs_strdup(supported_features->valuestring) : NULL ); return ue_context_transfer_req_data_local_var; diff --git a/lib/sbi/openapi/model/ue_context_transfer_rsp_data.c b/lib/sbi/openapi/model/ue_context_transfer_rsp_data.c index 617388da7..f8d500aaf 100644 --- a/lib/sbi/openapi/model/ue_context_transfer_rsp_data.c +++ b/lib/sbi/openapi/model/ue_context_transfer_rsp_data.c @@ -11,10 +11,9 @@ OpenAPI_ue_context_transfer_rsp_data_t *OpenAPI_ue_context_transfer_rsp_data_cre char *supported_features ) { - OpenAPI_ue_context_transfer_rsp_data_t *ue_context_transfer_rsp_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_ue_context_transfer_rsp_data_t)); - if (!ue_context_transfer_rsp_data_local_var) { - return NULL; - } + OpenAPI_ue_context_transfer_rsp_data_t *ue_context_transfer_rsp_data_local_var = ogs_malloc(sizeof(OpenAPI_ue_context_transfer_rsp_data_t)); + ogs_assert(ue_context_transfer_rsp_data_local_var); + ue_context_transfer_rsp_data_local_var->ue_context = ue_context; ue_context_transfer_rsp_data_local_var->ue_radio_capability = ue_radio_capability; ue_context_transfer_rsp_data_local_var->ue_nbiot_radio_capability = ue_nbiot_radio_capability; @@ -133,7 +132,7 @@ OpenAPI_ue_context_transfer_rsp_data_t *OpenAPI_ue_context_transfer_rsp_data_par ue_context_local_nonprim, ue_radio_capability ? ue_radio_capability_local_nonprim : NULL, ue_nbiot_radio_capability ? ue_nbiot_radio_capability_local_nonprim : NULL, - supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL + supported_features ? ogs_strdup(supported_features->valuestring) : NULL ); return ue_context_transfer_rsp_data_local_var; diff --git a/lib/sbi/openapi/model/ue_differentiation_info.c b/lib/sbi/openapi/model/ue_differentiation_info.c index 295ab94d4..8b784204e 100644 --- a/lib/sbi/openapi/model/ue_differentiation_info.c +++ b/lib/sbi/openapi/model/ue_differentiation_info.c @@ -15,10 +15,9 @@ OpenAPI_ue_differentiation_info_t *OpenAPI_ue_differentiation_info_create( char *validity_time ) { - OpenAPI_ue_differentiation_info_t *ue_differentiation_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_ue_differentiation_info_t)); - if (!ue_differentiation_info_local_var) { - return NULL; - } + OpenAPI_ue_differentiation_info_t *ue_differentiation_info_local_var = ogs_malloc(sizeof(OpenAPI_ue_differentiation_info_t)); + ogs_assert(ue_differentiation_info_local_var); + ue_differentiation_info_local_var->periodic_com_ind = periodic_com_ind; ue_differentiation_info_local_var->is_periodic_time = is_periodic_time; ue_differentiation_info_local_var->periodic_time = periodic_time; @@ -194,7 +193,7 @@ OpenAPI_ue_differentiation_info_t *OpenAPI_ue_differentiation_info_parseFromJSON stationary_ind ? stationary_indVariable : 0, traffic_profile ? traffic_profileVariable : 0, battery_ind ? battery_ind_local_nonprim : NULL, - validity_time ? ogs_strdup_or_assert(validity_time->valuestring) : NULL + validity_time ? ogs_strdup(validity_time->valuestring) : NULL ); return ue_differentiation_info_local_var; diff --git a/lib/sbi/openapi/model/ue_id.c b/lib/sbi/openapi/model/ue_id.c index 286587f5c..b7f301662 100644 --- a/lib/sbi/openapi/model/ue_id.c +++ b/lib/sbi/openapi/model/ue_id.c @@ -9,10 +9,9 @@ OpenAPI_ue_id_t *OpenAPI_ue_id_create( OpenAPI_list_t *gpsi_list ) { - OpenAPI_ue_id_t *ue_id_local_var = OpenAPI_malloc(sizeof(OpenAPI_ue_id_t)); - if (!ue_id_local_var) { - return NULL; - } + OpenAPI_ue_id_t *ue_id_local_var = ogs_malloc(sizeof(OpenAPI_ue_id_t)); + ogs_assert(ue_id_local_var); + ue_id_local_var->supi = supi; ue_id_local_var->gpsi_list = gpsi_list; @@ -98,12 +97,12 @@ OpenAPI_ue_id_t *OpenAPI_ue_id_parseFromJSON(cJSON *ue_idJSON) ogs_error("OpenAPI_ue_id_parseFromJSON() failed [gpsi_list]"); goto end; } - OpenAPI_list_add(gpsi_listList , ogs_strdup_or_assert(gpsi_list_local->valuestring)); + OpenAPI_list_add(gpsi_listList , ogs_strdup(gpsi_list_local->valuestring)); } } ue_id_local_var = OpenAPI_ue_id_create ( - ogs_strdup_or_assert(supi->valuestring), + ogs_strdup(supi->valuestring), gpsi_list ? gpsi_listList : NULL ); diff --git a/lib/sbi/openapi/model/ue_identity_info.c b/lib/sbi/openapi/model/ue_identity_info.c index 26980e522..1eea1909d 100644 --- a/lib/sbi/openapi/model/ue_identity_info.c +++ b/lib/sbi/openapi/model/ue_identity_info.c @@ -10,10 +10,9 @@ OpenAPI_ue_identity_info_t *OpenAPI_ue_identity_info_create( char *supi ) { - OpenAPI_ue_identity_info_t *ue_identity_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_ue_identity_info_t)); - if (!ue_identity_info_local_var) { - return NULL; - } + OpenAPI_ue_identity_info_t *ue_identity_info_local_var = ogs_malloc(sizeof(OpenAPI_ue_identity_info_t)); + ogs_assert(ue_identity_info_local_var); + ue_identity_info_local_var->gpsi = gpsi; ue_identity_info_local_var->pei = pei; ue_identity_info_local_var->supi = supi; @@ -99,9 +98,9 @@ OpenAPI_ue_identity_info_t *OpenAPI_ue_identity_info_parseFromJSON(cJSON *ue_ide } ue_identity_info_local_var = OpenAPI_ue_identity_info_create ( - gpsi ? ogs_strdup_or_assert(gpsi->valuestring) : NULL, - pei ? ogs_strdup_or_assert(pei->valuestring) : NULL, - supi ? ogs_strdup_or_assert(supi->valuestring) : NULL + gpsi ? ogs_strdup(gpsi->valuestring) : NULL, + pei ? ogs_strdup(pei->valuestring) : NULL, + supi ? ogs_strdup(supi->valuestring) : NULL ); return ue_identity_info_local_var; diff --git a/lib/sbi/openapi/model/ue_initiated_resource_request.c b/lib/sbi/openapi/model/ue_initiated_resource_request.c index f1b7371c1..962d138be 100644 --- a/lib/sbi/openapi/model/ue_initiated_resource_request.c +++ b/lib/sbi/openapi/model/ue_initiated_resource_request.c @@ -13,10 +13,9 @@ OpenAPI_ue_initiated_resource_request_t *OpenAPI_ue_initiated_resource_request_c OpenAPI_requested_qos_t *req_qos ) { - OpenAPI_ue_initiated_resource_request_t *ue_initiated_resource_request_local_var = OpenAPI_malloc(sizeof(OpenAPI_ue_initiated_resource_request_t)); - if (!ue_initiated_resource_request_local_var) { - return NULL; - } + OpenAPI_ue_initiated_resource_request_t *ue_initiated_resource_request_local_var = ogs_malloc(sizeof(OpenAPI_ue_initiated_resource_request_t)); + ogs_assert(ue_initiated_resource_request_local_var); + ue_initiated_resource_request_local_var->pcc_rule_id = pcc_rule_id; ue_initiated_resource_request_local_var->rule_op = rule_op; ue_initiated_resource_request_local_var->is_precedence = is_precedence; @@ -173,7 +172,7 @@ OpenAPI_ue_initiated_resource_request_t *OpenAPI_ue_initiated_resource_request_p } ue_initiated_resource_request_local_var = OpenAPI_ue_initiated_resource_request_create ( - pcc_rule_id ? ogs_strdup_or_assert(pcc_rule_id->valuestring) : NULL, + pcc_rule_id ? ogs_strdup(pcc_rule_id->valuestring) : NULL, rule_opVariable, precedence ? true : false, precedence ? precedence->valuedouble : 0, diff --git a/lib/sbi/openapi/model/ue_n1_n2_info_subscription_create_data.c b/lib/sbi/openapi/model/ue_n1_n2_info_subscription_create_data.c index 77d3c9606..cfcbed940 100644 --- a/lib/sbi/openapi/model/ue_n1_n2_info_subscription_create_data.c +++ b/lib/sbi/openapi/model/ue_n1_n2_info_subscription_create_data.c @@ -14,10 +14,9 @@ OpenAPI_ue_n1_n2_info_subscription_create_data_t *OpenAPI_ue_n1_n2_info_subscrip OpenAPI_guami_t *old_guami ) { - OpenAPI_ue_n1_n2_info_subscription_create_data_t *ue_n1_n2_info_subscription_create_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_ue_n1_n2_info_subscription_create_data_t)); - if (!ue_n1_n2_info_subscription_create_data_local_var) { - return NULL; - } + OpenAPI_ue_n1_n2_info_subscription_create_data_t *ue_n1_n2_info_subscription_create_data_local_var = ogs_malloc(sizeof(OpenAPI_ue_n1_n2_info_subscription_create_data_t)); + ogs_assert(ue_n1_n2_info_subscription_create_data_local_var); + ue_n1_n2_info_subscription_create_data_local_var->n2_information_class = n2_information_class; ue_n1_n2_info_subscription_create_data_local_var->n2_notify_callback_uri = n2_notify_callback_uri; ue_n1_n2_info_subscription_create_data_local_var->n1_message_class = n1_message_class; @@ -182,11 +181,11 @@ OpenAPI_ue_n1_n2_info_subscription_create_data_t *OpenAPI_ue_n1_n2_info_subscrip ue_n1_n2_info_subscription_create_data_local_var = OpenAPI_ue_n1_n2_info_subscription_create_data_create ( n2_information_class ? n2_information_classVariable : 0, - n2_notify_callback_uri ? ogs_strdup_or_assert(n2_notify_callback_uri->valuestring) : NULL, + n2_notify_callback_uri ? ogs_strdup(n2_notify_callback_uri->valuestring) : NULL, n1_message_class ? n1_message_classVariable : 0, - n1_notify_callback_uri ? ogs_strdup_or_assert(n1_notify_callback_uri->valuestring) : NULL, - nf_id ? ogs_strdup_or_assert(nf_id->valuestring) : NULL, - supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, + n1_notify_callback_uri ? ogs_strdup(n1_notify_callback_uri->valuestring) : NULL, + nf_id ? ogs_strdup(nf_id->valuestring) : NULL, + supported_features ? ogs_strdup(supported_features->valuestring) : NULL, old_guami ? old_guami_local_nonprim : NULL ); diff --git a/lib/sbi/openapi/model/ue_n1_n2_info_subscription_created_data.c b/lib/sbi/openapi/model/ue_n1_n2_info_subscription_created_data.c index d9980385a..c54be2c9f 100644 --- a/lib/sbi/openapi/model/ue_n1_n2_info_subscription_created_data.c +++ b/lib/sbi/openapi/model/ue_n1_n2_info_subscription_created_data.c @@ -9,10 +9,9 @@ OpenAPI_ue_n1_n2_info_subscription_created_data_t *OpenAPI_ue_n1_n2_info_subscri char *supported_features ) { - OpenAPI_ue_n1_n2_info_subscription_created_data_t *ue_n1_n2_info_subscription_created_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_ue_n1_n2_info_subscription_created_data_t)); - if (!ue_n1_n2_info_subscription_created_data_local_var) { - return NULL; - } + OpenAPI_ue_n1_n2_info_subscription_created_data_t *ue_n1_n2_info_subscription_created_data_local_var = ogs_malloc(sizeof(OpenAPI_ue_n1_n2_info_subscription_created_data_t)); + ogs_assert(ue_n1_n2_info_subscription_created_data_local_var); + ue_n1_n2_info_subscription_created_data_local_var->n1n2_notify_subscription_id = n1n2_notify_subscription_id; ue_n1_n2_info_subscription_created_data_local_var->supported_features = supported_features; @@ -80,8 +79,8 @@ OpenAPI_ue_n1_n2_info_subscription_created_data_t *OpenAPI_ue_n1_n2_info_subscri } ue_n1_n2_info_subscription_created_data_local_var = OpenAPI_ue_n1_n2_info_subscription_created_data_create ( - ogs_strdup_or_assert(n1n2_notify_subscription_id->valuestring), - supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL + ogs_strdup(n1n2_notify_subscription_id->valuestring), + supported_features ? ogs_strdup(supported_features->valuestring) : NULL ); return ue_n1_n2_info_subscription_created_data_local_var; diff --git a/lib/sbi/openapi/model/ue_policy_section.c b/lib/sbi/openapi/model/ue_policy_section.c index b0a1b1737..888422cdb 100644 --- a/lib/sbi/openapi/model/ue_policy_section.c +++ b/lib/sbi/openapi/model/ue_policy_section.c @@ -9,10 +9,9 @@ OpenAPI_ue_policy_section_t *OpenAPI_ue_policy_section_create( char *upsi ) { - OpenAPI_ue_policy_section_t *ue_policy_section_local_var = OpenAPI_malloc(sizeof(OpenAPI_ue_policy_section_t)); - if (!ue_policy_section_local_var) { - return NULL; - } + OpenAPI_ue_policy_section_t *ue_policy_section_local_var = ogs_malloc(sizeof(OpenAPI_ue_policy_section_t)); + ogs_assert(ue_policy_section_local_var); + ue_policy_section_local_var->ue_policy_section_info = ue_policy_section_info; ue_policy_section_local_var->upsi = upsi; @@ -80,7 +79,7 @@ OpenAPI_ue_policy_section_t *OpenAPI_ue_policy_section_parseFromJSON(cJSON *ue_p ue_policy_section_local_var = OpenAPI_ue_policy_section_create ( ue_policy_section_info->valueint, - ogs_strdup_or_assert(upsi->valuestring) + ogs_strdup(upsi->valuestring) ); return ue_policy_section_local_var; diff --git a/lib/sbi/openapi/model/ue_policy_set.c b/lib/sbi/openapi/model/ue_policy_set.c index ffe209303..d2c0b3052 100644 --- a/lib/sbi/openapi/model/ue_policy_set.c +++ b/lib/sbi/openapi/model/ue_policy_set.c @@ -17,10 +17,9 @@ OpenAPI_ue_policy_set_t *OpenAPI_ue_policy_set_create( char *supp_feat ) { - OpenAPI_ue_policy_set_t *ue_policy_set_local_var = OpenAPI_malloc(sizeof(OpenAPI_ue_policy_set_t)); - if (!ue_policy_set_local_var) { - return NULL; - } + OpenAPI_ue_policy_set_t *ue_policy_set_local_var = ogs_malloc(sizeof(OpenAPI_ue_policy_set_t)); + ogs_assert(ue_policy_set_local_var); + ue_policy_set_local_var->pra_infos = pra_infos; ue_policy_set_local_var->subsc_cats = subsc_cats; ue_policy_set_local_var->ue_policy_sections = ue_policy_sections; @@ -43,6 +42,7 @@ void OpenAPI_ue_policy_set_free(OpenAPI_ue_policy_set_t *ue_policy_set) OpenAPI_lnode_t *node; OpenAPI_list_for_each(ue_policy_set->pra_infos, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_presence_info_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -53,6 +53,7 @@ void OpenAPI_ue_policy_set_free(OpenAPI_ue_policy_set_t *ue_policy_set) OpenAPI_list_free(ue_policy_set->subsc_cats); OpenAPI_list_for_each(ue_policy_set->ue_policy_sections, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_ue_policy_section_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -63,6 +64,7 @@ void OpenAPI_ue_policy_set_free(OpenAPI_ue_policy_set_t *ue_policy_set) OpenAPI_list_free(ue_policy_set->upsis); OpenAPI_list_for_each(ue_policy_set->allowed_route_sel_descs, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_plmn_route_selection_descriptor_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -246,9 +248,9 @@ OpenAPI_ue_policy_set_t *OpenAPI_ue_policy_set_parseFromJSON(cJSON *ue_policy_se cJSON *localMapObject = pra_infos_local_map; if (cJSON_IsObject(pra_infos_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_presence_info_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_presence_info_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(pra_infos_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_ue_policy_set_parseFromJSON() failed [pra_infos]"); goto end; @@ -273,7 +275,7 @@ OpenAPI_ue_policy_set_t *OpenAPI_ue_policy_set_parseFromJSON(cJSON *ue_policy_se ogs_error("OpenAPI_ue_policy_set_parseFromJSON() failed [subsc_cats]"); goto end; } - OpenAPI_list_add(subsc_catsList , ogs_strdup_or_assert(subsc_cats_local->valuestring)); + OpenAPI_list_add(subsc_catsList , ogs_strdup(subsc_cats_local->valuestring)); } } @@ -292,9 +294,9 @@ OpenAPI_ue_policy_set_t *OpenAPI_ue_policy_set_parseFromJSON(cJSON *ue_policy_se cJSON *localMapObject = ue_policy_sections_local_map; if (cJSON_IsObject(ue_policy_sections_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_ue_policy_section_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_ue_policy_section_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(ue_policy_sections_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_ue_policy_set_parseFromJSON() failed [ue_policy_sections]"); goto end; @@ -319,7 +321,7 @@ OpenAPI_ue_policy_set_t *OpenAPI_ue_policy_set_parseFromJSON(cJSON *ue_policy_se ogs_error("OpenAPI_ue_policy_set_parseFromJSON() failed [upsis]"); goto end; } - OpenAPI_list_add(upsisList , ogs_strdup_or_assert(upsis_local->valuestring)); + OpenAPI_list_add(upsisList , ogs_strdup(upsis_local->valuestring)); } } @@ -338,9 +340,9 @@ OpenAPI_ue_policy_set_t *OpenAPI_ue_policy_set_parseFromJSON(cJSON *ue_policy_se cJSON *localMapObject = allowed_route_sel_descs_local_map; if (cJSON_IsObject(allowed_route_sel_descs_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_plmn_route_selection_descriptor_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_plmn_route_selection_descriptor_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(allowed_route_sel_descs_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_ue_policy_set_parseFromJSON() failed [allowed_route_sel_descs]"); goto end; @@ -383,7 +385,7 @@ OpenAPI_ue_policy_set_t *OpenAPI_ue_policy_set_parseFromJSON(cJSON *ue_policy_se ogs_error("OpenAPI_ue_policy_set_parseFromJSON() failed [os_ids]"); goto end; } - OpenAPI_list_add(os_idsList , ogs_strdup_or_assert(os_ids_local->valuestring)); + OpenAPI_list_add(os_idsList , ogs_strdup(os_ids_local->valuestring)); } } @@ -404,9 +406,9 @@ OpenAPI_ue_policy_set_t *OpenAPI_ue_policy_set_parseFromJSON(cJSON *ue_policy_se allowed_route_sel_descs ? allowed_route_sel_descsList : NULL, andsp_ind ? true : false, andsp_ind ? andsp_ind->valueint : 0, - pei ? ogs_strdup_or_assert(pei->valuestring) : NULL, + pei ? ogs_strdup(pei->valuestring) : NULL, os_ids ? os_idsList : NULL, - supp_feat ? ogs_strdup_or_assert(supp_feat->valuestring) : NULL + supp_feat ? ogs_strdup(supp_feat->valuestring) : NULL ); return ue_policy_set_local_var; diff --git a/lib/sbi/openapi/model/ue_policy_set_patch.c b/lib/sbi/openapi/model/ue_policy_set_patch.c index 89745ae29..572135273 100644 --- a/lib/sbi/openapi/model/ue_policy_set_patch.c +++ b/lib/sbi/openapi/model/ue_policy_set_patch.c @@ -13,10 +13,9 @@ OpenAPI_ue_policy_set_patch_t *OpenAPI_ue_policy_set_patch_create( OpenAPI_list_t *os_ids ) { - OpenAPI_ue_policy_set_patch_t *ue_policy_set_patch_local_var = OpenAPI_malloc(sizeof(OpenAPI_ue_policy_set_patch_t)); - if (!ue_policy_set_patch_local_var) { - return NULL; - } + OpenAPI_ue_policy_set_patch_t *ue_policy_set_patch_local_var = ogs_malloc(sizeof(OpenAPI_ue_policy_set_patch_t)); + ogs_assert(ue_policy_set_patch_local_var); + ue_policy_set_patch_local_var->ue_policy_sections = ue_policy_sections; ue_policy_set_patch_local_var->upsis = upsis; ue_policy_set_patch_local_var->is_andsp_ind = is_andsp_ind; @@ -35,6 +34,7 @@ void OpenAPI_ue_policy_set_patch_free(OpenAPI_ue_policy_set_patch_t *ue_policy_s OpenAPI_lnode_t *node; OpenAPI_list_for_each(ue_policy_set_patch->ue_policy_sections, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_ue_policy_section_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -152,9 +152,9 @@ OpenAPI_ue_policy_set_patch_t *OpenAPI_ue_policy_set_patch_parseFromJSON(cJSON * cJSON *localMapObject = ue_policy_sections_local_map; if (cJSON_IsObject(ue_policy_sections_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_ue_policy_section_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_ue_policy_section_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(ue_policy_sections_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_ue_policy_set_patch_parseFromJSON() failed [ue_policy_sections]"); goto end; @@ -179,7 +179,7 @@ OpenAPI_ue_policy_set_patch_t *OpenAPI_ue_policy_set_patch_parseFromJSON(cJSON * ogs_error("OpenAPI_ue_policy_set_patch_parseFromJSON() failed [upsis]"); goto end; } - OpenAPI_list_add(upsisList , ogs_strdup_or_assert(upsis_local->valuestring)); + OpenAPI_list_add(upsisList , ogs_strdup(upsis_local->valuestring)); } } @@ -217,7 +217,7 @@ OpenAPI_ue_policy_set_patch_t *OpenAPI_ue_policy_set_patch_parseFromJSON(cJSON * ogs_error("OpenAPI_ue_policy_set_patch_parseFromJSON() failed [os_ids]"); goto end; } - OpenAPI_list_add(os_idsList , ogs_strdup_or_assert(os_ids_local->valuestring)); + OpenAPI_list_add(os_idsList , ogs_strdup(os_ids_local->valuestring)); } } @@ -226,7 +226,7 @@ OpenAPI_ue_policy_set_patch_t *OpenAPI_ue_policy_set_patch_parseFromJSON(cJSON * upsis ? upsisList : NULL, andsp_ind ? true : false, andsp_ind ? andsp_ind->valueint : 0, - pei ? ogs_strdup_or_assert(pei->valuestring) : NULL, + pei ? ogs_strdup(pei->valuestring) : NULL, os_ids ? os_idsList : NULL ); diff --git a/lib/sbi/openapi/model/ue_reachability.c b/lib/sbi/openapi/model/ue_reachability.c index e93994f89..ab3860160 100644 --- a/lib/sbi/openapi/model/ue_reachability.c +++ b/lib/sbi/openapi/model/ue_reachability.c @@ -7,10 +7,9 @@ OpenAPI_ue_reachability_t *OpenAPI_ue_reachability_create( ) { - OpenAPI_ue_reachability_t *ue_reachability_local_var = OpenAPI_malloc(sizeof(OpenAPI_ue_reachability_t)); - if (!ue_reachability_local_var) { - return NULL; - } + OpenAPI_ue_reachability_t *ue_reachability_local_var = ogs_malloc(sizeof(OpenAPI_ue_reachability_t)); + ogs_assert(ue_reachability_local_var); + return ue_reachability_local_var; } diff --git a/lib/sbi/openapi/model/ue_reg_status_update_req_data.c b/lib/sbi/openapi/model/ue_reg_status_update_req_data.c index 7ba6a9cbf..14af3e596 100644 --- a/lib/sbi/openapi/model/ue_reg_status_update_req_data.c +++ b/lib/sbi/openapi/model/ue_reg_status_update_req_data.c @@ -12,10 +12,9 @@ OpenAPI_ue_reg_status_update_req_data_t *OpenAPI_ue_reg_status_update_req_data_c OpenAPI_list_t *smf_change_info_list ) { - OpenAPI_ue_reg_status_update_req_data_t *ue_reg_status_update_req_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_ue_reg_status_update_req_data_t)); - if (!ue_reg_status_update_req_data_local_var) { - return NULL; - } + OpenAPI_ue_reg_status_update_req_data_t *ue_reg_status_update_req_data_local_var = ogs_malloc(sizeof(OpenAPI_ue_reg_status_update_req_data_t)); + ogs_assert(ue_reg_status_update_req_data_local_var); + ue_reg_status_update_req_data_local_var->transfer_status = transfer_status; ue_reg_status_update_req_data_local_var->to_release_session_list = to_release_session_list; ue_reg_status_update_req_data_local_var->is_pcf_reselected_ind = is_pcf_reselected_ind; diff --git a/lib/sbi/openapi/model/ue_reg_status_update_rsp_data.c b/lib/sbi/openapi/model/ue_reg_status_update_rsp_data.c index 49bf67b91..764e55f45 100644 --- a/lib/sbi/openapi/model/ue_reg_status_update_rsp_data.c +++ b/lib/sbi/openapi/model/ue_reg_status_update_rsp_data.c @@ -8,10 +8,9 @@ OpenAPI_ue_reg_status_update_rsp_data_t *OpenAPI_ue_reg_status_update_rsp_data_c int reg_status_transfer_complete ) { - OpenAPI_ue_reg_status_update_rsp_data_t *ue_reg_status_update_rsp_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_ue_reg_status_update_rsp_data_t)); - if (!ue_reg_status_update_rsp_data_local_var) { - return NULL; - } + OpenAPI_ue_reg_status_update_rsp_data_t *ue_reg_status_update_rsp_data_local_var = ogs_malloc(sizeof(OpenAPI_ue_reg_status_update_rsp_data_t)); + ogs_assert(ue_reg_status_update_rsp_data_local_var); + ue_reg_status_update_rsp_data_local_var->reg_status_transfer_complete = reg_status_transfer_complete; return ue_reg_status_update_rsp_data_local_var; diff --git a/lib/sbi/openapi/model/ulcl_bp_information.c b/lib/sbi/openapi/model/ulcl_bp_information.c index 979b1de7b..feeb69011 100644 --- a/lib/sbi/openapi/model/ulcl_bp_information.c +++ b/lib/sbi/openapi/model/ulcl_bp_information.c @@ -8,10 +8,9 @@ OpenAPI_ulcl_bp_information_t *OpenAPI_ulcl_bp_information_create( char *ulcl_bp_upf_id ) { - OpenAPI_ulcl_bp_information_t *ulcl_bp_information_local_var = OpenAPI_malloc(sizeof(OpenAPI_ulcl_bp_information_t)); - if (!ulcl_bp_information_local_var) { - return NULL; - } + OpenAPI_ulcl_bp_information_t *ulcl_bp_information_local_var = ogs_malloc(sizeof(OpenAPI_ulcl_bp_information_t)); + ogs_assert(ulcl_bp_information_local_var); + ulcl_bp_information_local_var->ulcl_bp_upf_id = ulcl_bp_upf_id; return ulcl_bp_information_local_var; @@ -61,7 +60,7 @@ OpenAPI_ulcl_bp_information_t *OpenAPI_ulcl_bp_information_parseFromJSON(cJSON * } ulcl_bp_information_local_var = OpenAPI_ulcl_bp_information_create ( - ulcl_bp_upf_id ? ogs_strdup_or_assert(ulcl_bp_upf_id->valuestring) : NULL + ulcl_bp_upf_id ? ogs_strdup(ulcl_bp_upf_id->valuestring) : NULL ); return ulcl_bp_information_local_var; diff --git a/lib/sbi/openapi/model/uncertainty_ellipse.c b/lib/sbi/openapi/model/uncertainty_ellipse.c index 9415f769b..3962bb6bd 100644 --- a/lib/sbi/openapi/model/uncertainty_ellipse.c +++ b/lib/sbi/openapi/model/uncertainty_ellipse.c @@ -10,10 +10,9 @@ OpenAPI_uncertainty_ellipse_t *OpenAPI_uncertainty_ellipse_create( int orientation_major ) { - OpenAPI_uncertainty_ellipse_t *uncertainty_ellipse_local_var = OpenAPI_malloc(sizeof(OpenAPI_uncertainty_ellipse_t)); - if (!uncertainty_ellipse_local_var) { - return NULL; - } + OpenAPI_uncertainty_ellipse_t *uncertainty_ellipse_local_var = ogs_malloc(sizeof(OpenAPI_uncertainty_ellipse_t)); + ogs_assert(uncertainty_ellipse_local_var); + uncertainty_ellipse_local_var->semi_major = semi_major; uncertainty_ellipse_local_var->semi_minor = semi_minor; uncertainty_ellipse_local_var->orientation_major = orientation_major; diff --git a/lib/sbi/openapi/model/unrelated_class.c b/lib/sbi/openapi/model/unrelated_class.c index 30e1a081d..652153785 100644 --- a/lib/sbi/openapi/model/unrelated_class.c +++ b/lib/sbi/openapi/model/unrelated_class.c @@ -10,10 +10,9 @@ OpenAPI_unrelated_class_t *OpenAPI_unrelated_class_create( OpenAPI_list_t *service_type_unrelated_classes ) { - OpenAPI_unrelated_class_t *unrelated_class_local_var = OpenAPI_malloc(sizeof(OpenAPI_unrelated_class_t)); - if (!unrelated_class_local_var) { - return NULL; - } + OpenAPI_unrelated_class_t *unrelated_class_local_var = ogs_malloc(sizeof(OpenAPI_unrelated_class_t)); + ogs_assert(unrelated_class_local_var); + unrelated_class_local_var->default_unrelated_class = default_unrelated_class; unrelated_class_local_var->external_unrelated_class = external_unrelated_class; unrelated_class_local_var->service_type_unrelated_classes = service_type_unrelated_classes; diff --git a/lib/sbi/openapi/model/unrelated_class_1.c b/lib/sbi/openapi/model/unrelated_class_1.c index 8b387ca24..f2f4fff0b 100644 --- a/lib/sbi/openapi/model/unrelated_class_1.c +++ b/lib/sbi/openapi/model/unrelated_class_1.c @@ -10,10 +10,9 @@ OpenAPI_unrelated_class_1_t *OpenAPI_unrelated_class_1_create( OpenAPI_list_t *service_type_unrelated_classes ) { - OpenAPI_unrelated_class_1_t *unrelated_class_1_local_var = OpenAPI_malloc(sizeof(OpenAPI_unrelated_class_1_t)); - if (!unrelated_class_1_local_var) { - return NULL; - } + OpenAPI_unrelated_class_1_t *unrelated_class_1_local_var = ogs_malloc(sizeof(OpenAPI_unrelated_class_1_t)); + ogs_assert(unrelated_class_1_local_var); + unrelated_class_1_local_var->default_unrelated_class = default_unrelated_class; unrelated_class_1_local_var->external_unrelated_class = external_unrelated_class; unrelated_class_1_local_var->service_type_unrelated_classes = service_type_unrelated_classes; diff --git a/lib/sbi/openapi/model/up_path_chg_event.c b/lib/sbi/openapi/model/up_path_chg_event.c index 1f7ab1f28..01a02cc49 100644 --- a/lib/sbi/openapi/model/up_path_chg_event.c +++ b/lib/sbi/openapi/model/up_path_chg_event.c @@ -12,10 +12,9 @@ OpenAPI_up_path_chg_event_t *OpenAPI_up_path_chg_event_create( int af_ack_ind ) { - OpenAPI_up_path_chg_event_t *up_path_chg_event_local_var = OpenAPI_malloc(sizeof(OpenAPI_up_path_chg_event_t)); - if (!up_path_chg_event_local_var) { - return NULL; - } + OpenAPI_up_path_chg_event_t *up_path_chg_event_local_var = ogs_malloc(sizeof(OpenAPI_up_path_chg_event_t)); + ogs_assert(up_path_chg_event_local_var); + up_path_chg_event_local_var->notification_uri = notification_uri; up_path_chg_event_local_var->notif_corre_id = notif_corre_id; up_path_chg_event_local_var->dnai_chg_type = dnai_chg_type; @@ -120,8 +119,8 @@ OpenAPI_up_path_chg_event_t *OpenAPI_up_path_chg_event_parseFromJSON(cJSON *up_p } up_path_chg_event_local_var = OpenAPI_up_path_chg_event_create ( - ogs_strdup_or_assert(notification_uri->valuestring), - ogs_strdup_or_assert(notif_corre_id->valuestring), + ogs_strdup(notification_uri->valuestring), + ogs_strdup(notif_corre_id->valuestring), dnai_chg_typeVariable, af_ack_ind ? true : false, af_ack_ind ? af_ack_ind->valueint : 0 diff --git a/lib/sbi/openapi/model/up_security.c b/lib/sbi/openapi/model/up_security.c index 06fb61d68..eeea60904 100644 --- a/lib/sbi/openapi/model/up_security.c +++ b/lib/sbi/openapi/model/up_security.c @@ -9,10 +9,9 @@ OpenAPI_up_security_t *OpenAPI_up_security_create( OpenAPI_up_confidentiality_e up_confid ) { - OpenAPI_up_security_t *up_security_local_var = OpenAPI_malloc(sizeof(OpenAPI_up_security_t)); - if (!up_security_local_var) { - return NULL; - } + OpenAPI_up_security_t *up_security_local_var = ogs_malloc(sizeof(OpenAPI_up_security_t)); + ogs_assert(up_security_local_var); + up_security_local_var->up_integr = up_integr; up_security_local_var->up_confid = up_confid; diff --git a/lib/sbi/openapi/model/up_security_1.c b/lib/sbi/openapi/model/up_security_1.c index 7ced2db73..a8c548ed8 100644 --- a/lib/sbi/openapi/model/up_security_1.c +++ b/lib/sbi/openapi/model/up_security_1.c @@ -9,10 +9,9 @@ OpenAPI_up_security_1_t *OpenAPI_up_security_1_create( OpenAPI_up_confidentiality_e up_confid ) { - OpenAPI_up_security_1_t *up_security_1_local_var = OpenAPI_malloc(sizeof(OpenAPI_up_security_1_t)); - if (!up_security_1_local_var) { - return NULL; - } + OpenAPI_up_security_1_t *up_security_1_local_var = ogs_malloc(sizeof(OpenAPI_up_security_1_t)); + ogs_assert(up_security_1_local_var); + up_security_1_local_var->up_integr = up_integr; up_security_1_local_var->up_confid = up_confid; diff --git a/lib/sbi/openapi/model/up_security_info.c b/lib/sbi/openapi/model/up_security_info.c index a0f093c0e..49c7ea6eb 100644 --- a/lib/sbi/openapi/model/up_security_info.c +++ b/lib/sbi/openapi/model/up_security_info.c @@ -11,10 +11,9 @@ OpenAPI_up_security_info_t *OpenAPI_up_security_info_create( OpenAPI_security_result_t *security_result ) { - OpenAPI_up_security_info_t *up_security_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_up_security_info_t)); - if (!up_security_info_local_var) { - return NULL; - } + OpenAPI_up_security_info_t *up_security_info_local_var = ogs_malloc(sizeof(OpenAPI_up_security_info_t)); + ogs_assert(up_security_info_local_var); + up_security_info_local_var->up_security = up_security; up_security_info_local_var->max_integrity_protected_data_rate_ul = max_integrity_protected_data_rate_ul; up_security_info_local_var->max_integrity_protected_data_rate_dl = max_integrity_protected_data_rate_dl; diff --git a/lib/sbi/openapi/model/updated_item.c b/lib/sbi/openapi/model/updated_item.c index 40134149b..caf9bb3ff 100644 --- a/lib/sbi/openapi/model/updated_item.c +++ b/lib/sbi/openapi/model/updated_item.c @@ -9,10 +9,9 @@ OpenAPI_updated_item_t *OpenAPI_updated_item_create( char *value ) { - OpenAPI_updated_item_t *updated_item_local_var = OpenAPI_malloc(sizeof(OpenAPI_updated_item_t)); - if (!updated_item_local_var) { - return NULL; - } + OpenAPI_updated_item_t *updated_item_local_var = ogs_malloc(sizeof(OpenAPI_updated_item_t)); + ogs_assert(updated_item_local_var); + updated_item_local_var->item = item; updated_item_local_var->value = value; @@ -80,8 +79,8 @@ OpenAPI_updated_item_t *OpenAPI_updated_item_parseFromJSON(cJSON *updated_itemJS } updated_item_local_var = OpenAPI_updated_item_create ( - ogs_strdup_or_assert(item->valuestring), - ogs_strdup_or_assert(value->valuestring) + ogs_strdup(item->valuestring), + ogs_strdup(value->valuestring) ); return updated_item_local_var; diff --git a/lib/sbi/openapi/model/upf_cond.c b/lib/sbi/openapi/model/upf_cond.c index 0e6827064..536b6f5b8 100644 --- a/lib/sbi/openapi/model/upf_cond.c +++ b/lib/sbi/openapi/model/upf_cond.c @@ -33,10 +33,9 @@ OpenAPI_upf_cond_t *OpenAPI_upf_cond_create( OpenAPI_list_t *tai_list ) { - OpenAPI_upf_cond_t *upf_cond_local_var = OpenAPI_malloc(sizeof(OpenAPI_upf_cond_t)); - if (!upf_cond_local_var) { - return NULL; - } + OpenAPI_upf_cond_t *upf_cond_local_var = ogs_malloc(sizeof(OpenAPI_upf_cond_t)); + ogs_assert(upf_cond_local_var); + upf_cond_local_var->condition_type = condition_type; upf_cond_local_var->smf_serving_area = smf_serving_area; upf_cond_local_var->tai_list = tai_list; @@ -148,7 +147,7 @@ OpenAPI_upf_cond_t *OpenAPI_upf_cond_parseFromJSON(cJSON *upf_condJSON) ogs_error("OpenAPI_upf_cond_parseFromJSON() failed [smf_serving_area]"); goto end; } - OpenAPI_list_add(smf_serving_areaList , ogs_strdup_or_assert(smf_serving_area_local->valuestring)); + OpenAPI_list_add(smf_serving_areaList , ogs_strdup(smf_serving_area_local->valuestring)); } } diff --git a/lib/sbi/openapi/model/upf_info.c b/lib/sbi/openapi/model/upf_info.c index bce5336dc..4b6fae179 100644 --- a/lib/sbi/openapi/model/upf_info.c +++ b/lib/sbi/openapi/model/upf_info.c @@ -28,10 +28,9 @@ OpenAPI_upf_info_t *OpenAPI_upf_info_create( int data_forwarding ) { - OpenAPI_upf_info_t *upf_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_upf_info_t)); - if (!upf_info_local_var) { - return NULL; - } + OpenAPI_upf_info_t *upf_info_local_var = ogs_malloc(sizeof(OpenAPI_upf_info_t)); + ogs_assert(upf_info_local_var); + upf_info_local_var->s_nssai_upf_info_list = s_nssai_upf_info_list; upf_info_local_var->smf_serving_area = smf_serving_area; upf_info_local_var->interface_upf_info_list = interface_upf_info_list; @@ -328,7 +327,7 @@ OpenAPI_upf_info_t *OpenAPI_upf_info_parseFromJSON(cJSON *upf_infoJSON) ogs_error("OpenAPI_upf_info_parseFromJSON() failed [smf_serving_area]"); goto end; } - OpenAPI_list_add(smf_serving_areaList , ogs_strdup_or_assert(smf_serving_area_local->valuestring)); + OpenAPI_list_add(smf_serving_areaList , ogs_strdup(smf_serving_area_local->valuestring)); } } diff --git a/lib/sbi/openapi/model/upu_data.c b/lib/sbi/openapi/model/upu_data.c index f57348a33..ec47b3cb2 100644 --- a/lib/sbi/openapi/model/upu_data.c +++ b/lib/sbi/openapi/model/upu_data.c @@ -11,10 +11,9 @@ OpenAPI_upu_data_t *OpenAPI_upu_data_create( char *upu_mac_iue ) { - OpenAPI_upu_data_t *upu_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_upu_data_t)); - if (!upu_data_local_var) { - return NULL; - } + OpenAPI_upu_data_t *upu_data_local_var = ogs_malloc(sizeof(OpenAPI_upu_data_t)); + ogs_assert(upu_data_local_var); + upu_data_local_var->provisioning_time = provisioning_time; upu_data_local_var->ue_update_status = ue_update_status; upu_data_local_var->upu_xmac_iue = upu_xmac_iue; @@ -119,10 +118,10 @@ OpenAPI_upu_data_t *OpenAPI_upu_data_parseFromJSON(cJSON *upu_dataJSON) } upu_data_local_var = OpenAPI_upu_data_create ( - ogs_strdup_or_assert(provisioning_time->valuestring), + ogs_strdup(provisioning_time->valuestring), ue_update_statusVariable, - upu_xmac_iue ? ogs_strdup_or_assert(upu_xmac_iue->valuestring) : NULL, - upu_mac_iue ? ogs_strdup_or_assert(upu_mac_iue->valuestring) : NULL + upu_xmac_iue ? ogs_strdup(upu_xmac_iue->valuestring) : NULL, + upu_mac_iue ? ogs_strdup(upu_mac_iue->valuestring) : NULL ); return upu_data_local_var; diff --git a/lib/sbi/openapi/model/upu_data_1.c b/lib/sbi/openapi/model/upu_data_1.c index 62eb85321..ad7dc8094 100644 --- a/lib/sbi/openapi/model/upu_data_1.c +++ b/lib/sbi/openapi/model/upu_data_1.c @@ -10,10 +10,9 @@ OpenAPI_upu_data_1_t *OpenAPI_upu_data_1_create( char *routing_id ) { - OpenAPI_upu_data_1_t *upu_data_1_local_var = OpenAPI_malloc(sizeof(OpenAPI_upu_data_1_t)); - if (!upu_data_1_local_var) { - return NULL; - } + OpenAPI_upu_data_1_t *upu_data_1_local_var = ogs_malloc(sizeof(OpenAPI_upu_data_1_t)); + ogs_assert(upu_data_1_local_var); + upu_data_1_local_var->sec_packet = sec_packet; upu_data_1_local_var->default_conf_nssai = default_conf_nssai; upu_data_1_local_var->routing_id = routing_id; @@ -129,9 +128,9 @@ OpenAPI_upu_data_1_t *OpenAPI_upu_data_1_parseFromJSON(cJSON *upu_data_1JSON) } upu_data_1_local_var = OpenAPI_upu_data_1_create ( - sec_packet ? ogs_strdup_or_assert(sec_packet->valuestring) : NULL, + sec_packet ? ogs_strdup(sec_packet->valuestring) : NULL, default_conf_nssai ? default_conf_nssaiList : NULL, - routing_id ? ogs_strdup_or_assert(routing_id->valuestring) : NULL + routing_id ? ogs_strdup(routing_id->valuestring) : NULL ); return upu_data_1_local_var; diff --git a/lib/sbi/openapi/model/upu_data_2.c b/lib/sbi/openapi/model/upu_data_2.c index 3a5f91237..39459cea2 100644 --- a/lib/sbi/openapi/model/upu_data_2.c +++ b/lib/sbi/openapi/model/upu_data_2.c @@ -10,10 +10,9 @@ OpenAPI_upu_data_2_t *OpenAPI_upu_data_2_create( char *routing_id ) { - OpenAPI_upu_data_2_t *upu_data_2_local_var = OpenAPI_malloc(sizeof(OpenAPI_upu_data_2_t)); - if (!upu_data_2_local_var) { - return NULL; - } + OpenAPI_upu_data_2_t *upu_data_2_local_var = ogs_malloc(sizeof(OpenAPI_upu_data_2_t)); + ogs_assert(upu_data_2_local_var); + upu_data_2_local_var->sec_packet = sec_packet; upu_data_2_local_var->default_conf_nssai = default_conf_nssai; upu_data_2_local_var->routing_id = routing_id; @@ -129,9 +128,9 @@ OpenAPI_upu_data_2_t *OpenAPI_upu_data_2_parseFromJSON(cJSON *upu_data_2JSON) } upu_data_2_local_var = OpenAPI_upu_data_2_create ( - sec_packet ? ogs_strdup_or_assert(sec_packet->valuestring) : NULL, + sec_packet ? ogs_strdup(sec_packet->valuestring) : NULL, default_conf_nssai ? default_conf_nssaiList : NULL, - routing_id ? ogs_strdup_or_assert(routing_id->valuestring) : NULL + routing_id ? ogs_strdup(routing_id->valuestring) : NULL ); return upu_data_2_local_var; diff --git a/lib/sbi/openapi/model/upu_info.c b/lib/sbi/openapi/model/upu_info.c index 50bc9267b..e8877f2e6 100644 --- a/lib/sbi/openapi/model/upu_info.c +++ b/lib/sbi/openapi/model/upu_info.c @@ -13,10 +13,9 @@ OpenAPI_upu_info_t *OpenAPI_upu_info_create( char *provisioning_time ) { - OpenAPI_upu_info_t *upu_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_upu_info_t)); - if (!upu_info_local_var) { - return NULL; - } + OpenAPI_upu_info_t *upu_info_local_var = ogs_malloc(sizeof(OpenAPI_upu_info_t)); + ogs_assert(upu_info_local_var); + upu_info_local_var->upu_data_list = upu_data_list; upu_info_local_var->upu_reg_ind = upu_reg_ind; upu_info_local_var->upu_ack_ind = upu_ack_ind; @@ -189,9 +188,9 @@ OpenAPI_upu_info_t *OpenAPI_upu_info_parseFromJSON(cJSON *upu_infoJSON) upu_reg_ind->valueint, upu_ack_ind->valueint, - upu_mac_iausf ? ogs_strdup_or_assert(upu_mac_iausf->valuestring) : NULL, - counter_upu ? ogs_strdup_or_assert(counter_upu->valuestring) : NULL, - ogs_strdup_or_assert(provisioning_time->valuestring) + upu_mac_iausf ? ogs_strdup(upu_mac_iausf->valuestring) : NULL, + counter_upu ? ogs_strdup(counter_upu->valuestring) : NULL, + ogs_strdup(provisioning_time->valuestring) ); return upu_info_local_var; diff --git a/lib/sbi/openapi/model/upu_info_1.c b/lib/sbi/openapi/model/upu_info_1.c index 8d442a987..4a6930c37 100644 --- a/lib/sbi/openapi/model/upu_info_1.c +++ b/lib/sbi/openapi/model/upu_info_1.c @@ -13,10 +13,9 @@ OpenAPI_upu_info_1_t *OpenAPI_upu_info_1_create( char *provisioning_time ) { - OpenAPI_upu_info_1_t *upu_info_1_local_var = OpenAPI_malloc(sizeof(OpenAPI_upu_info_1_t)); - if (!upu_info_1_local_var) { - return NULL; - } + OpenAPI_upu_info_1_t *upu_info_1_local_var = ogs_malloc(sizeof(OpenAPI_upu_info_1_t)); + ogs_assert(upu_info_1_local_var); + upu_info_1_local_var->upu_data_list = upu_data_list; upu_info_1_local_var->upu_reg_ind = upu_reg_ind; upu_info_1_local_var->upu_ack_ind = upu_ack_ind; @@ -189,9 +188,9 @@ OpenAPI_upu_info_1_t *OpenAPI_upu_info_1_parseFromJSON(cJSON *upu_info_1JSON) upu_reg_ind->valueint, upu_ack_ind->valueint, - upu_mac_iausf ? ogs_strdup_or_assert(upu_mac_iausf->valuestring) : NULL, - counter_upu ? ogs_strdup_or_assert(counter_upu->valuestring) : NULL, - ogs_strdup_or_assert(provisioning_time->valuestring) + upu_mac_iausf ? ogs_strdup(upu_mac_iausf->valuestring) : NULL, + counter_upu ? ogs_strdup(counter_upu->valuestring) : NULL, + ogs_strdup(provisioning_time->valuestring) ); return upu_info_1_local_var; diff --git a/lib/sbi/openapi/model/usage_mon_data.c b/lib/sbi/openapi/model/usage_mon_data.c index 6e83e5f59..33e5915a8 100644 --- a/lib/sbi/openapi/model/usage_mon_data.c +++ b/lib/sbi/openapi/model/usage_mon_data.c @@ -13,10 +13,9 @@ OpenAPI_usage_mon_data_t *OpenAPI_usage_mon_data_create( char *supp_feat ) { - OpenAPI_usage_mon_data_t *usage_mon_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_usage_mon_data_t)); - if (!usage_mon_data_local_var) { - return NULL; - } + OpenAPI_usage_mon_data_t *usage_mon_data_local_var = ogs_malloc(sizeof(OpenAPI_usage_mon_data_t)); + ogs_assert(usage_mon_data_local_var); + usage_mon_data_local_var->limit_id = limit_id; usage_mon_data_local_var->scopes = scopes; usage_mon_data_local_var->um_level = um_level; @@ -36,6 +35,7 @@ void OpenAPI_usage_mon_data_free(OpenAPI_usage_mon_data_t *usage_mon_data) ogs_free(usage_mon_data->limit_id); OpenAPI_list_for_each(usage_mon_data->scopes, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_usage_mon_data_scope_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -164,9 +164,9 @@ OpenAPI_usage_mon_data_t *OpenAPI_usage_mon_data_parseFromJSON(cJSON *usage_mon_ cJSON *localMapObject = scopes_local_map; if (cJSON_IsObject(scopes_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_usage_mon_data_scope_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_usage_mon_data_scope_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(scopes_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_usage_mon_data_parseFromJSON() failed [scopes]"); goto end; @@ -206,12 +206,12 @@ OpenAPI_usage_mon_data_t *OpenAPI_usage_mon_data_parseFromJSON(cJSON *usage_mon_ } usage_mon_data_local_var = OpenAPI_usage_mon_data_create ( - ogs_strdup_or_assert(limit_id->valuestring), + ogs_strdup(limit_id->valuestring), scopes ? scopesList : NULL, um_level ? um_level_local_nonprim : NULL, allowed_usage ? allowed_usage_local_nonprim : NULL, reset_time ? reset_time_local_nonprim : NULL, - supp_feat ? ogs_strdup_or_assert(supp_feat->valuestring) : NULL + supp_feat ? ogs_strdup(supp_feat->valuestring) : NULL ); return usage_mon_data_local_var; diff --git a/lib/sbi/openapi/model/usage_mon_data_limit.c b/lib/sbi/openapi/model/usage_mon_data_limit.c index 4adf3a480..0fcd90b57 100644 --- a/lib/sbi/openapi/model/usage_mon_data_limit.c +++ b/lib/sbi/openapi/model/usage_mon_data_limit.c @@ -14,10 +14,9 @@ OpenAPI_usage_mon_data_limit_t *OpenAPI_usage_mon_data_limit_create( char *reset_period ) { - OpenAPI_usage_mon_data_limit_t *usage_mon_data_limit_local_var = OpenAPI_malloc(sizeof(OpenAPI_usage_mon_data_limit_t)); - if (!usage_mon_data_limit_local_var) { - return NULL; - } + OpenAPI_usage_mon_data_limit_t *usage_mon_data_limit_local_var = ogs_malloc(sizeof(OpenAPI_usage_mon_data_limit_t)); + ogs_assert(usage_mon_data_limit_local_var); + usage_mon_data_limit_local_var->limit_id = limit_id; usage_mon_data_limit_local_var->scopes = scopes; usage_mon_data_limit_local_var->um_level = um_level; @@ -38,6 +37,7 @@ void OpenAPI_usage_mon_data_limit_free(OpenAPI_usage_mon_data_limit_t *usage_mon ogs_free(usage_mon_data_limit->limit_id); OpenAPI_list_for_each(usage_mon_data_limit->scopes, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_usage_mon_data_scope_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -168,9 +168,9 @@ OpenAPI_usage_mon_data_limit_t *OpenAPI_usage_mon_data_limit_parseFromJSON(cJSON cJSON *localMapObject = scopes_local_map; if (cJSON_IsObject(scopes_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_usage_mon_data_scope_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_usage_mon_data_scope_parseFromJSON(localMapObject)); } else if (cJSON_IsNull(scopes_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_usage_mon_data_limit_parseFromJSON() failed [scopes]"); goto end; @@ -221,13 +221,13 @@ OpenAPI_usage_mon_data_limit_t *OpenAPI_usage_mon_data_limit_parseFromJSON(cJSON } usage_mon_data_limit_local_var = OpenAPI_usage_mon_data_limit_create ( - ogs_strdup_or_assert(limit_id->valuestring), + ogs_strdup(limit_id->valuestring), scopes ? scopesList : NULL, um_level ? um_level_local_nonprim : NULL, - start_date ? ogs_strdup_or_assert(start_date->valuestring) : NULL, - end_date ? ogs_strdup_or_assert(end_date->valuestring) : NULL, + start_date ? ogs_strdup(start_date->valuestring) : NULL, + end_date ? ogs_strdup(end_date->valuestring) : NULL, usage_limit ? usage_limit_local_nonprim : NULL, - reset_period ? ogs_strdup_or_assert(reset_period->valuestring) : NULL + reset_period ? ogs_strdup(reset_period->valuestring) : NULL ); return usage_mon_data_limit_local_var; diff --git a/lib/sbi/openapi/model/usage_mon_data_scope.c b/lib/sbi/openapi/model/usage_mon_data_scope.c index 90509d920..ae9554c65 100644 --- a/lib/sbi/openapi/model/usage_mon_data_scope.c +++ b/lib/sbi/openapi/model/usage_mon_data_scope.c @@ -9,10 +9,9 @@ OpenAPI_usage_mon_data_scope_t *OpenAPI_usage_mon_data_scope_create( OpenAPI_list_t *dnn ) { - OpenAPI_usage_mon_data_scope_t *usage_mon_data_scope_local_var = OpenAPI_malloc(sizeof(OpenAPI_usage_mon_data_scope_t)); - if (!usage_mon_data_scope_local_var) { - return NULL; - } + OpenAPI_usage_mon_data_scope_t *usage_mon_data_scope_local_var = ogs_malloc(sizeof(OpenAPI_usage_mon_data_scope_t)); + ogs_assert(usage_mon_data_scope_local_var); + usage_mon_data_scope_local_var->snssai = snssai; usage_mon_data_scope_local_var->dnn = dnn; @@ -102,7 +101,7 @@ OpenAPI_usage_mon_data_scope_t *OpenAPI_usage_mon_data_scope_parseFromJSON(cJSON ogs_error("OpenAPI_usage_mon_data_scope_parseFromJSON() failed [dnn]"); goto end; } - OpenAPI_list_add(dnnList , ogs_strdup_or_assert(dnn_local->valuestring)); + OpenAPI_list_add(dnnList , ogs_strdup(dnn_local->valuestring)); } } diff --git a/lib/sbi/openapi/model/usage_mon_level.c b/lib/sbi/openapi/model/usage_mon_level.c index fba88374b..4d793b44f 100644 --- a/lib/sbi/openapi/model/usage_mon_level.c +++ b/lib/sbi/openapi/model/usage_mon_level.c @@ -7,10 +7,9 @@ OpenAPI_usage_mon_level_t *OpenAPI_usage_mon_level_create( ) { - OpenAPI_usage_mon_level_t *usage_mon_level_local_var = OpenAPI_malloc(sizeof(OpenAPI_usage_mon_level_t)); - if (!usage_mon_level_local_var) { - return NULL; - } + OpenAPI_usage_mon_level_t *usage_mon_level_local_var = ogs_malloc(sizeof(OpenAPI_usage_mon_level_t)); + ogs_assert(usage_mon_level_local_var); + return usage_mon_level_local_var; } diff --git a/lib/sbi/openapi/model/usage_monitoring_data.c b/lib/sbi/openapi/model/usage_monitoring_data.c index e75d58753..2237a1c25 100644 --- a/lib/sbi/openapi/model/usage_monitoring_data.c +++ b/lib/sbi/openapi/model/usage_monitoring_data.c @@ -28,10 +28,9 @@ OpenAPI_usage_monitoring_data_t *OpenAPI_usage_monitoring_data_create( OpenAPI_list_t *ex_usage_pcc_rule_ids ) { - OpenAPI_usage_monitoring_data_t *usage_monitoring_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_usage_monitoring_data_t)); - if (!usage_monitoring_data_local_var) { - return NULL; - } + OpenAPI_usage_monitoring_data_t *usage_monitoring_data_local_var = ogs_malloc(sizeof(OpenAPI_usage_monitoring_data_t)); + ogs_assert(usage_monitoring_data_local_var); + usage_monitoring_data_local_var->um_id = um_id; usage_monitoring_data_local_var->is_volume_threshold = is_volume_threshold; usage_monitoring_data_local_var->volume_threshold = volume_threshold; @@ -297,12 +296,12 @@ OpenAPI_usage_monitoring_data_t *OpenAPI_usage_monitoring_data_parseFromJSON(cJS ogs_error("OpenAPI_usage_monitoring_data_parseFromJSON() failed [ex_usage_pcc_rule_ids]"); goto end; } - OpenAPI_list_add(ex_usage_pcc_rule_idsList , ogs_strdup_or_assert(ex_usage_pcc_rule_ids_local->valuestring)); + OpenAPI_list_add(ex_usage_pcc_rule_idsList , ogs_strdup(ex_usage_pcc_rule_ids_local->valuestring)); } } usage_monitoring_data_local_var = OpenAPI_usage_monitoring_data_create ( - ogs_strdup_or_assert(um_id->valuestring), + ogs_strdup(um_id->valuestring), volume_threshold ? true : false, volume_threshold ? volume_threshold->valuedouble : 0, volume_threshold_uplink ? true : false, @@ -311,7 +310,7 @@ OpenAPI_usage_monitoring_data_t *OpenAPI_usage_monitoring_data_parseFromJSON(cJS volume_threshold_downlink ? volume_threshold_downlink->valuedouble : 0, time_threshold ? true : false, time_threshold ? time_threshold->valuedouble : 0, - monitoring_time ? ogs_strdup_or_assert(monitoring_time->valuestring) : NULL, + monitoring_time ? ogs_strdup(monitoring_time->valuestring) : NULL, next_vol_threshold ? true : false, next_vol_threshold ? next_vol_threshold->valuedouble : 0, next_vol_threshold_uplink ? true : false, diff --git a/lib/sbi/openapi/model/usage_threshold.c b/lib/sbi/openapi/model/usage_threshold.c index 3d83460e1..8b35b3663 100644 --- a/lib/sbi/openapi/model/usage_threshold.c +++ b/lib/sbi/openapi/model/usage_threshold.c @@ -15,10 +15,9 @@ OpenAPI_usage_threshold_t *OpenAPI_usage_threshold_create( long uplink_volume ) { - OpenAPI_usage_threshold_t *usage_threshold_local_var = OpenAPI_malloc(sizeof(OpenAPI_usage_threshold_t)); - if (!usage_threshold_local_var) { - return NULL; - } + OpenAPI_usage_threshold_t *usage_threshold_local_var = ogs_malloc(sizeof(OpenAPI_usage_threshold_t)); + ogs_assert(usage_threshold_local_var); + usage_threshold_local_var->is_duration = is_duration; usage_threshold_local_var->duration = duration; usage_threshold_local_var->is_total_volume = is_total_volume; diff --git a/lib/sbi/openapi/model/usage_threshold_rm.c b/lib/sbi/openapi/model/usage_threshold_rm.c index 720403d80..5abfc045e 100644 --- a/lib/sbi/openapi/model/usage_threshold_rm.c +++ b/lib/sbi/openapi/model/usage_threshold_rm.c @@ -15,10 +15,9 @@ OpenAPI_usage_threshold_rm_t *OpenAPI_usage_threshold_rm_create( long uplink_volume ) { - OpenAPI_usage_threshold_rm_t *usage_threshold_rm_local_var = OpenAPI_malloc(sizeof(OpenAPI_usage_threshold_rm_t)); - if (!usage_threshold_rm_local_var) { - return NULL; - } + OpenAPI_usage_threshold_rm_t *usage_threshold_rm_local_var = ogs_malloc(sizeof(OpenAPI_usage_threshold_rm_t)); + ogs_assert(usage_threshold_rm_local_var); + usage_threshold_rm_local_var->is_duration = is_duration; usage_threshold_rm_local_var->duration = duration; usage_threshold_rm_local_var->is_total_volume = is_total_volume; diff --git a/lib/sbi/openapi/model/user_identifier.c b/lib/sbi/openapi/model/user_identifier.c index b7a28f325..3fad98283 100644 --- a/lib/sbi/openapi/model/user_identifier.c +++ b/lib/sbi/openapi/model/user_identifier.c @@ -10,10 +10,9 @@ OpenAPI_user_identifier_t *OpenAPI_user_identifier_create( char *validity_time ) { - OpenAPI_user_identifier_t *user_identifier_local_var = OpenAPI_malloc(sizeof(OpenAPI_user_identifier_t)); - if (!user_identifier_local_var) { - return NULL; - } + OpenAPI_user_identifier_t *user_identifier_local_var = ogs_malloc(sizeof(OpenAPI_user_identifier_t)); + ogs_assert(user_identifier_local_var); + user_identifier_local_var->supi = supi; user_identifier_local_var->gpsi = gpsi; user_identifier_local_var->validity_time = validity_time; @@ -99,9 +98,9 @@ OpenAPI_user_identifier_t *OpenAPI_user_identifier_parseFromJSON(cJSON *user_ide } user_identifier_local_var = OpenAPI_user_identifier_create ( - ogs_strdup_or_assert(supi->valuestring), - gpsi ? ogs_strdup_or_assert(gpsi->valuestring) : NULL, - validity_time ? ogs_strdup_or_assert(validity_time->valuestring) : NULL + ogs_strdup(supi->valuestring), + gpsi ? ogs_strdup(gpsi->valuestring) : NULL, + validity_time ? ogs_strdup(validity_time->valuestring) : NULL ); return user_identifier_local_var; diff --git a/lib/sbi/openapi/model/user_location.c b/lib/sbi/openapi/model/user_location.c index 3ea6a8a29..d3d42ff7a 100644 --- a/lib/sbi/openapi/model/user_location.c +++ b/lib/sbi/openapi/model/user_location.c @@ -10,10 +10,9 @@ OpenAPI_user_location_t *OpenAPI_user_location_create( OpenAPI_n3ga_location_t *n3ga_location ) { - OpenAPI_user_location_t *user_location_local_var = OpenAPI_malloc(sizeof(OpenAPI_user_location_t)); - if (!user_location_local_var) { - return NULL; - } + OpenAPI_user_location_t *user_location_local_var = ogs_malloc(sizeof(OpenAPI_user_location_t)); + ogs_assert(user_location_local_var); + user_location_local_var->eutra_location = eutra_location; user_location_local_var->nr_location = nr_location; user_location_local_var->n3ga_location = n3ga_location; diff --git a/lib/sbi/openapi/model/v2x_context.c b/lib/sbi/openapi/model/v2x_context.c index 643131ecc..0bfd8d4b5 100644 --- a/lib/sbi/openapi/model/v2x_context.c +++ b/lib/sbi/openapi/model/v2x_context.c @@ -12,10 +12,9 @@ OpenAPI_v2x_context_t *OpenAPI_v2x_context_create( OpenAPI_pc5_qo_s_para_t *pc5_qo_s_para ) { - OpenAPI_v2x_context_t *v2x_context_local_var = OpenAPI_malloc(sizeof(OpenAPI_v2x_context_t)); - if (!v2x_context_local_var) { - return NULL; - } + OpenAPI_v2x_context_t *v2x_context_local_var = ogs_malloc(sizeof(OpenAPI_v2x_context_t)); + ogs_assert(v2x_context_local_var); + v2x_context_local_var->nr_v2x_services_auth = nr_v2x_services_auth; v2x_context_local_var->lte_v2x_services_auth = lte_v2x_services_auth; v2x_context_local_var->nr_ue_sidelink_ambr = nr_ue_sidelink_ambr; @@ -151,8 +150,8 @@ OpenAPI_v2x_context_t *OpenAPI_v2x_context_parseFromJSON(cJSON *v2x_contextJSON) v2x_context_local_var = OpenAPI_v2x_context_create ( nr_v2x_services_auth ? nr_v2x_services_auth_local_nonprim : NULL, lte_v2x_services_auth ? lte_v2x_services_auth_local_nonprim : NULL, - nr_ue_sidelink_ambr ? ogs_strdup_or_assert(nr_ue_sidelink_ambr->valuestring) : NULL, - lte_ue_sidelink_ambr ? ogs_strdup_or_assert(lte_ue_sidelink_ambr->valuestring) : NULL, + nr_ue_sidelink_ambr ? ogs_strdup(nr_ue_sidelink_ambr->valuestring) : NULL, + lte_ue_sidelink_ambr ? ogs_strdup(lte_ue_sidelink_ambr->valuestring) : NULL, pc5_qo_s_para ? pc5_qo_s_para_local_nonprim : NULL ); diff --git a/lib/sbi/openapi/model/v2x_information.c b/lib/sbi/openapi/model/v2x_information.c index 93a53fb89..5a48ea43e 100644 --- a/lib/sbi/openapi/model/v2x_information.c +++ b/lib/sbi/openapi/model/v2x_information.c @@ -8,10 +8,9 @@ OpenAPI_v2x_information_t *OpenAPI_v2x_information_create( OpenAPI_n2_info_content_t *n2_pc5_pol ) { - OpenAPI_v2x_information_t *v2x_information_local_var = OpenAPI_malloc(sizeof(OpenAPI_v2x_information_t)); - if (!v2x_information_local_var) { - return NULL; - } + OpenAPI_v2x_information_t *v2x_information_local_var = ogs_malloc(sizeof(OpenAPI_v2x_information_t)); + ogs_assert(v2x_information_local_var); + v2x_information_local_var->n2_pc5_pol = n2_pc5_pol; return v2x_information_local_var; diff --git a/lib/sbi/openapi/model/v2x_subscription_data.c b/lib/sbi/openapi/model/v2x_subscription_data.c index 6e28b0452..b67f1c2ea 100644 --- a/lib/sbi/openapi/model/v2x_subscription_data.c +++ b/lib/sbi/openapi/model/v2x_subscription_data.c @@ -11,10 +11,9 @@ OpenAPI_v2x_subscription_data_t *OpenAPI_v2x_subscription_data_create( char *lte_pc5_ambr ) { - OpenAPI_v2x_subscription_data_t *v2x_subscription_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_v2x_subscription_data_t)); - if (!v2x_subscription_data_local_var) { - return NULL; - } + OpenAPI_v2x_subscription_data_t *v2x_subscription_data_local_var = ogs_malloc(sizeof(OpenAPI_v2x_subscription_data_t)); + ogs_assert(v2x_subscription_data_local_var); + v2x_subscription_data_local_var->nr_v2x_services_auth = nr_v2x_services_auth; v2x_subscription_data_local_var->lte_v2x_services_auth = lte_v2x_services_auth; v2x_subscription_data_local_var->nr_ue_pc5_ambr = nr_ue_pc5_ambr; @@ -128,8 +127,8 @@ OpenAPI_v2x_subscription_data_t *OpenAPI_v2x_subscription_data_parseFromJSON(cJS v2x_subscription_data_local_var = OpenAPI_v2x_subscription_data_create ( nr_v2x_services_auth ? nr_v2x_services_auth_local_nonprim : NULL, lte_v2x_services_auth ? lte_v2x_services_auth_local_nonprim : NULL, - nr_ue_pc5_ambr ? ogs_strdup_or_assert(nr_ue_pc5_ambr->valuestring) : NULL, - lte_pc5_ambr ? ogs_strdup_or_assert(lte_pc5_ambr->valuestring) : NULL + nr_ue_pc5_ambr ? ogs_strdup(nr_ue_pc5_ambr->valuestring) : NULL, + lte_pc5_ambr ? ogs_strdup(lte_pc5_ambr->valuestring) : NULL ); return v2x_subscription_data_local_var; diff --git a/lib/sbi/openapi/model/v2x_subscription_data_1.c b/lib/sbi/openapi/model/v2x_subscription_data_1.c index dbf40b0f8..445467392 100644 --- a/lib/sbi/openapi/model/v2x_subscription_data_1.c +++ b/lib/sbi/openapi/model/v2x_subscription_data_1.c @@ -11,10 +11,9 @@ OpenAPI_v2x_subscription_data_1_t *OpenAPI_v2x_subscription_data_1_create( char *lte_pc5_ambr ) { - OpenAPI_v2x_subscription_data_1_t *v2x_subscription_data_1_local_var = OpenAPI_malloc(sizeof(OpenAPI_v2x_subscription_data_1_t)); - if (!v2x_subscription_data_1_local_var) { - return NULL; - } + OpenAPI_v2x_subscription_data_1_t *v2x_subscription_data_1_local_var = ogs_malloc(sizeof(OpenAPI_v2x_subscription_data_1_t)); + ogs_assert(v2x_subscription_data_1_local_var); + v2x_subscription_data_1_local_var->nr_v2x_services_auth = nr_v2x_services_auth; v2x_subscription_data_1_local_var->lte_v2x_services_auth = lte_v2x_services_auth; v2x_subscription_data_1_local_var->nr_ue_pc5_ambr = nr_ue_pc5_ambr; @@ -128,8 +127,8 @@ OpenAPI_v2x_subscription_data_1_t *OpenAPI_v2x_subscription_data_1_parseFromJSON v2x_subscription_data_1_local_var = OpenAPI_v2x_subscription_data_1_create ( nr_v2x_services_auth ? nr_v2x_services_auth_local_nonprim : NULL, lte_v2x_services_auth ? lte_v2x_services_auth_local_nonprim : NULL, - nr_ue_pc5_ambr ? ogs_strdup_or_assert(nr_ue_pc5_ambr->valuestring) : NULL, - lte_pc5_ambr ? ogs_strdup_or_assert(lte_pc5_ambr->valuestring) : NULL + nr_ue_pc5_ambr ? ogs_strdup(nr_ue_pc5_ambr->valuestring) : NULL, + lte_pc5_ambr ? ogs_strdup(lte_pc5_ambr->valuestring) : NULL ); return v2x_subscription_data_1_local_var; diff --git a/lib/sbi/openapi/model/valid_time_period.c b/lib/sbi/openapi/model/valid_time_period.c index bb009748d..6c6ddb924 100644 --- a/lib/sbi/openapi/model/valid_time_period.c +++ b/lib/sbi/openapi/model/valid_time_period.c @@ -9,10 +9,9 @@ OpenAPI_valid_time_period_t *OpenAPI_valid_time_period_create( char *end_time ) { - OpenAPI_valid_time_period_t *valid_time_period_local_var = OpenAPI_malloc(sizeof(OpenAPI_valid_time_period_t)); - if (!valid_time_period_local_var) { - return NULL; - } + OpenAPI_valid_time_period_t *valid_time_period_local_var = ogs_malloc(sizeof(OpenAPI_valid_time_period_t)); + ogs_assert(valid_time_period_local_var); + valid_time_period_local_var->start_time = start_time; valid_time_period_local_var->end_time = end_time; @@ -80,8 +79,8 @@ OpenAPI_valid_time_period_t *OpenAPI_valid_time_period_parseFromJSON(cJSON *vali } valid_time_period_local_var = OpenAPI_valid_time_period_create ( - start_time ? ogs_strdup_or_assert(start_time->valuestring) : NULL, - end_time ? ogs_strdup_or_assert(end_time->valuestring) : NULL + start_time ? ogs_strdup(start_time->valuestring) : NULL, + end_time ? ogs_strdup(end_time->valuestring) : NULL ); return valid_time_period_local_var; diff --git a/lib/sbi/openapi/model/valid_time_period_1.c b/lib/sbi/openapi/model/valid_time_period_1.c index 1f4eecf65..b5a34922f 100644 --- a/lib/sbi/openapi/model/valid_time_period_1.c +++ b/lib/sbi/openapi/model/valid_time_period_1.c @@ -9,10 +9,9 @@ OpenAPI_valid_time_period_1_t *OpenAPI_valid_time_period_1_create( char *end_time ) { - OpenAPI_valid_time_period_1_t *valid_time_period_1_local_var = OpenAPI_malloc(sizeof(OpenAPI_valid_time_period_1_t)); - if (!valid_time_period_1_local_var) { - return NULL; - } + OpenAPI_valid_time_period_1_t *valid_time_period_1_local_var = ogs_malloc(sizeof(OpenAPI_valid_time_period_1_t)); + ogs_assert(valid_time_period_1_local_var); + valid_time_period_1_local_var->start_time = start_time; valid_time_period_1_local_var->end_time = end_time; @@ -80,8 +79,8 @@ OpenAPI_valid_time_period_1_t *OpenAPI_valid_time_period_1_parseFromJSON(cJSON * } valid_time_period_1_local_var = OpenAPI_valid_time_period_1_create ( - start_time ? ogs_strdup_or_assert(start_time->valuestring) : NULL, - end_time ? ogs_strdup_or_assert(end_time->valuestring) : NULL + start_time ? ogs_strdup(start_time->valuestring) : NULL, + end_time ? ogs_strdup(end_time->valuestring) : NULL ); return valid_time_period_1_local_var; diff --git a/lib/sbi/openapi/model/vendor_specific_feature.c b/lib/sbi/openapi/model/vendor_specific_feature.c index 501467d91..dda424f23 100644 --- a/lib/sbi/openapi/model/vendor_specific_feature.c +++ b/lib/sbi/openapi/model/vendor_specific_feature.c @@ -9,10 +9,9 @@ OpenAPI_vendor_specific_feature_t *OpenAPI_vendor_specific_feature_create( char *feature_version ) { - OpenAPI_vendor_specific_feature_t *vendor_specific_feature_local_var = OpenAPI_malloc(sizeof(OpenAPI_vendor_specific_feature_t)); - if (!vendor_specific_feature_local_var) { - return NULL; - } + OpenAPI_vendor_specific_feature_t *vendor_specific_feature_local_var = ogs_malloc(sizeof(OpenAPI_vendor_specific_feature_t)); + ogs_assert(vendor_specific_feature_local_var); + vendor_specific_feature_local_var->feature_name = feature_name; vendor_specific_feature_local_var->feature_version = feature_version; @@ -80,8 +79,8 @@ OpenAPI_vendor_specific_feature_t *OpenAPI_vendor_specific_feature_parseFromJSON } vendor_specific_feature_local_var = OpenAPI_vendor_specific_feature_create ( - ogs_strdup_or_assert(feature_name->valuestring), - ogs_strdup_or_assert(feature_version->valuestring) + ogs_strdup(feature_name->valuestring), + ogs_strdup(feature_version->valuestring) ); return vendor_specific_feature_local_var; diff --git a/lib/sbi/openapi/model/vgmlc_address.c b/lib/sbi/openapi/model/vgmlc_address.c index 0c23b5eee..10bae8f62 100644 --- a/lib/sbi/openapi/model/vgmlc_address.c +++ b/lib/sbi/openapi/model/vgmlc_address.c @@ -10,10 +10,9 @@ OpenAPI_vgmlc_address_t *OpenAPI_vgmlc_address_create( char *vgmlc_fqdn ) { - OpenAPI_vgmlc_address_t *vgmlc_address_local_var = OpenAPI_malloc(sizeof(OpenAPI_vgmlc_address_t)); - if (!vgmlc_address_local_var) { - return NULL; - } + OpenAPI_vgmlc_address_t *vgmlc_address_local_var = ogs_malloc(sizeof(OpenAPI_vgmlc_address_t)); + ogs_assert(vgmlc_address_local_var); + vgmlc_address_local_var->vgmlc_address_ipv4 = vgmlc_address_ipv4; vgmlc_address_local_var->vgmlc_address_ipv6 = vgmlc_address_ipv6; vgmlc_address_local_var->vgmlc_fqdn = vgmlc_fqdn; @@ -99,9 +98,9 @@ OpenAPI_vgmlc_address_t *OpenAPI_vgmlc_address_parseFromJSON(cJSON *vgmlc_addres } vgmlc_address_local_var = OpenAPI_vgmlc_address_create ( - vgmlc_address_ipv4 ? ogs_strdup_or_assert(vgmlc_address_ipv4->valuestring) : NULL, - vgmlc_address_ipv6 ? ogs_strdup_or_assert(vgmlc_address_ipv6->valuestring) : NULL, - vgmlc_fqdn ? ogs_strdup_or_assert(vgmlc_fqdn->valuestring) : NULL + vgmlc_address_ipv4 ? ogs_strdup(vgmlc_address_ipv4->valuestring) : NULL, + vgmlc_address_ipv6 ? ogs_strdup(vgmlc_address_ipv6->valuestring) : NULL, + vgmlc_fqdn ? ogs_strdup(vgmlc_fqdn->valuestring) : NULL ); return vgmlc_address_local_var; diff --git a/lib/sbi/openapi/model/vn_group_data.c b/lib/sbi/openapi/model/vn_group_data.c index d5278b256..4a8a8ef91 100644 --- a/lib/sbi/openapi/model/vn_group_data.c +++ b/lib/sbi/openapi/model/vn_group_data.c @@ -11,10 +11,9 @@ OpenAPI_vn_group_data_t *OpenAPI_vn_group_data_create( OpenAPI_list_t *app_descriptors ) { - OpenAPI_vn_group_data_t *vn_group_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_vn_group_data_t)); - if (!vn_group_data_local_var) { - return NULL; - } + OpenAPI_vn_group_data_t *vn_group_data_local_var = ogs_malloc(sizeof(OpenAPI_vn_group_data_t)); + ogs_assert(vn_group_data_local_var); + vn_group_data_local_var->pdu_session_types = pdu_session_types; vn_group_data_local_var->dnn = dnn; vn_group_data_local_var->single_nssai = single_nssai; @@ -157,7 +156,7 @@ OpenAPI_vn_group_data_t *OpenAPI_vn_group_data_parseFromJSON(cJSON *vn_group_dat vn_group_data_local_var = OpenAPI_vn_group_data_create ( pdu_session_types ? pdu_session_types_local_nonprim : NULL, - dnn ? ogs_strdup_or_assert(dnn->valuestring) : NULL, + dnn ? ogs_strdup(dnn->valuestring) : NULL, single_nssai ? single_nssai_local_nonprim : NULL, app_descriptors ? app_descriptorsList : NULL ); diff --git a/lib/sbi/openapi/model/volume_timed_report.c b/lib/sbi/openapi/model/volume_timed_report.c index ed57fc970..c48881e44 100644 --- a/lib/sbi/openapi/model/volume_timed_report.c +++ b/lib/sbi/openapi/model/volume_timed_report.c @@ -11,10 +11,9 @@ OpenAPI_volume_timed_report_t *OpenAPI_volume_timed_report_create( long uplink_volume ) { - OpenAPI_volume_timed_report_t *volume_timed_report_local_var = OpenAPI_malloc(sizeof(OpenAPI_volume_timed_report_t)); - if (!volume_timed_report_local_var) { - return NULL; - } + OpenAPI_volume_timed_report_t *volume_timed_report_local_var = ogs_malloc(sizeof(OpenAPI_volume_timed_report_t)); + ogs_assert(volume_timed_report_local_var); + volume_timed_report_local_var->start_time_stamp = start_time_stamp; volume_timed_report_local_var->end_time_stamp = end_time_stamp; volume_timed_report_local_var->downlink_volume = downlink_volume; @@ -116,8 +115,8 @@ OpenAPI_volume_timed_report_t *OpenAPI_volume_timed_report_parseFromJSON(cJSON * } volume_timed_report_local_var = OpenAPI_volume_timed_report_create ( - ogs_strdup_or_assert(start_time_stamp->valuestring), - ogs_strdup_or_assert(end_time_stamp->valuestring), + ogs_strdup(start_time_stamp->valuestring), + ogs_strdup(end_time_stamp->valuestring), downlink_volume->valuedouble, diff --git a/lib/sbi/openapi/model/vplmn_qos.c b/lib/sbi/openapi/model/vplmn_qos.c index 6aa1dcc42..8e66f7ea6 100644 --- a/lib/sbi/openapi/model/vplmn_qos.c +++ b/lib/sbi/openapi/model/vplmn_qos.c @@ -15,10 +15,9 @@ OpenAPI_vplmn_qos_t *OpenAPI_vplmn_qos_create( char *gua_fbr_ul ) { - OpenAPI_vplmn_qos_t *vplmn_qos_local_var = OpenAPI_malloc(sizeof(OpenAPI_vplmn_qos_t)); - if (!vplmn_qos_local_var) { - return NULL; - } + OpenAPI_vplmn_qos_t *vplmn_qos_local_var = ogs_malloc(sizeof(OpenAPI_vplmn_qos_t)); + ogs_assert(vplmn_qos_local_var); + vplmn_qos_local_var->is__5qi = is__5qi; vplmn_qos_local_var->_5qi = _5qi; vplmn_qos_local_var->arp = arp; @@ -188,10 +187,10 @@ OpenAPI_vplmn_qos_t *OpenAPI_vplmn_qos_parseFromJSON(cJSON *vplmn_qosJSON) _5qi ? _5qi->valuedouble : 0, arp ? arp_local_nonprim : NULL, session_ambr ? session_ambr_local_nonprim : NULL, - max_fbr_dl ? ogs_strdup_or_assert(max_fbr_dl->valuestring) : NULL, - max_fbr_ul ? ogs_strdup_or_assert(max_fbr_ul->valuestring) : NULL, - gua_fbr_dl ? ogs_strdup_or_assert(gua_fbr_dl->valuestring) : NULL, - gua_fbr_ul ? ogs_strdup_or_assert(gua_fbr_ul->valuestring) : NULL + max_fbr_dl ? ogs_strdup(max_fbr_dl->valuestring) : NULL, + max_fbr_ul ? ogs_strdup(max_fbr_ul->valuestring) : NULL, + gua_fbr_dl ? ogs_strdup(gua_fbr_dl->valuestring) : NULL, + gua_fbr_ul ? ogs_strdup(gua_fbr_ul->valuestring) : NULL ); return vplmn_qos_local_var; diff --git a/lib/sbi/openapi/model/vsmf_update_data.c b/lib/sbi/openapi/model/vsmf_update_data.c index 33e59470b..10987500f 100644 --- a/lib/sbi/openapi/model/vsmf_update_data.c +++ b/lib/sbi/openapi/model/vsmf_update_data.c @@ -37,10 +37,9 @@ OpenAPI_vsmf_update_data_t *OpenAPI_vsmf_update_data_create( OpenAPI_qos_monitoring_info_t *qos_monitoring_info ) { - OpenAPI_vsmf_update_data_t *vsmf_update_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_vsmf_update_data_t)); - if (!vsmf_update_data_local_var) { - return NULL; - } + OpenAPI_vsmf_update_data_t *vsmf_update_data_local_var = ogs_malloc(sizeof(OpenAPI_vsmf_update_data_t)); + ogs_assert(vsmf_update_data_local_var); + vsmf_update_data_local_var->request_indication = request_indication; vsmf_update_data_local_var->session_ambr = session_ambr; vsmf_update_data_local_var->qos_flows_add_mod_request_list = qos_flows_add_mod_request_list; @@ -707,7 +706,7 @@ OpenAPI_vsmf_update_data_t *OpenAPI_vsmf_update_data_parseFromJSON(cJSON *vsmf_u ogs_error("OpenAPI_vsmf_update_data_parseFromJSON() failed [dnai_list]"); goto end; } - OpenAPI_list_add(dnai_listList , ogs_strdup_or_assert(dnai_list_local->valuestring)); + OpenAPI_list_add(dnai_listList , ogs_strdup(dnai_list_local->valuestring)); } } @@ -762,10 +761,10 @@ OpenAPI_vsmf_update_data_t *OpenAPI_vsmf_update_data_parseFromJSON(cJSON *vsmf_u n1_sm_info_to_ue ? n1_sm_info_to_ue_local_nonprim : NULL, always_on_granted ? true : false, always_on_granted ? always_on_granted->valueint : 0, - hsmf_pdu_session_uri ? ogs_strdup_or_assert(hsmf_pdu_session_uri->valuestring) : NULL, - supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, + hsmf_pdu_session_uri ? ogs_strdup(hsmf_pdu_session_uri->valuestring) : NULL, + supported_features ? ogs_strdup(supported_features->valuestring) : NULL, cause ? causeVariable : 0, - n1sm_cause ? ogs_strdup_or_assert(n1sm_cause->valuestring) : NULL, + n1sm_cause ? ogs_strdup(n1sm_cause->valuestring) : NULL, back_off_timer ? true : false, back_off_timer ? back_off_timer->valuedouble : 0, ma_release_ind ? ma_release_indVariable : 0, diff --git a/lib/sbi/openapi/model/vsmf_update_error.c b/lib/sbi/openapi/model/vsmf_update_error.c index 811bc3b12..ad5596156 100644 --- a/lib/sbi/openapi/model/vsmf_update_error.c +++ b/lib/sbi/openapi/model/vsmf_update_error.c @@ -21,10 +21,9 @@ OpenAPI_vsmf_update_error_t *OpenAPI_vsmf_update_error_create( OpenAPI_n4_information_t *n4_info_ext2 ) { - OpenAPI_vsmf_update_error_t *vsmf_update_error_local_var = OpenAPI_malloc(sizeof(OpenAPI_vsmf_update_error_t)); - if (!vsmf_update_error_local_var) { - return NULL; - } + OpenAPI_vsmf_update_error_t *vsmf_update_error_local_var = ogs_malloc(sizeof(OpenAPI_vsmf_update_error_t)); + ogs_assert(vsmf_update_error_local_var); + vsmf_update_error_local_var->error = error; vsmf_update_error_local_var->is_pti = is_pti; vsmf_update_error_local_var->pti = pti; @@ -333,14 +332,14 @@ OpenAPI_vsmf_update_error_t *OpenAPI_vsmf_update_error_parseFromJSON(cJSON *vsmf error_local_nonprim, pti ? true : false, pti ? pti->valuedouble : 0, - n1sm_cause ? ogs_strdup_or_assert(n1sm_cause->valuestring) : NULL, + n1sm_cause ? ogs_strdup(n1sm_cause->valuestring) : NULL, n1_sm_info_from_ue ? n1_sm_info_from_ue_local_nonprim : NULL, unknown_n1_sm_info ? unknown_n1_sm_info_local_nonprim : NULL, failed_to_assign_ebi_list ? failed_to_assign_ebi_listList : NULL, ng_ap_cause ? ng_ap_cause_local_nonprim : NULL, _5g_mm_cause_value ? true : false, _5g_mm_cause_value ? _5g_mm_cause_value->valuedouble : 0, - recovery_time ? ogs_strdup_or_assert(recovery_time->valuestring) : NULL, + recovery_time ? ogs_strdup(recovery_time->valuestring) : NULL, n4_info ? n4_info_local_nonprim : NULL, n4_info_ext1 ? n4_info_ext1_local_nonprim : NULL, n4_info_ext2 ? n4_info_ext2_local_nonprim : NULL diff --git a/lib/sbi/openapi/model/vsmf_updated_data.c b/lib/sbi/openapi/model/vsmf_updated_data.c index ab9c3a9c7..480b6f04c 100644 --- a/lib/sbi/openapi/model/vsmf_updated_data.c +++ b/lib/sbi/openapi/model/vsmf_updated_data.c @@ -24,10 +24,9 @@ OpenAPI_vsmf_updated_data_t *OpenAPI_vsmf_updated_data_create( OpenAPI_n4_information_t *n4_info_ext2 ) { - OpenAPI_vsmf_updated_data_t *vsmf_updated_data_local_var = OpenAPI_malloc(sizeof(OpenAPI_vsmf_updated_data_t)); - if (!vsmf_updated_data_local_var) { - return NULL; - } + OpenAPI_vsmf_updated_data_t *vsmf_updated_data_local_var = ogs_malloc(sizeof(OpenAPI_vsmf_updated_data_t)); + ogs_assert(vsmf_updated_data_local_var); + vsmf_updated_data_local_var->qos_flows_add_mod_list = qos_flows_add_mod_list; vsmf_updated_data_local_var->qos_flows_rel_list = qos_flows_rel_list; vsmf_updated_data_local_var->qos_flows_failedto_add_mod_list = qos_flows_failedto_add_mod_list; @@ -663,7 +662,7 @@ OpenAPI_vsmf_updated_data_t *OpenAPI_vsmf_updated_data_parseFromJSON(cJSON *vsmf n1_sm_info_from_ue ? n1_sm_info_from_ue_local_nonprim : NULL, unknown_n1_sm_info ? unknown_n1_sm_info_local_nonprim : NULL, ue_location ? ue_location_local_nonprim : NULL, - ue_time_zone ? ogs_strdup_or_assert(ue_time_zone->valuestring) : NULL, + ue_time_zone ? ogs_strdup(ue_time_zone->valuestring) : NULL, add_ue_location ? add_ue_location_local_nonprim : NULL, assigned_ebi_list ? assigned_ebi_listList : NULL, failed_to_assign_ebi_list ? failed_to_assign_ebi_listList : NULL, diff --git a/lib/sbi/openapi/model/w_agf_info.c b/lib/sbi/openapi/model/w_agf_info.c index 16d89064a..ffe12c931 100644 --- a/lib/sbi/openapi/model/w_agf_info.c +++ b/lib/sbi/openapi/model/w_agf_info.c @@ -10,10 +10,9 @@ OpenAPI_w_agf_info_t *OpenAPI_w_agf_info_create( char *endpoint_fqdn ) { - OpenAPI_w_agf_info_t *w_agf_info_local_var = OpenAPI_malloc(sizeof(OpenAPI_w_agf_info_t)); - if (!w_agf_info_local_var) { - return NULL; - } + OpenAPI_w_agf_info_t *w_agf_info_local_var = ogs_malloc(sizeof(OpenAPI_w_agf_info_t)); + ogs_assert(w_agf_info_local_var); + w_agf_info_local_var->ipv4_endpoint_addresses = ipv4_endpoint_addresses; w_agf_info_local_var->ipv6_endpoint_addresses = ipv6_endpoint_addresses; w_agf_info_local_var->endpoint_fqdn = endpoint_fqdn; @@ -111,7 +110,7 @@ OpenAPI_w_agf_info_t *OpenAPI_w_agf_info_parseFromJSON(cJSON *w_agf_infoJSON) ogs_error("OpenAPI_w_agf_info_parseFromJSON() failed [ipv4_endpoint_addresses]"); goto end; } - OpenAPI_list_add(ipv4_endpoint_addressesList , ogs_strdup_or_assert(ipv4_endpoint_addresses_local->valuestring)); + OpenAPI_list_add(ipv4_endpoint_addressesList , ogs_strdup(ipv4_endpoint_addresses_local->valuestring)); } } @@ -131,7 +130,7 @@ OpenAPI_w_agf_info_t *OpenAPI_w_agf_info_parseFromJSON(cJSON *w_agf_infoJSON) ogs_error("OpenAPI_w_agf_info_parseFromJSON() failed [ipv6_endpoint_addresses]"); goto end; } - OpenAPI_list_add(ipv6_endpoint_addressesList , ogs_strdup_or_assert(ipv6_endpoint_addresses_local->valuestring)); + OpenAPI_list_add(ipv6_endpoint_addressesList , ogs_strdup(ipv6_endpoint_addresses_local->valuestring)); } } @@ -147,7 +146,7 @@ OpenAPI_w_agf_info_t *OpenAPI_w_agf_info_parseFromJSON(cJSON *w_agf_infoJSON) w_agf_info_local_var = OpenAPI_w_agf_info_create ( ipv4_endpoint_addresses ? ipv4_endpoint_addressesList : NULL, ipv6_endpoint_addresses ? ipv6_endpoint_addressesList : NULL, - endpoint_fqdn ? ogs_strdup_or_assert(endpoint_fqdn->valuestring) : NULL + endpoint_fqdn ? ogs_strdup(endpoint_fqdn->valuestring) : NULL ); return w_agf_info_local_var; diff --git a/lib/sbi/openapi/model/wireline_area.c b/lib/sbi/openapi/model/wireline_area.c index e9afaf657..0c0d3b9ce 100644 --- a/lib/sbi/openapi/model/wireline_area.c +++ b/lib/sbi/openapi/model/wireline_area.c @@ -11,10 +11,9 @@ OpenAPI_wireline_area_t *OpenAPI_wireline_area_create( char *area_code_c ) { - OpenAPI_wireline_area_t *wireline_area_local_var = OpenAPI_malloc(sizeof(OpenAPI_wireline_area_t)); - if (!wireline_area_local_var) { - return NULL; - } + OpenAPI_wireline_area_t *wireline_area_local_var = ogs_malloc(sizeof(OpenAPI_wireline_area_t)); + ogs_assert(wireline_area_local_var); + wireline_area_local_var->global_line_ids = global_line_ids; wireline_area_local_var->hfc_n_ids = hfc_n_ids; wireline_area_local_var->area_code_b = area_code_b; @@ -121,7 +120,7 @@ OpenAPI_wireline_area_t *OpenAPI_wireline_area_parseFromJSON(cJSON *wireline_are ogs_error("OpenAPI_wireline_area_parseFromJSON() failed [global_line_ids]"); goto end; } - OpenAPI_list_add(global_line_idsList , ogs_strdup_or_assert(global_line_ids_local->valuestring)); + OpenAPI_list_add(global_line_idsList , ogs_strdup(global_line_ids_local->valuestring)); } } @@ -141,7 +140,7 @@ OpenAPI_wireline_area_t *OpenAPI_wireline_area_parseFromJSON(cJSON *wireline_are ogs_error("OpenAPI_wireline_area_parseFromJSON() failed [hfc_n_ids]"); goto end; } - OpenAPI_list_add(hfc_n_idsList , ogs_strdup_or_assert(hfc_n_ids_local->valuestring)); + OpenAPI_list_add(hfc_n_idsList , ogs_strdup(hfc_n_ids_local->valuestring)); } } @@ -166,8 +165,8 @@ OpenAPI_wireline_area_t *OpenAPI_wireline_area_parseFromJSON(cJSON *wireline_are wireline_area_local_var = OpenAPI_wireline_area_create ( global_line_ids ? global_line_idsList : NULL, hfc_n_ids ? hfc_n_idsList : NULL, - area_code_b ? ogs_strdup_or_assert(area_code_b->valuestring) : NULL, - area_code_c ? ogs_strdup_or_assert(area_code_c->valuestring) : NULL + area_code_b ? ogs_strdup(area_code_b->valuestring) : NULL, + area_code_c ? ogs_strdup(area_code_c->valuestring) : NULL ); return wireline_area_local_var; diff --git a/lib/sbi/openapi/model/wireline_area_1.c b/lib/sbi/openapi/model/wireline_area_1.c index 48f5456b8..eacf4edbc 100644 --- a/lib/sbi/openapi/model/wireline_area_1.c +++ b/lib/sbi/openapi/model/wireline_area_1.c @@ -11,10 +11,9 @@ OpenAPI_wireline_area_1_t *OpenAPI_wireline_area_1_create( char *area_code_c ) { - OpenAPI_wireline_area_1_t *wireline_area_1_local_var = OpenAPI_malloc(sizeof(OpenAPI_wireline_area_1_t)); - if (!wireline_area_1_local_var) { - return NULL; - } + OpenAPI_wireline_area_1_t *wireline_area_1_local_var = ogs_malloc(sizeof(OpenAPI_wireline_area_1_t)); + ogs_assert(wireline_area_1_local_var); + wireline_area_1_local_var->global_line_ids = global_line_ids; wireline_area_1_local_var->hfc_n_ids = hfc_n_ids; wireline_area_1_local_var->area_code_b = area_code_b; @@ -121,7 +120,7 @@ OpenAPI_wireline_area_1_t *OpenAPI_wireline_area_1_parseFromJSON(cJSON *wireline ogs_error("OpenAPI_wireline_area_1_parseFromJSON() failed [global_line_ids]"); goto end; } - OpenAPI_list_add(global_line_idsList , ogs_strdup_or_assert(global_line_ids_local->valuestring)); + OpenAPI_list_add(global_line_idsList , ogs_strdup(global_line_ids_local->valuestring)); } } @@ -141,7 +140,7 @@ OpenAPI_wireline_area_1_t *OpenAPI_wireline_area_1_parseFromJSON(cJSON *wireline ogs_error("OpenAPI_wireline_area_1_parseFromJSON() failed [hfc_n_ids]"); goto end; } - OpenAPI_list_add(hfc_n_idsList , ogs_strdup_or_assert(hfc_n_ids_local->valuestring)); + OpenAPI_list_add(hfc_n_idsList , ogs_strdup(hfc_n_ids_local->valuestring)); } } @@ -166,8 +165,8 @@ OpenAPI_wireline_area_1_t *OpenAPI_wireline_area_1_parseFromJSON(cJSON *wireline wireline_area_1_local_var = OpenAPI_wireline_area_1_create ( global_line_ids ? global_line_idsList : NULL, hfc_n_ids ? hfc_n_idsList : NULL, - area_code_b ? ogs_strdup_or_assert(area_code_b->valuestring) : NULL, - area_code_c ? ogs_strdup_or_assert(area_code_c->valuestring) : NULL + area_code_b ? ogs_strdup(area_code_b->valuestring) : NULL, + area_code_c ? ogs_strdup(area_code_c->valuestring) : NULL ); return wireline_area_1_local_var; diff --git a/lib/sbi/openapi/model/wireline_service_area_restriction.c b/lib/sbi/openapi/model/wireline_service_area_restriction.c index 73c04267a..5c84e26fd 100644 --- a/lib/sbi/openapi/model/wireline_service_area_restriction.c +++ b/lib/sbi/openapi/model/wireline_service_area_restriction.c @@ -9,10 +9,9 @@ OpenAPI_wireline_service_area_restriction_t *OpenAPI_wireline_service_area_restr OpenAPI_list_t *areas ) { - OpenAPI_wireline_service_area_restriction_t *wireline_service_area_restriction_local_var = OpenAPI_malloc(sizeof(OpenAPI_wireline_service_area_restriction_t)); - if (!wireline_service_area_restriction_local_var) { - return NULL; - } + OpenAPI_wireline_service_area_restriction_t *wireline_service_area_restriction_local_var = ogs_malloc(sizeof(OpenAPI_wireline_service_area_restriction_t)); + ogs_assert(wireline_service_area_restriction_local_var); + wireline_service_area_restriction_local_var->restriction_type = restriction_type; wireline_service_area_restriction_local_var->areas = areas; diff --git a/lib/sbi/openapi/model/wireline_service_area_restriction_1.c b/lib/sbi/openapi/model/wireline_service_area_restriction_1.c index 605be9684..62cfea75f 100644 --- a/lib/sbi/openapi/model/wireline_service_area_restriction_1.c +++ b/lib/sbi/openapi/model/wireline_service_area_restriction_1.c @@ -9,10 +9,9 @@ OpenAPI_wireline_service_area_restriction_1_t *OpenAPI_wireline_service_area_res OpenAPI_list_t *areas ) { - OpenAPI_wireline_service_area_restriction_1_t *wireline_service_area_restriction_1_local_var = OpenAPI_malloc(sizeof(OpenAPI_wireline_service_area_restriction_1_t)); - if (!wireline_service_area_restriction_1_local_var) { - return NULL; - } + OpenAPI_wireline_service_area_restriction_1_t *wireline_service_area_restriction_1_local_var = ogs_malloc(sizeof(OpenAPI_wireline_service_area_restriction_1_t)); + ogs_assert(wireline_service_area_restriction_1_local_var); + wireline_service_area_restriction_1_local_var->restriction_type = restriction_type; wireline_service_area_restriction_1_local_var->areas = areas; diff --git a/lib/sbi/openapi/src/apiKey.c b/lib/sbi/openapi/src/apiKey.c index cb7d0a80a..e20978310 100644 --- a/lib/sbi/openapi/src/apiKey.c +++ b/lib/sbi/openapi/src/apiKey.c @@ -4,10 +4,15 @@ OpenAPI_map_t *OpenAPI_map_create(char *key, void *value) { - OpenAPI_map_t *OpenAPI_map = ogs_malloc(sizeof(OpenAPI_map_t)); + OpenAPI_map_t *OpenAPI_map = NULL; + + ogs_assert(key); + + OpenAPI_map = ogs_malloc(sizeof(OpenAPI_map_t)); ogs_assert(OpenAPI_map); OpenAPI_map->key = key; OpenAPI_map->value = value; + return OpenAPI_map; } diff --git a/lib/sbi/openapi/src/list.c b/lib/sbi/openapi/src/list.c index 75f50eef6..415f384ac 100644 --- a/lib/sbi/openapi/src/list.c +++ b/lib/sbi/openapi/src/list.c @@ -5,11 +5,15 @@ #include "../include/list.h" static OpenAPI_lnode_t *listEntry_create(void *data) { - OpenAPI_lnode_t *created = ogs_malloc(sizeof(OpenAPI_lnode_t)); + OpenAPI_lnode_t *created = NULL; + + ogs_assert(data); + + created = ogs_malloc(sizeof(OpenAPI_lnode_t)); ogs_assert(created); if (created == NULL) { - // TODO Malloc Failure + ogs_assert_if_reached(); return NULL; } created->data = data; @@ -33,7 +37,7 @@ OpenAPI_list_t *OpenAPI_list_create(void) ogs_assert(createdList); if (createdList == NULL) { - // TODO Malloc Failure + ogs_assert_if_reached(); return NULL; } createdList->first = NULL; @@ -101,7 +105,7 @@ void OpenAPI_list_add(OpenAPI_list_t *list, void *dataToAddInList) { OpenAPI_lnode_t *newListEntry = listEntry_create(dataToAddInList); if (newListEntry == NULL) { - // TODO Malloc Failure + ogs_assert_if_reached(); return; } if (list->first == NULL) { diff --git a/lib/sbi/support/20210629/openapi-generator/templates/apiKey.c.mustache b/lib/sbi/support/20210629/openapi-generator/templates/apiKey.c.mustache index cb7d0a80a..e20978310 100644 --- a/lib/sbi/support/20210629/openapi-generator/templates/apiKey.c.mustache +++ b/lib/sbi/support/20210629/openapi-generator/templates/apiKey.c.mustache @@ -4,10 +4,15 @@ OpenAPI_map_t *OpenAPI_map_create(char *key, void *value) { - OpenAPI_map_t *OpenAPI_map = ogs_malloc(sizeof(OpenAPI_map_t)); + OpenAPI_map_t *OpenAPI_map = NULL; + + ogs_assert(key); + + OpenAPI_map = ogs_malloc(sizeof(OpenAPI_map_t)); ogs_assert(OpenAPI_map); OpenAPI_map->key = key; OpenAPI_map->value = value; + return OpenAPI_map; } diff --git a/lib/sbi/support/20210629/openapi-generator/templates/cJSON.c.mustache b/lib/sbi/support/20210629/openapi-generator/templates/cJSON.c.mustache index 873ca2c25..792c5b753 100644 --- a/lib/sbi/support/20210629/openapi-generator/templates/cJSON.c.mustache +++ b/lib/sbi/support/20210629/openapi-generator/templates/cJSON.c.mustache @@ -148,7 +148,9 @@ static void *internal_realloc(void *pointer, size_t size) #include "ogs-core.h" static void *internal_malloc(size_t size) { - return ogs_malloc_or_assert(size); + void *ptr = ogs_malloc(size); + ogs_assert(ptr); + return ptr; } static void internal_free(void *pointer) { @@ -156,7 +158,9 @@ static void internal_free(void *pointer) } static void *internal_realloc(void *pointer, size_t size) { - return ogs_realloc_or_assert(pointer, size); + void *ptr = ogs_realloc(pointer, size); + ogs_assert(ptr); + return ptr; } #endif diff --git a/lib/sbi/support/20210629/openapi-generator/templates/list.c.mustache b/lib/sbi/support/20210629/openapi-generator/templates/list.c.mustache index 75f50eef6..415f384ac 100644 --- a/lib/sbi/support/20210629/openapi-generator/templates/list.c.mustache +++ b/lib/sbi/support/20210629/openapi-generator/templates/list.c.mustache @@ -5,11 +5,15 @@ #include "../include/list.h" static OpenAPI_lnode_t *listEntry_create(void *data) { - OpenAPI_lnode_t *created = ogs_malloc(sizeof(OpenAPI_lnode_t)); + OpenAPI_lnode_t *created = NULL; + + ogs_assert(data); + + created = ogs_malloc(sizeof(OpenAPI_lnode_t)); ogs_assert(created); if (created == NULL) { - // TODO Malloc Failure + ogs_assert_if_reached(); return NULL; } created->data = data; @@ -33,7 +37,7 @@ OpenAPI_list_t *OpenAPI_list_create(void) ogs_assert(createdList); if (createdList == NULL) { - // TODO Malloc Failure + ogs_assert_if_reached(); return NULL; } createdList->first = NULL; @@ -101,7 +105,7 @@ void OpenAPI_list_add(OpenAPI_list_t *list, void *dataToAddInList) { OpenAPI_lnode_t *newListEntry = listEntry_create(dataToAddInList); if (newListEntry == NULL) { - // TODO Malloc Failure + ogs_assert_if_reached(); return; } if (list->first == NULL) { diff --git a/lib/sbi/support/20210629/openapi-generator/templates/list.h.mustache b/lib/sbi/support/20210629/openapi-generator/templates/list.h.mustache index 986693358..425e3e665 100644 --- a/lib/sbi/support/20210629/openapi-generator/templates/list.h.mustache +++ b/lib/sbi/support/20210629/openapi-generator/templates/list.h.mustache @@ -8,8 +8,6 @@ extern "C" { #endif -#define OpenAPI_malloc(__sIZE) __sIZE == 0 ? NULL : ogs_malloc_or_assert(__sIZE) - typedef struct OpenAPI_list_s OpenAPI_list_t; typedef struct OpenAPI_lnode_s OpenAPI_lnode_t; diff --git a/lib/sbi/support/20210629/openapi-generator/templates/model-body.mustache b/lib/sbi/support/20210629/openapi-generator/templates/model-body.mustache index c46e9823d..41532123f 100644 --- a/lib/sbi/support/20210629/openapi-generator/templates/model-body.mustache +++ b/lib/sbi/support/20210629/openapi-generator/templates/model-body.mustache @@ -128,10 +128,9 @@ OpenAPI_{{classname}}_t *OpenAPI_{{classname}}_create( {{/isContainer}} {{/vars}}) { - OpenAPI_{{classname}}_t *{{classname}}_local_var = OpenAPI_malloc(sizeof(OpenAPI_{{classname}}_t)); - if (!{{classname}}_local_var) { - return NULL; - } + OpenAPI_{{classname}}_t *{{classname}}_local_var = ogs_malloc(sizeof(OpenAPI_{{classname}}_t)); + ogs_assert({{classname}}_local_var); + {{#vars}} {{^isContainer}} {{#isPrimitiveType}} @@ -219,6 +218,7 @@ void OpenAPI_{{classname}}_free(OpenAPI_{{classname}}_t *{{classname}}) {{#isPrimitiveType}} OpenAPI_list_for_each({{classname}}->{{name}}, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); ogs_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -227,6 +227,7 @@ void OpenAPI_{{classname}}_free(OpenAPI_{{classname}}_t *{{classname}}) {{^isPrimitiveType}} OpenAPI_list_for_each({{classname}}->{{name}}, node) { OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data; + ogs_free(localKeyValue->key); OpenAPI_{{complexType}}_free(localKeyValue->value); ogs_free(localKeyValue); } @@ -591,7 +592,8 @@ OpenAPI_{{classname}}_t *OpenAPI_{{classname}}_parseFromJSON(cJSON *{{classname} } {{/isByteArray}} {{#isBinary}} - OpenAPI_binary_t* decoded_str_{{{name}}} = OpenAPI_malloc(sizeof(OpenAPI_binary_t)); + OpenAPI_binary_t* decoded_str_{{{name}}} = ogs_malloc(sizeof(OpenAPI_binary_t)); + ogs_assert(decoded_str_{{{name}}}); {{^required}} if ({{{name}}}) { {{/required}} @@ -694,7 +696,7 @@ OpenAPI_{{classname}}_t *OpenAPI_{{classname}}_parseFromJSON(cJSON *{{classname} ogs_error("OpenAPI_{{classname}}_parseFromJSON() failed [{{{name}}}]"); goto end; } - OpenAPI_list_add({{{name}}}List , ogs_strdup_or_assert({{{name}}}_local->valuestring)); + OpenAPI_list_add({{{name}}}List , ogs_strdup({{{name}}}_local->valuestring)); {{/isString}} {{#isNumeric}} if (!cJSON_IsNumber({{{name}}}_local)) { @@ -782,29 +784,29 @@ OpenAPI_{{classname}}_t *OpenAPI_{{classname}}_parseFromJSON(cJSON *{{classname} ogs_error("OpenAPI_{{classname}}_parseFromJSON() failed [{{{name}}}]"); goto end; } - localMapKeyPair = OpenAPI_map_create(ogs_strdup_or_assert(localMapObject->string),ogs_strdup_or_assert(localMapObject->valuestring)); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string),ogs_strdup(localMapObject->valuestring)); {{/isString}} {{#isBoolean}} if (!cJSON_IsBool(localMapObject)) { ogs_error("OpenAPI_{{classname}}_parseFromJSON() failed [{{{name}}}]"); goto end; } - localMapKeyPair = OpenAPI_map_create(ogs_strdup_or_assert(localMapObject->string), &localMapObject->valueint); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), &localMapObject->valueint); {{/isBoolean}} {{#isNumeric}} if (!cJSON_IsNumber(localMapObject)) { ogs_error("OpenAPI_{{classname}}_parseFromJSON() failed [{{{name}}}]"); goto end; } - localMapKeyPair = OpenAPI_map_create(ogs_strdup_or_assert(localMapObject->string),&localMapObject->valuedouble ); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string),&localMapObject->valuedouble ); {{/isNumeric}} {{/isPrimitiveType}} {{^isPrimitiveType}} if (cJSON_IsObject({{{name}}}_local_map)) { localMapKeyPair = OpenAPI_map_create( - localMapObject->string, OpenAPI_{{complexType}}_parseFromJSON(localMapObject)); + ogs_strdup(localMapObject->string), OpenAPI_{{complexType}}_parseFromJSON(localMapObject)); } else if (cJSON_IsNull({{{name}}}_local_map)) { - localMapKeyPair = OpenAPI_map_create(localMapObject->string, NULL); + localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL); } else { ogs_error("OpenAPI_{{classname}}_parseFromJSON() failed [{{{name}}}]"); goto end; @@ -831,10 +833,10 @@ OpenAPI_{{classname}}_t *OpenAPI_{{classname}}_parseFromJSON(cJSON *{{classname} {{^required}}{{{name}}} ? {{/required}}{{{name}}}_local_nonprim{{^required}} : NULL{{/required}}{{^-last}},{{/-last}} {{/isModel}} {{#isUuid}} - {{^required}}{{{name}}} ? {{/required}}ogs_strdup_or_assert({{{name}}}->valuestring){{^required}} : NULL{{/required}}{{^-last}},{{/-last}} + {{^required}}{{{name}}} ? {{/required}}ogs_strdup({{{name}}}->valuestring){{^required}} : NULL{{/required}}{{^-last}},{{/-last}} {{/isUuid}} {{#isEmail}} - {{^required}}{{{name}}} ? {{/required}}ogs_strdup_or_assert({{{name}}}->valuestring){{^required}} : NULL{{/required}}{{^-last}},{{/-last}} + {{^required}}{{{name}}} ? {{/required}}ogs_strdup({{{name}}}->valuestring){{^required}} : NULL{{/required}}{{^-last}},{{/-last}} {{/isEmail}} {{#isFreeFormObject}} {{^required}}{{{name}}} ? {{/required}}{{{name}}}_local_object{{^required}} : NULL{{/required}}{{^-last}},{{/-last}} @@ -855,7 +857,7 @@ OpenAPI_{{classname}}_t *OpenAPI_{{classname}}_parseFromJSON(cJSON *{{classname} {{^required}}{{{name}}} ? {{/required}}{{{name}}}->valueint{{^required}} : 0{{/required}}{{^-last}},{{/-last}} {{/isBoolean}} {{#isString}} - {{^required}}{{{name}}} ? {{/required}}ogs_strdup_or_assert({{{name}}}->valuestring){{^required}} : NULL{{/required}}{{^-last}},{{/-last}} + {{^required}}{{{name}}} ? {{/required}}ogs_strdup({{{name}}}->valuestring){{^required}} : NULL{{/required}}{{^-last}},{{/-last}} {{/isString}} {{/isEnum}} {{#isByteArray}} @@ -865,10 +867,10 @@ OpenAPI_{{classname}}_t *OpenAPI_{{classname}}_parseFromJSON(cJSON *{{classname} {{^required}}{{{name}}} ? {{/required}}decoded_str_{{{name}}}{{^required}} : NULL{{/required}}{{^-last}},{{/-last}} {{/isBinary}} {{#isDate}} - {{^required}}{{{name}}} ? {{/required}}ogs_strdup_or_assert({{{name}}}->valuestring){{^required}} : NULL{{/required}}{{^-last}},{{/-last}} + {{^required}}{{{name}}} ? {{/required}}ogs_strdup({{{name}}}->valuestring){{^required}} : NULL{{/required}}{{^-last}},{{/-last}} {{/isDate}} {{#isDateTime}} - {{^required}}{{{name}}} ? {{/required}}ogs_strdup_or_assert({{{name}}}->valuestring){{^required}} : NULL{{/required}}{{^-last}},{{/-last}} + {{^required}}{{{name}}} ? {{/required}}ogs_strdup({{{name}}}->valuestring){{^required}} : NULL{{/required}}{{^-last}},{{/-last}} {{/isDateTime}} {{/isPrimitiveType}} {{/isContainer}} diff --git a/src/amf/amf-sm.c b/src/amf/amf-sm.c index 31211f5da..c76e88d15 100644 --- a/src/amf/amf-sm.c +++ b/src/amf/amf-sm.c @@ -381,15 +381,14 @@ void amf_state_operational(ogs_fsm_t *s, amf_event_t *e) sbi_xact = e->sbi.data; ogs_assert(sbi_xact); - sess = (amf_sess_t *)sbi_xact->sbi_object; - ogs_assert(sess); - state = sbi_xact->state; ogs_sbi_xact_remove(sbi_xact); + sess = (amf_sess_t *)sbi_xact->sbi_object; + ogs_assert(sess); sess = amf_sess_cycle(sess); - + if (!sess) { /* * 1. If AMF-UE context is duplicated in Identity-Response, * OLD AMF-UE's all session contexts are removed. @@ -409,10 +408,22 @@ void amf_state_operational(ogs_fsm_t *s, amf_event_t *e) * No Session Context * Assertion * + * OR + * + * In ./tests/vonr/af-test/test3_func() + * 1. Send PDU session establishment request + * 2. Receive PDU session establishment accept + * 3. Send PDUSessionResourceSetupResponse + * 4. Send De-registration request + * 5. SMF->AMF : RESPONSE /nsmf-pdusession/v1/sm-contexts/3/release + * 6. SMF->AMF : RESPONSE /nsmf-pdusession/v1/sm-contexts/1/modify + * * IF THIS HAPPENS IN THE REAL WORLD, * I WILL MODIFY THE ASSERTS BELOW. */ - ogs_assert(sess); + ogs_error("Session has already been removed"); + break; + } amf_ue = sess->amf_ue; ogs_assert(amf_ue); @@ -427,8 +438,11 @@ void amf_state_operational(ogs_fsm_t *s, amf_event_t *e) SWITCH(sbi_message.h.resource.component[2]) CASE(OGS_SBI_RESOURCE_NAME_MODIFY) - amf_nsmf_pdusession_handle_update_sm_context( + rv = amf_nsmf_pdusession_handle_update_sm_context( sess, state, &sbi_message); + if (rv != OGS_OK) { + AMF_SESS_CLEAR(sess); + } break; CASE(OGS_SBI_RESOURCE_NAME_RELEASE) @@ -467,9 +481,7 @@ void amf_state_operational(ogs_fsm_t *s, amf_event_t *e) * So, if CreateSMContext is failed, * we'll clear SM_CONTEXT_REF. */ - if (SESSION_CONTEXT_IN_SMF(sess)) { - CLEAR_SM_CONTEXT_REF(sess); - } + AMF_SESS_CLEAR(sess); } END break; diff --git a/src/amf/nnssf-handler.c b/src/amf/nnssf-handler.c index 10333b2fd..7d60b9d26 100644 --- a/src/amf/nnssf-handler.c +++ b/src/amf/nnssf-handler.c @@ -102,13 +102,6 @@ int amf_nnssf_nsselection_handle_get( ogs_freeaddrinfo(addr); - if (NsiInformation->nsi_id) { - if (sess->nssf.nsi_id) - ogs_free(sess->nssf.nsi_id); - sess->nssf.nsi_id = ogs_strdup(NsiInformation->nsi_id); - ogs_assert(sess->nssf.nsi_id); - } - ogs_assert(true == amf_sess_sbi_discover_by_nsi(OpenAPI_nf_type_SMF, sess)); return OGS_OK; diff --git a/src/amf/nsmf-handler.c b/src/amf/nsmf-handler.c index 4a6c67d4f..13924483c 100644 --- a/src/amf/nsmf-handler.c +++ b/src/amf/nsmf-handler.c @@ -43,7 +43,6 @@ int amf_nsmf_pdusession_handle_create_sm_context( OGS_5GMM_CAUSE_PAYLOAD_WAS_NOT_FORWARDED, AMF_NAS_BACKOFF_TIME)); - AMF_SESS_CLEAR(sess); return OGS_ERROR; } @@ -59,7 +58,6 @@ int amf_nsmf_pdusession_handle_create_sm_context( OGS_5GMM_CAUSE_PAYLOAD_WAS_NOT_FORWARDED, AMF_NAS_BACKOFF_TIME)); - AMF_SESS_CLEAR(sess); return OGS_ERROR; } @@ -73,7 +71,6 @@ int amf_nsmf_pdusession_handle_create_sm_context( OGS_5GMM_CAUSE_PAYLOAD_WAS_NOT_FORWARDED, AMF_NAS_BACKOFF_TIME)); - AMF_SESS_CLEAR(sess); return OGS_ERROR; } @@ -104,7 +101,6 @@ int amf_nsmf_pdusession_handle_create_sm_context( OGS_5GMM_CAUSE_PAYLOAD_WAS_NOT_FORWARDED, AMF_NAS_BACKOFF_TIME)); - AMF_SESS_CLEAR(sess); return OGS_ERROR; } } @@ -129,7 +125,6 @@ int amf_nsmf_pdusession_handle_create_sm_context( OGS_5GMM_CAUSE_PAYLOAD_WAS_NOT_FORWARDED, AMF_NAS_BACKOFF_TIME)); - AMF_SESS_CLEAR(sess); return OGS_ERROR; } if (!SmContextCreateError->error) { @@ -139,7 +134,6 @@ int amf_nsmf_pdusession_handle_create_sm_context( OGS_5GMM_CAUSE_PAYLOAD_WAS_NOT_FORWARDED, AMF_NAS_BACKOFF_TIME)); - AMF_SESS_CLEAR(sess); return OGS_ERROR; } @@ -152,23 +146,24 @@ int amf_nsmf_pdusession_handle_create_sm_context( * NOTE : The pkbuf created in the SBI message will be removed * from ogs_sbi_message_free(), so it must be copied. */ + ogs_warn("[%d:%d] PDU session establishment reject", + sess->psi, sess->pti); n1smbuf = ogs_pkbuf_copy(n1smbuf); ogs_assert(n1smbuf); ogs_assert(OGS_OK == nas_5gs_send_gsm_reject(sess, OGS_NAS_PAYLOAD_CONTAINER_N1_SM_INFORMATION, n1smbuf)); - AMF_SESS_CLEAR(sess); return OGS_ERROR; } } + ogs_error("[%d:%d] 5GMM was not forwarded", sess->psi, sess->pti); ogs_assert(OGS_OK == nas_5gs_send_back_gsm_message(sess, OGS_5GMM_CAUSE_PAYLOAD_WAS_NOT_FORWARDED, AMF_NAS_BACKOFF_TIME)); - AMF_SESS_CLEAR(sess); return OGS_ERROR; } @@ -220,7 +215,6 @@ int amf_nsmf_pdusession_handle_update_sm_context( nas_5gs_send_gmm_reject(amf_ue, OGS_5GMM_CAUSE_5GS_SERVICES_NOT_ALLOWED); - AMF_SESS_CLEAR(sess); return OGS_ERROR; } @@ -289,7 +283,6 @@ int amf_nsmf_pdusession_handle_update_sm_context( OGS_5GMM_CAUSE_PAYLOAD_WAS_NOT_FORWARDED, AMF_NAS_BACKOFF_TIME)); - AMF_SESS_CLEAR(sess); return OGS_ERROR; } @@ -301,7 +294,6 @@ int amf_nsmf_pdusession_handle_update_sm_context( OGS_5GMM_CAUSE_PAYLOAD_WAS_NOT_FORWARDED, AMF_NAS_BACKOFF_TIME)); - AMF_SESS_CLEAR(sess); return OGS_ERROR; } @@ -330,7 +322,6 @@ int amf_nsmf_pdusession_handle_update_sm_context( OGS_5GMM_CAUSE_PAYLOAD_WAS_NOT_FORWARDED, AMF_NAS_BACKOFF_TIME)); - AMF_SESS_CLEAR(sess); return OGS_ERROR; } @@ -342,7 +333,6 @@ int amf_nsmf_pdusession_handle_update_sm_context( OGS_5GMM_CAUSE_PAYLOAD_WAS_NOT_FORWARDED, AMF_NAS_BACKOFF_TIME)); - AMF_SESS_CLEAR(sess); return OGS_ERROR; } @@ -370,7 +360,6 @@ int amf_nsmf_pdusession_handle_update_sm_context( NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error)); - AMF_SESS_CLEAR(sess); return OGS_ERROR; } @@ -395,7 +384,6 @@ int amf_nsmf_pdusession_handle_update_sm_context( NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error)); - AMF_SESS_CLEAR(sess); return OGS_ERROR; } @@ -723,7 +711,6 @@ int amf_nsmf_pdusession_handle_update_sm_context( ngap_send_error_indication2(amf_ue, NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error)); - AMF_SESS_CLEAR(sess); return OGS_ERROR; } if (!SmContextUpdateError->error) { @@ -733,7 +720,6 @@ int amf_nsmf_pdusession_handle_update_sm_context( ngap_send_error_indication2(amf_ue, NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error)); - AMF_SESS_CLEAR(sess); return OGS_ERROR; } @@ -746,13 +732,15 @@ int amf_nsmf_pdusession_handle_update_sm_context( * NOTE : The pkbuf created in the SBI message will be removed * from ogs_sbi_message_free(), so it must be copied. */ + ogs_error("[%d:%d] PDU session establishment reject", + sess->psi, sess->pti); + n1smbuf = ogs_pkbuf_copy(n1smbuf); ogs_assert(n1smbuf); ogs_assert(OGS_OK == nas_5gs_send_gsm_reject(sess, OGS_NAS_PAYLOAD_CONTAINER_N1_SM_INFORMATION, n1smbuf)); - AMF_SESS_CLEAR(sess); return OGS_ERROR; } } @@ -765,7 +753,6 @@ int amf_nsmf_pdusession_handle_update_sm_context( ngap_send_error_indication2(amf_ue, NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error)); - AMF_SESS_CLEAR(sess); return OGS_ERROR; } @@ -778,16 +765,16 @@ int amf_nsmf_pdusession_handle_update_sm_context( ngap_send_error_indication2(amf_ue, NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error)); - AMF_SESS_CLEAR(sess); return OGS_ERROR; } #endif + ogs_error("[%d:%d] Error Indication", sess->psi, sess->pti); + ogs_assert(OGS_OK == ngap_send_error_indication2(amf_ue, NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error)); - AMF_SESS_CLEAR(sess); return OGS_ERROR; } diff --git a/src/main.c b/src/main.c index 53cb2faa3..c69087d7a 100644 --- a/src/main.c +++ b/src/main.c @@ -63,6 +63,10 @@ static int check_signal(int signum) ogs_info("Signal-NUM[%d] received (%s)", signum, ogs_signal_description_get(signum)); break; + case SIGUSR1: + talloc_report_full(__ogs_talloc_core, stderr); + break; + default: ogs_error("Signal-NUM[%d] received (%s)", signum, ogs_signal_description_get(signum)); diff --git a/src/pcf/naf-build.c b/src/pcf/naf-build.c index e74fdf92e..0733ce19d 100644 --- a/src/pcf/naf-build.c +++ b/src/pcf/naf-build.c @@ -29,8 +29,8 @@ ogs_sbi_request_t *pcf_naf_callback_build_policyauthorization_terminate( memset(&message, 0, sizeof(message)); message.h.method = (char *)OGS_SBI_HTTP_METHOD_POST; - message.h.uri = ogs_mstrcatf( - app_session->notif_uri, "/%s", OGS_SBI_RESOURCE_NAME_TERMINATE); + message.h.uri = ogs_msprintf("%s/%s", + app_session->notif_uri, OGS_SBI_RESOURCE_NAME_TERMINATE); ogs_assert(message.h.uri); request = ogs_sbi_build_request(&message); diff --git a/src/pcf/npcf-handler.c b/src/pcf/npcf-handler.c index f7e9cb5ea..f52ea2534 100644 --- a/src/pcf/npcf-handler.c +++ b/src/pcf/npcf-handler.c @@ -98,9 +98,11 @@ bool pcf_npcf_am_policy_contrtol_handle_create(pcf_ue_t *pcf_ue, ogs_uint64_from_string(PolicyAssociationRequest->supp_feat); pcf_ue->am_policy_control_features &= supported_features; - if (pcf_ue->gpsi) - ogs_free(pcf_ue->gpsi); - pcf_ue->gpsi = ogs_strdup(PolicyAssociationRequest->gpsi); + if (PolicyAssociationRequest->gpsi) { + if (pcf_ue->gpsi) + ogs_free(pcf_ue->gpsi); + pcf_ue->gpsi = ogs_strdup(PolicyAssociationRequest->gpsi); + } pcf_ue->access_type = PolicyAssociationRequest->access_type; diff --git a/src/pcf/nsmf-build.c b/src/pcf/nsmf-build.c index 67d1c1391..284032a21 100644 --- a/src/pcf/nsmf-build.c +++ b/src/pcf/nsmf-build.c @@ -56,8 +56,8 @@ ogs_sbi_request_t *pcf_nsmf_callback_build_smpolicycontrol_update( memset(&message, 0, sizeof(message)); message.h.method = (char *)OGS_SBI_HTTP_METHOD_POST; - message.h.uri = ogs_mstrcatf( - sess->notification_uri, "/%s", OGS_SBI_RESOURCE_NAME_UPDATE); + message.h.uri = ogs_msprintf("%s/%s", + sess->notification_uri, OGS_SBI_RESOURCE_NAME_UPDATE); ogs_assert(message.h.uri); message.SmPolicyNotification = &SmPolicyNotification; @@ -91,8 +91,8 @@ ogs_sbi_request_t *pcf_nsmf_callback_build_smpolicycontrol_terminate( memset(&message, 0, sizeof(message)); message.h.method = (char *)OGS_SBI_HTTP_METHOD_POST; - message.h.uri = ogs_mstrcatf( - sess->notification_uri, "/%s", OGS_SBI_RESOURCE_NAME_TERMINATE); + message.h.uri = ogs_msprintf("%s/%s", + sess->notification_uri, OGS_SBI_RESOURCE_NAME_TERMINATE); ogs_assert(message.h.uri); request = ogs_sbi_build_request(&message); diff --git a/src/udm/nudr-build.c b/src/udm/nudr-build.c index 79fdc2853..ee5b1ca9f 100644 --- a/src/udm/nudr-build.c +++ b/src/udm/nudr-build.c @@ -26,7 +26,8 @@ ogs_sbi_request_t *udm_nudr_dr_build_authentication_subscription( ogs_sbi_request_t *request = NULL; OpenAPI_list_t *PatchItemList = NULL; - OpenAPI_patch_item_t item; + OpenAPI_patch_item_t item, *pitem = NULL; + OpenAPI_lnode_t *node = NULL; uint8_t *sqn = data; char sqn_string[OGS_KEYSTRLEN(OGS_SQN_LEN)]; @@ -64,14 +65,19 @@ ogs_sbi_request_t *udm_nudr_dr_build_authentication_subscription( OpenAPI_list_add(PatchItemList, &item); message.PatchItemList = PatchItemList; - OpenAPI_any_type_free(item.value); } request = ogs_sbi_build_request(&message); ogs_assert(request); - if (PatchItemList) + if (PatchItemList) { + OpenAPI_list_for_each(PatchItemList, node) { + pitem = node->data; + if (pitem) + OpenAPI_any_type_free(pitem->value); + } OpenAPI_list_free(PatchItemList); + } return request; } diff --git a/tests/core/memory-test.c b/tests/core/memory-test.c index 18f5df40f..7d316ac20 100644 --- a/tests/core/memory-test.c +++ b/tests/core/memory-test.c @@ -41,6 +41,7 @@ static void test2_func(abts_case *tc, void *data) static void test3_func(abts_case *tc, void *data) { +#if OGS_USE_TALLOC != 1 char *ptr = ogs_realloc(0, 10); ABTS_PTR_NOTNULL(tc, ptr); ogs_free(ptr); @@ -48,10 +49,12 @@ static void test3_func(abts_case *tc, void *data) ptr = ogs_malloc(20); ABTS_PTR_NOTNULL(tc, ptr); ptr = ogs_realloc(ptr, 0); +#endif } static void test4_func(abts_case *tc, void *data) { +#if OGS_USE_TALLOC != 1 char *p, *q; p = ogs_malloc(10); @@ -68,6 +71,7 @@ static void test4_func(abts_case *tc, void *data) ABTS_TRUE(tc, p != q); ABTS_TRUE(tc, memcmp(p, q, 10) == 0); ogs_free(q); +#endif } abts_suite *test_memory(abts_suite *suite) diff --git a/tests/handover/epc-x2-test.c b/tests/handover/epc-x2-test.c index c8cc51cc1..d517c810c 100644 --- a/tests/handover/epc-x2-test.c +++ b/tests/handover/epc-x2-test.c @@ -359,6 +359,8 @@ static void test1_func(abts_case *tc, void *data) ABTS_PTR_NOTNULL(tc, recvbuf); ogs_pkbuf_free(recvbuf); + ogs_msleep(300); + /********** Remove Subscriber in Database */ ABTS_INT_EQUAL(tc, OGS_OK, test_db_remove_ue(test_ue)); diff --git a/tests/unit/abts-main.c b/tests/unit/abts-main.c index 9750acad1..9afbf8c4a 100644 --- a/tests/unit/abts-main.c +++ b/tests/unit/abts-main.c @@ -26,6 +26,9 @@ extern int __ogs_nas_domain; extern int __ogs_gtp_domain; extern int __ogs_sbi_domain; +void ogs_sbi_message_init(int num_of_request_pool, int num_of_response_pool); +void ogs_sbi_message_final(void); + abts_suite *test_s1ap_message(abts_suite *suite); abts_suite *test_nas_message(abts_suite *suite); abts_suite *test_gtp_message(abts_suite *suite); @@ -49,6 +52,8 @@ const struct testlist { static void terminate(void) { + ogs_sbi_message_final(); + ogs_pkbuf_default_destroy(); ogs_core_terminate(); @@ -93,6 +98,8 @@ int main(int argc, const char *const argv[]) ogs_pkbuf_default_init(&config); ogs_pkbuf_default_create(&config); + ogs_sbi_message_init(32, 32); + ogs_log_install_domain(&__ogs_s1ap_domain, "s1ap", OGS_LOG_ERROR); ogs_log_install_domain(&__ogs_ngap_domain, "ngap", OGS_LOG_ERROR); ogs_log_install_domain(&__ogs_nas_domain, "nas", OGS_LOG_ERROR); diff --git a/tests/unit/sbi-message-test.c b/tests/unit/sbi-message-test.c index ed10e84fc..7a2b811a0 100644 --- a/tests/unit/sbi-message-test.c +++ b/tests/unit/sbi-message-test.c @@ -315,8 +315,6 @@ static void sbi_message_test3(abts_case *tc, void *data) OpenAPI_map_free(served_pcf_info2); ogs_free(pcf_info1); ogs_free(pcf_info2); - OpenAPI_list_free(nrf_info1->served_pcf_info); - ogs_free(nrf_info1); nrf_info2 = OpenAPI_nrf_info_parseFromJSON(item); ABTS_PTR_NOTNULL(tc, nrf_info2); @@ -324,6 +322,9 @@ static void sbi_message_test3(abts_case *tc, void *data) ABTS_INT_EQUAL(tc, nrf_info1->served_pcf_info->count, nrf_info2->served_pcf_info->count); + OpenAPI_list_free(nrf_info1->served_pcf_info); + ogs_free(nrf_info1); + entry = nrf_info2->served_pcf_info->first; ABTS_PTR_NOTNULL(tc, entry); served_pcf_info1 = entry->data; @@ -498,6 +499,126 @@ static void sbi_message_test5(abts_case *tc, void *data) ABTS_INT_EQUAL(tc, 6, len); } +static void sbi_message_test6(abts_case *tc, void *data) +{ + cJSON *item = NULL, *item2 = NULL; + char *content = NULL; + OpenAPI_smf_selection_subscription_data_t SmfSelectionSubscriptionData; + OpenAPI_smf_selection_subscription_data_t *r1, *s1 = NULL; + + ogs_s_nssai_t s_nssai; + + OpenAPI_list_t *SubscribedSnssaiInfoList = NULL; + OpenAPI_map_t *SubscribedSnssaiInfoMap = NULL; + OpenAPI_snssai_info_t *SubscribedSnssaiInfo = NULL; + + OpenAPI_list_t *DnnInfoList = NULL; + OpenAPI_dnn_info_t *DnnInfo = NULL; + + OpenAPI_lnode_t *node = NULL, *node2 = NULL; + + memset(&SmfSelectionSubscriptionData, 0, + sizeof(SmfSelectionSubscriptionData)); + + SubscribedSnssaiInfoList = OpenAPI_list_create(); + ogs_assert(SubscribedSnssaiInfoList); + + { + DnnInfoList = OpenAPI_list_create(); + ogs_assert(DnnInfoList); + + { + DnnInfo = ogs_calloc(1, sizeof(*DnnInfo)); + ogs_assert(DnnInfo); + + DnnInfo->dnn = "internet"; + + DnnInfo->is_default_dnn_indicator = true; + DnnInfo->default_dnn_indicator = true; + + OpenAPI_list_add(DnnInfoList, DnnInfo); + } + + SubscribedSnssaiInfo = ogs_calloc(1, sizeof(*SubscribedSnssaiInfo)); + ogs_assert(SubscribedSnssaiInfo); + + if (DnnInfoList->count) + SubscribedSnssaiInfo->dnn_infos = DnnInfoList; + else + OpenAPI_list_free(DnnInfoList); + + memset(&s_nssai, 0, sizeof(s_nssai)); + s_nssai.sst = 1; + s_nssai.sd.v = OGS_S_NSSAI_NO_SD_VALUE; + + SubscribedSnssaiInfoMap = OpenAPI_map_create( + ogs_sbi_s_nssai_to_string(&s_nssai), + SubscribedSnssaiInfo); + ogs_assert(SubscribedSnssaiInfoMap); + ogs_assert(SubscribedSnssaiInfoMap->key); + + OpenAPI_list_add(SubscribedSnssaiInfoList, SubscribedSnssaiInfoMap); + } + + if (SubscribedSnssaiInfoList->count) + SmfSelectionSubscriptionData.subscribed_snssai_infos = + SubscribedSnssaiInfoList; + else + OpenAPI_list_free(SubscribedSnssaiInfoList); + + item = OpenAPI_smf_selection_subscription_data_convertToJSON( + &SmfSelectionSubscriptionData); + + SubscribedSnssaiInfoList = + SmfSelectionSubscriptionData.subscribed_snssai_infos; + OpenAPI_list_for_each(SubscribedSnssaiInfoList, node) { + SubscribedSnssaiInfoMap = node->data; + if (SubscribedSnssaiInfoMap) { + SubscribedSnssaiInfo = SubscribedSnssaiInfoMap->value; + if (SubscribedSnssaiInfo) { + DnnInfoList = SubscribedSnssaiInfo->dnn_infos; + if (DnnInfoList) { + OpenAPI_list_for_each(DnnInfoList, node2) { + DnnInfo = node2->data; + if (DnnInfo) { + ogs_free(DnnInfo); + } + } + OpenAPI_list_free(DnnInfoList); + } + ogs_free(SubscribedSnssaiInfo); + } + if (SubscribedSnssaiInfoMap->key) + ogs_free(SubscribedSnssaiInfoMap->key); + ogs_free(SubscribedSnssaiInfoMap); + } + } + OpenAPI_list_free(SubscribedSnssaiInfoList); + + r1 = OpenAPI_smf_selection_subscription_data_parseFromJSON(item); + cJSON_Delete(item); + + item = OpenAPI_smf_selection_subscription_data_convertToJSON(r1); + OpenAPI_smf_selection_subscription_data_free(r1); + + SubscribedSnssaiInfoList = r1->subscribed_snssai_infos; + OpenAPI_list_for_each(SubscribedSnssaiInfoList, node) { + SubscribedSnssaiInfoMap = node->data; + if (SubscribedSnssaiInfoMap) { + memset(&s_nssai, 0, sizeof(s_nssai)); + ogs_sbi_s_nssai_from_string(&s_nssai, SubscribedSnssaiInfoMap->key); + ABTS_INT_EQUAL(tc, 1, s_nssai.sst); + ABTS_INT_EQUAL(tc, OGS_S_NSSAI_NO_SD_VALUE, s_nssai.sd.v); + } + } + + content = cJSON_Print(item); + cJSON_Delete(item); + ogs_assert(content); + ABTS_INT_EQUAL(tc, 148, (int)strlen(content)); + ogs_free(content); +} + abts_suite *test_sbi_message(abts_suite *suite) { suite = ADD_SUITE(suite) @@ -507,6 +628,7 @@ abts_suite *test_sbi_message(abts_suite *suite) abts_run_test(suite, sbi_message_test3, NULL); abts_run_test(suite, sbi_message_test4, NULL); abts_run_test(suite, sbi_message_test5, NULL); + abts_run_test(suite, sbi_message_test6, NULL); return suite; } diff --git a/tests/vonr/af-test.c b/tests/vonr/af-test.c index 6d08368ea..b48333631 100644 --- a/tests/vonr/af-test.c +++ b/tests/vonr/af-test.c @@ -1575,6 +1575,24 @@ static void test3_func(abts_case *tc, void *data) rv = testgnb_ngap_send(ngap, sendbuf); ABTS_INT_EQUAL(tc, OGS_OK, rv); + /* In ./tests/vonr/af-test/test3_func() + * + * 1. Send PDU session establishment request + * 2. Receive PDU session establishment accept + * 3. Send PDUSessionResourceSetupResponse + * 4. Send De-registration request + * 5. SMF->AMF : RESPONSE /nsmf-pdusession/v1/sm-contexts/3/release + * 6. SMF->AMF : RESPONSE /nsmf-pdusession/v1/sm-contexts/1/modify + * + * 01/01 23:28:53.736: [sbi] ERROR: SBI running [1] + * (../lib/sbi/context.c:1161) + * 01/01 23:28:53.736: [amf] ERROR: Session has already been removed + * (../src/amf/amf-sm.c:424) + * + * We need the following sleep to avoid the above situation. + */ + ogs_msleep(100); + /* Send De-registration request */ gmmbuf = testgmm_build_de_registration_request(test_ue, 1); ABTS_PTR_NOTNULL(tc, gmmbuf);