diff --git a/src/Base/EPTF_CLL_Base_Functions.ttcn b/src/Base/EPTF_CLL_Base_Functions.ttcn
index 72fdb0b0cc01de6ca64d3f9530706db591a39443..8c538347deb2e95ca97940ca861748d37f1fec81 100644
--- a/src/Base/EPTF_CLL_Base_Functions.ttcn
+++ b/src/Base/EPTF_CLL_Base_Functions.ttcn
@@ -915,7 +915,6 @@ runs on EPTF_Base_CT_private return boolean {
f_EPTF_Common_user(%definitionId& ": Assert message with id "&int2str(pl_assertNum)&" matches with the expected pattern: "& pl_expectedAssert);
return true;
}
- return true;
}
///////////////////////////////////////////////////////////
@@ -944,7 +943,6 @@ runs on EPTF_Base_CT_private return boolean {
f_EPTF_Common_user(%definitionId& ": Error message with id "&int2str(pl_errNum)&" matches with the expected pattern: "& pl_expectedError);
return true;
}
- return true;
}
///////////////////////////////////////////////////////////
diff --git a/src/Common/EPTF_CLL_Common_Functions.ttcn b/src/Common/EPTF_CLL_Common_Functions.ttcn
index c2b975cb81b615ac0ba15869890dba9b9dac5dd6..9bc05a4c41894f6541aaf184632945f042386120 100644
--- a/src/Common/EPTF_CLL_Common_Functions.ttcn
+++ b/src/Common/EPTF_CLL_Common_Functions.ttcn
@@ -135,7 +135,6 @@ public function f_EPTF_Common_checkExpectedError(in charstring pl_expectedError,
f_EPTF_Common_user(%definitionId& ": Error message with id "&int2str(pl_errorNum)&" matches with the expected pattern: "& pl_expectedError);
return true;
}
- return true;
}
///////////////////////////////////////////////////////////
diff --git a/src/DataSource/EPTF_CLL_DataSource_Functions.ttcn b/src/DataSource/EPTF_CLL_DataSource_Functions.ttcn
index b1c3e4d6792c9000f3b48ac520ccdad590eeed81..40436a54cdcff51356ef60cf02baae64bef3b308 100644
--- a/src/DataSource/EPTF_CLL_DataSource_Functions.ttcn
+++ b/src/DataSource/EPTF_CLL_DataSource_Functions.ttcn
@@ -3761,7 +3761,6 @@ private function f_EPTF_DataSource_handleBuiltInConditions(
return 11; // unknown internal method
}
}
- return 12; // unknown method
}
private function f_EPTF_DataSource_handleBuiltInConditions_nonblocking(
@@ -5133,29 +5132,29 @@ private altstep as_EPTF_DataSource_Msg_GetData_Buffer_Handler() runs on EPTF_Dat
//------------------------------------------------------------------
// alternate code without clustering:
// [sizeof(v_EPTF_DataSource_Msg_GetData_Buffer) != 0 and f_EPTF_DataSource_calculateNofMsgsToSend()>0] t_EPTF_DataSource_Msg_GetData_Buffer_timer.timeout {
- // TODO: send buffer with clustering
-
-
- var integer vl_buffSize := sizeof(v_EPTF_DataSource_Msg_GetData_Buffer);
- var integer vl_lastIdx := v_EPTF_DataSource_Msg_GetData_BufferStartIdx + f_EPTF_DataSource_calculateNofMsgsToSend();
-
- for(var integer i:=v_EPTF_DataSource_Msg_GetData_BufferStartIdx; i<vl_lastIdx; i:=i+1) {
- EPTF_DataSourceIf.send({getData := v_EPTF_DataSource_Msg_GetData_Buffer[i].getDataMsg}) to v_EPTF_DataSource_Msg_GetData_Buffer[i].destinationCompRef;
- }
-
- //increase number of pending getData counter with the number of messages sent:
- v_EPTF_DataSource_nofPendingGetData := v_EPTF_DataSource_nofPendingGetData + vl_lastIdx - v_EPTF_DataSource_Msg_GetData_BufferStartIdx;
-
- v_EPTF_DataSource_Msg_GetData_BufferStartIdx := vl_lastIdx;
- if (v_EPTF_DataSource_Msg_GetData_BufferStartIdx==vl_buffSize) {
- v_EPTF_DataSource_Msg_GetData_BufferStartIdx := 0;
- v_EPTF_DataSource_Msg_GetData_Buffer := {};
- } else {
- // there are still messages left in the buffer
- t_EPTF_DataSource_Msg_GetData_Buffer_timer.start(0.001);
- //action("**** msgs remain: ", vl_buffSize-v_EPTF_DataSource_Msg_GetData_BufferStartIdx);
- }
- repeat;
+// // TODO: send buffer with clustering
+//
+//
+// var integer vl_buffSize := sizeof(v_EPTF_DataSource_Msg_GetData_Buffer);
+// var integer vl_lastIdx := v_EPTF_DataSource_Msg_GetData_BufferStartIdx + f_EPTF_DataSource_calculateNofMsgsToSend();
+//
+// for(var integer i:=v_EPTF_DataSource_Msg_GetData_BufferStartIdx; i<vl_lastIdx; i:=i+1) {
+// EPTF_DataSourceIf.send({getData := v_EPTF_DataSource_Msg_GetData_Buffer[i].getDataMsg}) to v_EPTF_DataSource_Msg_GetData_Buffer[i].destinationCompRef;
+// }
+//
+// //increase number of pending getData counter with the number of messages sent:
+// v_EPTF_DataSource_nofPendingGetData := v_EPTF_DataSource_nofPendingGetData + vl_lastIdx - v_EPTF_DataSource_Msg_GetData_BufferStartIdx;
+//
+// v_EPTF_DataSource_Msg_GetData_BufferStartIdx := vl_lastIdx;
+// if (v_EPTF_DataSource_Msg_GetData_BufferStartIdx==vl_buffSize) {
+// v_EPTF_DataSource_Msg_GetData_BufferStartIdx := 0;
+// v_EPTF_DataSource_Msg_GetData_Buffer := {};
+// } else {
+// // there are still messages left in the buffer
+// t_EPTF_DataSource_Msg_GetData_Buffer_timer.start(0.001);
+// //action("**** msgs remain: ", vl_buffSize-v_EPTF_DataSource_Msg_GetData_BufferStartIdx);
+// }
+// repeat;
}
}
diff --git a/src/ExecCtrl/EPTF_CLL_ExecCtrlUIHandler_Functions.ttcn b/src/ExecCtrl/EPTF_CLL_ExecCtrlUIHandler_Functions.ttcn
index 71680f6780e2776773f290bcc67f1f5c1ac6c94c..e8c8c3825959c43fb21e367b5018724c2c8570b3 100644
--- a/src/ExecCtrl/EPTF_CLL_ExecCtrlUIHandler_Functions.ttcn
+++ b/src/ExecCtrl/EPTF_CLL_ExecCtrlUIHandler_Functions.ttcn
@@ -2179,20 +2179,20 @@ const charstring c_EPTF_ExecCtrl_UIHandler_led_initStr := "[led:black]NA";
continue;
}
- f_EPTF_UIHandlerClient_subscribeMe (
- "StatusLED." & vl_currentName,
- "GUI.StatusLED." & vl_currentName,
- vl_widgetId,
- realtime);
-
- f_EPTF_ExecCtrl_UIHandler_debug(
- "Last subscribed to GUI variable (SCEN / LGen status) name: "
- &vl_currentName);
+// f_EPTF_UIHandlerClient_subscribeMe (
+// "StatusLED." & vl_currentName,
+// "GUI.StatusLED." & vl_currentName,
+// vl_widgetId,
+// realtime);
+//
+// f_EPTF_ExecCtrl_UIHandler_debug(
+// "Last subscribed to GUI variable (SCEN / LGen status) name: "
+// &vl_currentName);
}
// Increase offset for each group
- vl_offset := vl_offset + 1;
+// vl_offset := vl_offset + 1;
} // sc
} // eg
}
diff --git a/src/LGenBase/EPTF_CLL_LGenBase_ConfigFunctions.ttcn b/src/LGenBase/EPTF_CLL_LGenBase_ConfigFunctions.ttcn
index abc1ab638e6cde05a0fd80d44d4e593a02704011..9ef97a79bf450eae95a4536c9d636841938db17b 100644
--- a/src/LGenBase/EPTF_CLL_LGenBase_ConfigFunctions.ttcn
+++ b/src/LGenBase/EPTF_CLL_LGenBase_ConfigFunctions.ttcn
@@ -4597,7 +4597,6 @@ group GetSet{
return -1
}
}
- return -1; // never executed, just to remove compilation warning
}
///////////////////////////////////////////////////////////
@@ -6019,7 +6018,6 @@ group Conversion{
}
}
}
- return ""; // never executed, just to remove compilation warning
}
///////////////////////////////////////////////////////////
// Function: f_EPTF_LGenBase_iIdx2Str
@@ -6061,7 +6059,6 @@ group Conversion{
}
}
}
- return ""; // never executed, just to remove compilation warning
}
} // Conversion
diff --git a/src/LGenBase/EPTF_CLL_LGenBase_TrafficFunctions.ttcn b/src/LGenBase/EPTF_CLL_LGenBase_TrafficFunctions.ttcn
index 9ff31cca51d8d0e6716590a6748fa95f8c38aefc..f60c91dc76cbc1e86fd1c00882204e5e9194f1cb 100644
--- a/src/LGenBase/EPTF_CLL_LGenBase_TrafficFunctions.ttcn
+++ b/src/LGenBase/EPTF_CLL_LGenBase_TrafficFunctions.ttcn
@@ -279,8 +279,6 @@ group BurstCalculation{
f_EPTF_LGenBase_scenarioRelIdx(vl_idx, vl_eGrpIdx, vl_scInGrpIdx);
return f_EPTF_LGenBase_getBurstCalcFunctionId( v_LGenBase_entityGroups[vl_eGrpIdx].scenarios[vl_scInGrpIdx].schedulerData.burstFuncRef.burstCalcMode );
}
- //Cannot reach this code
- return -1;
}
///////////////////////////////////////////////////////////
diff --git a/src/StatManager/EPTF_CLL_StatManager_Functions.ttcn b/src/StatManager/EPTF_CLL_StatManager_Functions.ttcn
index 2907d35475e432492b1ab669828fe4b87e8047a5..ec6f41f7f9e42de817fe64842e47faac9be20c5b 100644
--- a/src/StatManager/EPTF_CLL_StatManager_Functions.ttcn
+++ b/src/StatManager/EPTF_CLL_StatManager_Functions.ttcn
@@ -466,7 +466,6 @@ runs on EPTF_StatManager_CT return integer
return -1;
}
}
- return -1; //this should never be executed
}
///////////////////////////////////////////////////////////
diff --git a/src/UIHandler/EPTF_CLL_UIHandlerVariableUI_Functions.ttcn b/src/UIHandler/EPTF_CLL_UIHandlerVariableUI_Functions.ttcn
index d524692739bd0e4ea391e7b354eee90f22f24fbf..6bf5a716477e30b9fa8c090ea2afb0ccd2dcbdf3 100644
--- a/src/UIHandler/EPTF_CLL_UIHandlerVariableUI_Functions.ttcn
+++ b/src/UIHandler/EPTF_CLL_UIHandlerVariableUI_Functions.ttcn
@@ -863,8 +863,6 @@ group PrivateFunctions{
return "";
}
}
- // control never reaches this point but gcc complains on the generated code.
- return "";
}
}
diff --git a/src/UIHandler/EPTF_CLL_UIHandler_WidgetFunctions.ttcn b/src/UIHandler/EPTF_CLL_UIHandler_WidgetFunctions.ttcn
index a7ea281d3098445756db7b2571575b471fe17d9e..5c58dfaa1a5c6e40933f01a61092ad8a1b8be815 100644
--- a/src/UIHandler/EPTF_CLL_UIHandler_WidgetFunctions.ttcn
+++ b/src/UIHandler/EPTF_CLL_UIHandler_WidgetFunctions.ttcn
@@ -1,10 +1,10 @@
///////////////////////////////////////////////////////////////////////////////
// //
-// Copyright (c) 2000-2019 Ericsson Telecom AB //
-// //
-// All rights reserved. This program and the accompanying materials //
-// are made available under the terms of the Eclipse Public License v2.0 //
-// which accompanies this distribution, and is available at //
+// Copyright (c) 2000-2019 Ericsson Telecom AB //
+// //
+// All rights reserved. This program and the accompanying materials //
+// are made available under the terms of the Eclipse Public License v2.0 //
+// which accompanies this distribution, and is available at //
// https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html //
///////////////////////////////////////////////////////////////////////////////
@@ -3130,7 +3130,6 @@ group PrivateFunctions {
return false;
}
}
- return true;
}
///////////////////////////////////////////////////////////
@@ -3576,10 +3575,6 @@ group PrivateFunctions {
pl_widgets := {spacer := {0.0,omit}}; // a dummy widget - omit can not be used
return;
}
- // control will never go here, but we need these because of gcc
- pl_succ := false;
- pl_widgets := {spacer := {0.0,omit}};
- return;
}
///////////////////////////////////////////////////////////
// Function: f_EPTF_UIHandler_widgetList
@@ -9532,7 +9527,6 @@ group PrivateFunctions {
} else {
return vl_getDataResult;
}
- return vl_getDataResult;
}
@@ -9580,7 +9574,6 @@ group PrivateFunctions {
} else {
return vl_getDataResult;
}
- return vl_getDataResult;
}
private function f_EPTF_UIhandler_simulation_getDefaultValue(in EPTF_UIHandler_GuiItemRec pl_widgetRec, out EPTF_Var_DirectContent vl_defaultValue) {
@@ -11060,7 +11053,6 @@ group UIHandler_Config{
f_EPTF_UIHandler_warning("Unhandled widget type in "&%definitionId&": "&log2str(pl_xul));
return false;
}
- return true;
}