Change in osmo-ttcn3-hacks[master]: Osmocom_Gb_Types: Fix warning: control reaches end of non-void function

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

laforge gerrit-no-reply at lists.osmocom.org
Mon Feb 8 17:13:17 UTC 2021


laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22738 )

Change subject: Osmocom_Gb_Types: Fix warning: control reaches end of non-void function
......................................................................

Osmocom_Gb_Types: Fix warning: control reaches end of non-void function

Change-Id: Ic2b8d0215c378ec2fd1a44775dc4e43616ca9f3c
---
M library/Osmocom_Gb_Types.ttcn
1 file changed, 8 insertions(+), 7 deletions(-)

Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved



diff --git a/library/Osmocom_Gb_Types.ttcn b/library/Osmocom_Gb_Types.ttcn
index 4e1fb8c..82f2aca 100644
--- a/library/Osmocom_Gb_Types.ttcn
+++ b/library/Osmocom_Gb_Types.ttcn
@@ -5,6 +5,7 @@
 
 	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 @@
 		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 @@
 		} 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 @@
 		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)));

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22738
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Ic2b8d0215c378ec2fd1a44775dc4e43616ca9f3c
Gerrit-Change-Number: 22738
Gerrit-PatchSet: 3
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210208/e0f76b0f/attachment.htm>


More information about the gerrit-log mailing list