From 7e88ce91d4b1066a10ccbb4de23e724da126ddfa Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Fri, 5 Feb 2021 16:01:36 +0100 Subject: Osmocom_Gb_Types: Fix warning: control reaches end of non-void function Change-Id: Ic2b8d0215c378ec2fd1a44775dc4e43616ca9f3c --- library/Osmocom_Gb_Types.ttcn | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/library/Osmocom_Gb_Types.ttcn b/library/Osmocom_Gb_Types.ttcn index 4e1fb8c7..82f2aca6 100644 --- a/library/Osmocom_Gb_Types.ttcn +++ b/library/Osmocom_Gb_Types.ttcn @@ -5,6 +5,7 @@ module Osmocom_Gb_Types { import from General_Types all; import from Osmocom_Types all; + import from Misc_Helpers all; import from GSM_Types all; import from BSSGP_Types all import from NS_Types all @@ -3690,10 +3691,8 @@ octetstring sdu) := { case (PDU_BSSGP:{pDU_BSSGP_PAGING_CS:={?,?,?,{bVCI:=?},*,*,*,*,*}}) { return pdu.pDU_BSSGP_PAGING_CS.paging_Field4.bVCI; } - case else { - return omit; - } } + return omit; } /* extract the BVCI IE of given PDU + convert it to integer value */ @@ -3734,8 +3733,9 @@ octetstring sdu) := { } else if (substr(tllib, 0, 4) == '0001'B) { return TLLI_RAND_G_RNTI; } else { - setverdict(fail, "Unknonw TLLI Type ", tllib); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Unknonw TLLI Type ", tllib)); + return TLLI_LOCAL; } } @@ -3751,8 +3751,9 @@ octetstring sdu) := { case (TLLI_G_RNTI) { prefix := '0000'B } case (TLLI_RAND_G_RNTI) { prefix := '0001'B } case else { - setverdict(fail, "Unknonw TLLI Type ", tlli_type); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Unknonw TLLI Type ", tlli_type)); + return '00000000'O; } } return bit2oct(prefix & substr(tmsi_bits, lengthof(prefix), 32-lengthof(prefix))); -- cgit v1.2.3