diff --git a/src/emc/nml_intf/emc.cc b/src/emc/nml_intf/emc.cc index 348a91d32a9..0b4117b229f 100644 --- a/src/emc/nml_intf/emc.cc +++ b/src/emc/nml_intf/emc.cc @@ -29,6 +29,13 @@ #include "emcpos.h" #include "cms.hh" +// +// Note: Many methods have a cppcheck suppress line marking to suppress the +// 'duplInheritedMember' warning. It is caused by the sub-class having an +// identical non-virtual update() method as the base-class. This is fine and +// the sub-class calls the base-class in a manual hierarchy. +// + // Forward Function Prototypes void EmcPose_update(CMS * cms, EmcPose * x); void CANON_TOOL_TABLE_update(CMS * cms, CANON_TOOL_TABLE * x); @@ -555,6 +562,7 @@ const char *emc_symbol_lookup(uint32_t type) * Automatically generated by NML CodeGen Java Applet. * on Sat Oct 11 13:45:16 UTC 2003 */ +// cppcheck-suppress duplInheritedMember void EMC_TASK_PLAN_CLOSE::update(CMS * cms) { EMC_TASK_CMD_MSG::update(cms); @@ -620,6 +628,7 @@ void EMC_SYSTEM_CMD::update(CMS * cms) * Automatically generated by NML CodeGen Java Applet. * on Sat Oct 11 13:45:16 UTC 2003 */ +// cppcheck-suppress duplInheritedMember void EMC_TRAJ_CLEAR_PROBE_TRIPPED_FLAG::update(CMS * cms) { EMC_TRAJ_CMD_MSG::update(cms); @@ -630,6 +639,7 @@ void EMC_TRAJ_CLEAR_PROBE_TRIPPED_FLAG::update(CMS * cms) * Automatically generated by NML CodeGen Java Applet. * on Sat Oct 11 13:45:16 UTC 2003 */ +// cppcheck-suppress duplInheritedMember void EMC_TOOL_STAT::update(CMS * cms) { EMC_TOOL_STAT_MSG::update(cms); @@ -649,6 +659,7 @@ void EMC_TOOL_STAT::update(CMS * cms) * Automatically generated by NML CodeGen Java Applet. * on Sat Oct 11 13:45:16 UTC 2003 */ +// cppcheck-suppress duplInheritedMember void EMC_SPINDLE_CONSTANT::update(CMS * cms) { EMC_SPINDLE_CMD_MSG::update(cms); @@ -663,7 +674,7 @@ void EMC_SPINDLE_CONSTANT::update(CMS * cms) */ void EMC_SPINDLE_CMD_MSG::update(CMS * cms) { - cms->update(spindle); + cms->update(_spindle); } /* @@ -671,6 +682,7 @@ void EMC_SPINDLE_CMD_MSG::update(CMS * cms) * Automatically generated by NML CodeGen Java Applet. * on Sat Oct 11 13:45:16 UTC 2003 */ +// cppcheck-suppress duplInheritedMember void EMC_TRAJ_DELAY::update(CMS * cms) { EMC_TRAJ_CMD_MSG::update(cms); @@ -680,6 +692,7 @@ void EMC_TRAJ_DELAY::update(CMS * cms) /* * NML/CMS Update function for EMC_JOG_ABS */ +// cppcheck-suppress duplInheritedMember void EMC_JOG_ABS::update(CMS * cms) { EMC_JOG_CMD_MSG::update(cms); @@ -692,6 +705,7 @@ void EMC_JOG_ABS::update(CMS * cms) /* * NML/CMS Update function for EMC_JOG_STOP */ +// cppcheck-suppress duplInheritedMember void EMC_JOG_STOP::update(CMS * cms) { EMC_JOG_CMD_MSG::update(cms); @@ -703,6 +717,7 @@ void EMC_JOG_STOP::update(CMS * cms) * Automatically generated by NML CodeGen Java Applet. * on Sat Oct 11 13:45:16 UTC 2003 */ +// cppcheck-suppress duplInheritedMember void EMC_TOOL_PREPARE::update(CMS * cms) { EMC_TOOL_CMD_MSG::update(cms); @@ -714,6 +729,7 @@ void EMC_TOOL_PREPARE::update(CMS * cms) * Automatically generated by NML CodeGen Java Applet. * on Sat Oct 11 13:45:16 UTC 2003 */ +// cppcheck-suppress duplInheritedMember void EMC_SPINDLE_OFF::update(CMS * cms) { EMC_SPINDLE_CMD_MSG::update(cms); @@ -725,6 +741,7 @@ void EMC_SPINDLE_OFF::update(CMS * cms) * Automatically generated by NML CodeGen Java Applet. * on Sat Oct 11 13:45:16 UTC 2003 */ +// cppcheck-suppress duplInheritedMember void EMC_TASK_PLAN_SYNCH::update(CMS * cms) { EMC_TASK_CMD_MSG::update(cms); @@ -745,6 +762,7 @@ void EMC_COOLANT_CMD_MSG::update(CMS * /*cms*/) * Automatically generated by NML CodeGen Java Applet. * on Sat Oct 11 13:45:16 UTC 2003 */ +// cppcheck-suppress duplInheritedMember void EMC_TOOL_LOAD::update(CMS * cms) { EMC_TOOL_CMD_MSG::update(cms); @@ -755,6 +773,7 @@ void EMC_TOOL_LOAD::update(CMS * cms) * Automatically generated by NML CodeGen Java Applet. * on Sat Oct 11 13:45:16 UTC 2003 */ +// cppcheck-suppress duplInheritedMember void EMC_JOINT_OVERRIDE_LIMITS::update(CMS * cms) { EMC_JOINT_CMD_MSG::update(cms); @@ -777,6 +796,7 @@ void PmCartesian_update(CMS * cms, PmCartesian * x) * Automatically generated by NML CodeGen Java Applet. * on Sat Oct 11 13:45:16 UTC 2003 */ +// cppcheck-suppress duplInheritedMember void EMC_JOINT_SET_FERROR::update(CMS * cms) { EMC_JOINT_CMD_MSG::update(cms); @@ -788,6 +808,7 @@ void EMC_JOINT_SET_FERROR::update(CMS * cms) * Automatically generated by NML CodeGen Java Applet. * on Sat Oct 11 13:45:16 UTC 2003 */ +// cppcheck-suppress duplInheritedMember void EMC_JOINT_SET_MIN_POSITION_LIMIT::update(CMS * cms) { EMC_JOINT_CMD_MSG::update(cms); @@ -799,6 +820,7 @@ void EMC_JOINT_SET_MIN_POSITION_LIMIT::update(CMS * cms) * Automatically generated by NML CodeGen Java Applet. * on Sat Oct 11 13:45:16 UTC 2003 */ +// cppcheck-suppress duplInheritedMember void EMC_TRAJ_SET_VELOCITY::update(CMS * cms) { EMC_TRAJ_CMD_MSG::update(cms); @@ -811,6 +833,7 @@ void EMC_TRAJ_SET_VELOCITY::update(CMS * cms) * Automatically generated by NML CodeGen Java Applet. * on Sat Oct 11 13:45:16 UTC 2003 */ +// cppcheck-suppress duplInheritedMember void EMC_TASK_ABORT::update(CMS * cms) { EMC_TASK_CMD_MSG::update(cms); @@ -821,6 +844,7 @@ void EMC_TASK_ABORT::update(CMS * cms) * Automatically generated by NML CodeGen Java Applet. * on Sat Oct 11 13:45:16 UTC 2003 */ +// cppcheck-suppress duplInheritedMember void EMC_TASK_PLAN_INIT::update(CMS * cms) { EMC_TASK_CMD_MSG::update(cms); @@ -831,6 +855,7 @@ void EMC_TASK_PLAN_INIT::update(CMS * cms) * Automatically generated by NML CodeGen Java Applet. * on Sat Oct 11 13:45:16 UTC 2003 */ +// cppcheck-suppress duplInheritedMember void EMC_TRAJ_SET_ACCELERATION::update(CMS * cms) { EMC_TRAJ_CMD_MSG::update(cms); @@ -842,6 +867,7 @@ void EMC_TRAJ_SET_ACCELERATION::update(CMS * cms) * Automatically generated by NML CodeGen Java Applet. * on Sat Oct 11 13:45:16 UTC 2003 */ +// cppcheck-suppress duplInheritedMember void EMC_AUX_STAT::update(CMS * cms) { EMC_AUX_STAT_MSG::update(cms); @@ -879,6 +905,7 @@ void EMC_JOG_CMD_MSG::update(CMS * cms) * Automatically generated by NML CodeGen Java Applet. * on Sat Oct 11 13:45:16 UTC 2003 */ +// cppcheck-suppress duplInheritedMember void EMC_STAT::update(CMS * cms) { EMC_STAT_MSG::update(cms); @@ -891,6 +918,7 @@ void EMC_STAT::update(CMS * cms) /* * NML/CMS Update function for EMC_JOG_CONT */ +// cppcheck-suppress duplInheritedMember void EMC_JOG_CONT::update(CMS * cms) { EMC_JOG_CMD_MSG::update(cms); @@ -903,6 +931,7 @@ void EMC_JOG_CONT::update(CMS * cms) * Automatically generated by NML CodeGen Java Applet. * on Sat Oct 11 13:45:16 UTC 2003 */ +// cppcheck-suppress duplInheritedMember void EMC_MOTION_SET_AOUT::update(CMS * cms) { EMC_MOTION_CMD_MSG::update(cms); @@ -927,6 +956,7 @@ void EMC_COOLANT_STAT_MSG::update(CMS * /*cms*/) * Automatically generated by NML CodeGen Java Applet. * on Sat Oct 11 13:45:16 UTC 2003 */ +// cppcheck-suppress duplInheritedMember void EMC_TRAJ_RESUME::update(CMS * cms) { EMC_TRAJ_CMD_MSG::update(cms); @@ -937,6 +967,7 @@ void EMC_TRAJ_RESUME::update(CMS * cms) * Automatically generated by NML CodeGen Java Applet. * on Sat Oct 11 13:45:16 UTC 2003 */ +// cppcheck-suppress duplInheritedMember void EMC_TRAJ_ABORT::update(CMS * cms) { EMC_TRAJ_CMD_MSG::update(cms); @@ -947,6 +978,7 @@ void EMC_TRAJ_ABORT::update(CMS * cms) * Automatically generated by NML CodeGen Java Applet. * on Sat Oct 11 13:45:16 UTC 2003 */ +// cppcheck-suppress duplInheritedMember void EMC_TOOL_SET_OFFSET::update(CMS * cms) { EMC_TOOL_CMD_MSG::update(cms); @@ -965,6 +997,7 @@ void EMC_TOOL_SET_OFFSET::update(CMS * cms) * Manually generated by Alex Joni * on Thu Jan 29 18:55:19 UTC 2009 */ +// cppcheck-suppress duplInheritedMember void EMC_TOOL_SET_NUMBER::update(CMS * cms) { EMC_TOOL_CMD_MSG::update(cms); @@ -976,6 +1009,7 @@ void EMC_TOOL_SET_NUMBER::update(CMS * cms) * Automatically generated by NML CodeGen Java Applet. * on Sat Oct 11 13:45:16 UTC 2003 */ +// cppcheck-suppress duplInheritedMember void EMC_SPINDLE_STAT::update(CMS * cms) { EMC_SPINDLE_STAT_MSG::update(cms); @@ -999,6 +1033,7 @@ void EMC_SPINDLE_STAT::update(CMS * cms) * Automatically generated by NML CodeGen Java Applet. * on Sat Oct 11 13:45:16 UTC 2003 */ +// cppcheck-suppress duplInheritedMember void EMC_JOINT_SET_MAX_POSITION_LIMIT::update(CMS * cms) { EMC_JOINT_CMD_MSG::update(cms); @@ -1010,6 +1045,7 @@ void EMC_JOINT_SET_MAX_POSITION_LIMIT::update(CMS * cms) * Automatically generated by NML CodeGen Java Applet. * on Sat Oct 11 13:45:16 UTC 2003 */ +// cppcheck-suppress duplInheritedMember void EMC_COOLANT_MIST_ON::update(CMS * cms) { EMC_COOLANT_CMD_MSG::update(cms); @@ -1022,6 +1058,7 @@ void EMC_COOLANT_MIST_ON::update(CMS * cms) * * Manually revised 2004/05/24 */ +// cppcheck-suppress duplInheritedMember void EMC_TRAJ_LINEAR_MOVE::update(CMS * cms) { EMC_TRAJ_CMD_MSG::update(cms); @@ -1041,6 +1078,7 @@ void EMC_TRAJ_LINEAR_MOVE::update(CMS * cms) * * Manually revised 2004/05/24 */ +// cppcheck-suppress duplInheritedMember void EMC_TRAJ_CIRCULAR_MOVE::update(CMS * cms) { EMC_TRAJ_CMD_MSG::update(cms); @@ -1060,6 +1098,7 @@ void EMC_TRAJ_CIRCULAR_MOVE::update(CMS * cms) * Automatically generated by NML CodeGen Java Applet. * on Sat Oct 11 13:45:16 UTC 2003 */ +// cppcheck-suppress duplInheritedMember void EMC_TRAJ_SET_TERM_COND::update(CMS * cms) { EMC_TRAJ_CMD_MSG::update(cms); @@ -1067,6 +1106,7 @@ void EMC_TRAJ_SET_TERM_COND::update(CMS * cms) cms->update(tolerance); } +// cppcheck-suppress duplInheritedMember void EMC_TRAJ_SET_SPINDLESYNC::update(CMS * cms) { EMC_TRAJ_CMD_MSG::update(cms); @@ -1079,6 +1119,7 @@ void EMC_TRAJ_SET_SPINDLESYNC::update(CMS * cms) * Automatically generated by NML CodeGen Java Applet. * on Sat Oct 11 13:45:16 UTC 2003 */ +// cppcheck-suppress duplInheritedMember void EMC_TASK_PLAN_RUN::update(CMS * cms) { EMC_TASK_CMD_MSG::update(cms); @@ -1100,6 +1141,7 @@ void EMC_TOOL_CMD_MSG::update(CMS * /*cms*/) * Automatically generated by NML CodeGen Java Applet. * on Sat Oct 11 13:45:16 UTC 2003 */ +// cppcheck-suppress duplInheritedMember void EMC_TASK_PLAN_RESUME::update(CMS * cms) { EMC_TASK_CMD_MSG::update(cms); @@ -1140,6 +1182,7 @@ void EMC_OPERATOR_TEXT::update(CMS * cms) * Automatically generated by NML CodeGen Java Applet. * on Sat Oct 11 13:45:16 UTC 2003 */ +// cppcheck-suppress duplInheritedMember void EMC_COOLANT_MIST_OFF::update(CMS * cms) { EMC_COOLANT_CMD_MSG::update(cms); @@ -1150,6 +1193,7 @@ void EMC_COOLANT_MIST_OFF::update(CMS * cms) * Automatically generated by NML CodeGen Java Applet. * on Sat Oct 11 13:45:16 UTC 2003 */ +// cppcheck-suppress duplInheritedMember void EMC_TOOL_HALT::update(CMS * cms) { EMC_TOOL_CMD_MSG::update(cms); @@ -1160,6 +1204,7 @@ void EMC_TOOL_HALT::update(CMS * cms) * Automatically generated by NML CodeGen Java Applet. * on Sat Oct 11 13:45:16 UTC 2003 */ +// cppcheck-suppress duplInheritedMember void EMC_SPINDLE_DECREASE::update(CMS * cms) { EMC_SPINDLE_CMD_MSG::update(cms); @@ -1197,6 +1242,7 @@ void EMC_TOOL_STAT_MSG::update(CMS * /*cms*/) * Automatically generated by NML CodeGen Java Applet. * on Sat Oct 11 13:45:16 UTC 2003 */ +// cppcheck-suppress duplInheritedMember void EMC_JOINT_STAT::update(CMS * cms) { EMC_JOINT_STAT_MSG::update(cms); @@ -1230,6 +1276,7 @@ void EMC_JOINT_STAT::update(CMS * cms) * Automatically generated by micges * on 13.08.2009 23:43:26 */ +// cppcheck-suppress duplInheritedMember void EMC_AXIS_STAT::update(CMS * cms) { EMC_AXIS_STAT_MSG::update(cms); @@ -1253,12 +1300,14 @@ void EMC_AXIS_STAT_MSG::update(CMS * cms) * Automatically generated by NML CodeGen Java Applet. * on Sat Oct 11 13:45:16 UTC 2003 */ +// cppcheck-suppress duplInheritedMember void EMC_TRAJ_SET_SCALE::update(CMS * cms) { EMC_TRAJ_CMD_MSG::update(cms); cms->update(scale); } +// cppcheck-suppress duplInheritedMember void EMC_TRAJ_SET_RAPID_SCALE::update(CMS * cms) { EMC_TRAJ_CMD_MSG::update(cms); @@ -1270,6 +1319,7 @@ void EMC_TRAJ_SET_RAPID_SCALE::update(CMS * cms) * Automatically generated by Alex Joni :) * on Mon Aug 07 22:39:16 GMT+3 2006 */ +// cppcheck-suppress duplInheritedMember void EMC_TRAJ_SET_SPINDLE_SCALE::update(CMS * cms) { EMC_TRAJ_CMD_MSG::update(cms); @@ -1282,6 +1332,7 @@ void EMC_TRAJ_SET_SPINDLE_SCALE::update(CMS * cms) * Automatically generated by Alex Joni :) * on Tue Oct 17 00:14:16 GMT+3 2006 */ +// cppcheck-suppress duplInheritedMember void EMC_TRAJ_SET_FO_ENABLE::update(CMS * cms) { EMC_TRAJ_CMD_MSG::update(cms); @@ -1293,6 +1344,7 @@ void EMC_TRAJ_SET_FO_ENABLE::update(CMS * cms) * Automatically generated by Alex Joni :) * on Tue Oct 17 00:14:16 GMT+3 2006 */ +// cppcheck-suppress duplInheritedMember void EMC_TRAJ_SET_SO_ENABLE::update(CMS * cms) { EMC_TRAJ_CMD_MSG::update(cms); @@ -1305,6 +1357,7 @@ void EMC_TRAJ_SET_SO_ENABLE::update(CMS * cms) * Automatically generated by Alex Joni :) * on Sat Nov 04 11:42:16 GMT+2 2006 */ +// cppcheck-suppress duplInheritedMember void EMC_TRAJ_SET_FH_ENABLE::update(CMS * cms) { EMC_TRAJ_CMD_MSG::update(cms); @@ -1316,6 +1369,7 @@ void EMC_TRAJ_SET_FH_ENABLE::update(CMS * cms) * Automatically generated by NML CodeGen Java Applet. * on Sat Oct 11 13:45:16 UTC 2003 */ +// cppcheck-suppress duplInheritedMember void EMC_TASK_STAT::update(CMS * cms) { EMC_TASK_STAT_MSG::update(cms); @@ -1353,6 +1407,7 @@ void EMC_TASK_STAT::update(CMS * cms) * Automatically generated by NML CodeGen Java Applet. * on Sat Oct 11 13:45:16 UTC 2003 */ +// cppcheck-suppress duplInheritedMember void EMC_TOOL_ABORT::update(CMS * cms) { EMC_TOOL_CMD_MSG::update(cms); @@ -1364,6 +1419,7 @@ void EMC_TOOL_ABORT::update(CMS * cms) * Automatically generated by NML CodeGen Java Applet. * on Sat Oct 11 13:45:16 UTC 2003 */ +// cppcheck-suppress duplInheritedMember void EMC_TOOL_LOAD_TOOL_TABLE::update(CMS * cms) { EMC_TOOL_CMD_MSG::update(cms); @@ -1375,6 +1431,7 @@ void EMC_TOOL_LOAD_TOOL_TABLE::update(CMS * cms) * Automatically generated by NML CodeGen Java Applet. * on Sat Oct 11 13:45:16 UTC 2003 */ +// cppcheck-suppress duplInheritedMember void EMC_TASK_SET_STATE::update(CMS * cms) { EMC_TASK_CMD_MSG::update(cms); @@ -1386,6 +1443,7 @@ void EMC_TASK_SET_STATE::update(CMS * cms) * Automatically generated by NML CodeGen Java Applet. * on Sat Oct 11 13:45:16 UTC 2003 */ +// cppcheck-suppress duplInheritedMember void EMC_SPINDLE_BRAKE_RELEASE::update(CMS * cms) { EMC_SPINDLE_CMD_MSG::update(cms); @@ -1407,6 +1465,7 @@ void EMC_JOINT_STAT_MSG::update(CMS * cms) * Automatically generated by NML CodeGen Java Applet. * on Sat Oct 11 13:45:16 UTC 2003 */ +// cppcheck-suppress duplInheritedMember void EMC_JOINT_LOAD_COMP::update(CMS * cms) { EMC_JOINT_CMD_MSG::update(cms); @@ -1429,6 +1488,7 @@ void EMC_STAT_MSG::update(CMS * /*cms*/) * Automatically generated by NML CodeGen Java Applet. * on Sat Oct 11 13:45:16 UTC 2003 */ +// cppcheck-suppress duplInheritedMember void EMC_TASK_SET_MODE::update(CMS * cms) { EMC_TASK_CMD_MSG::update(cms); @@ -1438,6 +1498,7 @@ void EMC_TASK_SET_MODE::update(CMS * cms) /* * NML/CMS Update function for EMC_JOG_INCR */ +// cppcheck-suppress duplInheritedMember void EMC_JOG_INCR::update(CMS * cms) { EMC_JOG_CMD_MSG::update(cms); @@ -1451,6 +1512,7 @@ void EMC_JOG_INCR::update(CMS * cms) * Automatically generated by NML CodeGen Java Applet. * on Sat Oct 11 13:45:16 UTC 2003 */ +// cppcheck-suppress duplInheritedMember void EMC_SPINDLE_ON::update(CMS * cms) { EMC_SPINDLE_CMD_MSG::update(cms); @@ -1466,6 +1528,7 @@ void EMC_SPINDLE_ON::update(CMS * cms) * Automatically generated by Alex Joni. * on Fri Sep 12 01:39:16 UTC+3 2008 */ +// cppcheck-suppress duplInheritedMember void EMC_SPINDLE_SPEED::update(CMS * cms) { EMC_SPINDLE_CMD_MSG::update(cms); @@ -1480,6 +1543,7 @@ void EMC_SPINDLE_SPEED::update(CMS * cms) * Manually generated by Michael Haberler. * on Tue Oct 18 18:36:21 CEST 2011 */ +// cppcheck-suppress duplInheritedMember void EMC_SPINDLE_ORIENT::update(CMS * cms) { EMC_SPINDLE_CMD_MSG::update(cms); @@ -1493,6 +1557,7 @@ void EMC_SPINDLE_ORIENT::update(CMS * cms) * Manually generated by Michael Haberler. * on Wed Nov 2 18:29:15 CET 2011 */ +// cppcheck-suppress duplInheritedMember void EMC_SPINDLE_WAIT_ORIENT_COMPLETE::update(CMS * cms) { EMC_SPINDLE_CMD_MSG::update(cms); @@ -1505,6 +1570,7 @@ void EMC_SPINDLE_WAIT_ORIENT_COMPLETE::update(CMS * cms) * Automatically generated by NML CodeGen Java Applet. * on Sat Oct 11 13:45:16 UTC 2003 */ +// cppcheck-suppress duplInheritedMember void EMC_TASK_PLAN_END::update(CMS * cms) { EMC_TASK_CMD_MSG::update(cms); @@ -1515,6 +1581,7 @@ void EMC_TASK_PLAN_END::update(CMS * cms) * Automatically generated by NML CodeGen Java Applet. * on Sat Oct 11 13:45:16 UTC 2003 */ +// cppcheck-suppress duplInheritedMember void EMC_TRAJ_SET_OFFSET::update(CMS * cms) { EMC_TRAJ_CMD_MSG::update(cms); @@ -1556,6 +1623,7 @@ void EMC_SET_DEBUG::update(CMS * cms) * Automatically generated by NML CodeGen Java Applet. * on Sat Oct 11 13:45:17 UTC 2003 */ +// cppcheck-suppress duplInheritedMember void EMC_TASK_PLAN_STEP::update(CMS * cms) { EMC_TASK_CMD_MSG::update(cms); @@ -1565,6 +1633,7 @@ void EMC_TASK_PLAN_STEP::update(CMS * cms) * NML/CMS Update function for EMC_JOINT_SET_BACKLASH * Manually generated - don't use NML CodeGen Java Applet. */ +// cppcheck-suppress duplInheritedMember void EMC_JOINT_SET_BACKLASH::update(CMS * cms) { EMC_JOINT_CMD_MSG::update(cms); @@ -1576,6 +1645,7 @@ void EMC_JOINT_SET_BACKLASH::update(CMS * cms) * Automatically generated by NML CodeGen Java Applet. * on Sat Oct 11 13:45:17 UTC 2003 */ +// cppcheck-suppress duplInheritedMember void EMC_TRAJ_SET_G5X::update(CMS * cms) { EMC_TRAJ_CMD_MSG::update(cms); @@ -1583,12 +1653,14 @@ void EMC_TRAJ_SET_G5X::update(CMS * cms) EmcPose_update(cms, &origin); } +// cppcheck-suppress duplInheritedMember void EMC_TRAJ_SET_G92::update(CMS * cms) { EMC_TRAJ_CMD_MSG::update(cms); EmcPose_update(cms, &origin); } +// cppcheck-suppress duplInheritedMember void EMC_TRAJ_SET_ROTATION::update(CMS * cms) { EMC_TRAJ_CMD_MSG::update(cms); @@ -1600,6 +1672,7 @@ void EMC_TRAJ_SET_ROTATION::update(CMS * cms) * Automatically generated by NML CodeGen Java Applet. * on Sat Oct 11 13:45:17 UTC 2003 */ +// cppcheck-suppress duplInheritedMember void EMC_SPINDLE_BRAKE_ENGAGE::update(CMS * cms) { EMC_SPINDLE_CMD_MSG::update(cms); @@ -1611,6 +1684,7 @@ void EMC_SPINDLE_BRAKE_ENGAGE::update(CMS * cms) * Automatically generated by NML CodeGen Java Applet. * on Sat Oct 11 13:45:17 UTC 2003 */ +// cppcheck-suppress duplInheritedMember void EMC_TRAJ_STAT::update(CMS * cms) { EMC_TRAJ_STAT_MSG::update(cms); @@ -1655,11 +1729,13 @@ void EMC_TRAJ_STAT::update(CMS * cms) * Automatically generated by NML CodeGen Java Applet. * on Sat Oct 11 13:45:17 UTC 2003 */ +// cppcheck-suppress duplInheritedMember void EMC_JOINT_HOME::update(CMS * cms) { EMC_JOINT_CMD_MSG::update(cms); } +// cppcheck-suppress duplInheritedMember void EMC_JOINT_UNHOME::update(CMS * cms) { EMC_JOINT_CMD_MSG::update(cms); @@ -1670,6 +1746,7 @@ void EMC_JOINT_UNHOME::update(CMS * cms) * Automatically generated by NML CodeGen Java Applet. * on Sat Oct 11 13:45:17 UTC 2003 */ +// cppcheck-suppress duplInheritedMember void EMC_SPINDLE_INCREASE::update(CMS * cms) { EMC_SPINDLE_CMD_MSG::update(cms); @@ -1693,6 +1770,7 @@ void EMC_AUX_CMD_MSG::update(CMS * /*cms*/) * Automatically generated by NML CodeGen Java Applet. * on Sat Oct 11 13:45:17 UTC 2003 */ +// cppcheck-suppress duplInheritedMember void EMC_JOINT_SET_MIN_FERROR::update(CMS * cms) { EMC_JOINT_CMD_MSG::update(cms); @@ -1714,6 +1792,7 @@ void EMC_NULL::update(CMS * /*cms*/) * Automatically generated by NML CodeGen Java Applet. * on Sat Oct 11 13:45:17 UTC 2003 */ +// cppcheck-suppress duplInheritedMember void EMC_COOLANT_FLOOD_OFF::update(CMS * cms) { EMC_COOLANT_CMD_MSG::update(cms); @@ -1772,6 +1851,7 @@ void EMC_MOTION_STAT::update(CMS * cms) * Automatically generated by NML CodeGen Java Applet. * on Sat Oct 11 13:45:17 UTC 2003 */ +// cppcheck-suppress duplInheritedMember void EMC_TRAJ_PAUSE::update(CMS * cms) { EMC_TRAJ_CMD_MSG::update(cms); @@ -1792,6 +1872,7 @@ void EMC_AUX_STAT_MSG::update(CMS * /*cms*/) * Automatically generated by NML CodeGen Java Applet. * on Sat Oct 11 13:45:17 UTC 2003 */ +// cppcheck-suppress duplInheritedMember void EMC_TRAJ_SET_MAX_VELOCITY::update(CMS * cms) { EMC_TRAJ_CMD_MSG::update(cms); @@ -1803,6 +1884,7 @@ void EMC_TRAJ_SET_MAX_VELOCITY::update(CMS * cms) * Automatically generated by NML CodeGen Java Applet. * on Sat Oct 11 13:45:17 UTC 2003 */ +// cppcheck-suppress duplInheritedMember void EMC_TASK_PLAN_OPEN::update(CMS * cms) { EMC_TASK_CMD_MSG::update(cms); @@ -1816,6 +1898,7 @@ void EMC_TASK_PLAN_OPEN::update(CMS * cms) * NML/CMS Update function for EMC_JOINT_SET_HOMING_PARAMS * Manually generated - do not use NML CodeGen Java Applet. */ +// cppcheck-suppress duplInheritedMember void EMC_JOINT_SET_HOMING_PARAMS::update(CMS * cms) { EMC_JOINT_CMD_MSG::update(cms); @@ -1839,6 +1922,7 @@ void EMC_JOINT_SET_HOMING_PARAMS::update(CMS * cms) * Automatically generated by NML CodeGen Java Applet. * on Sat Oct 11 13:45:17 UTC 2003 */ +// cppcheck-suppress duplInheritedMember void EMC_TRAJ_SET_MODE::update(CMS * cms) { EMC_TRAJ_CMD_MSG::update(cms); @@ -1850,6 +1934,7 @@ void EMC_TRAJ_SET_MODE::update(CMS * cms) * Automatically generated by NML CodeGen Java Applet. * on Sat Oct 11 13:45:17 UTC 2003 */ +// cppcheck-suppress duplInheritedMember void EMC_TASK_PLAN_EXECUTE::update(CMS * cms) { EMC_TASK_CMD_MSG::update(cms); @@ -1861,6 +1946,7 @@ void EMC_TASK_PLAN_EXECUTE::update(CMS * cms) * Automatically generated by NML CodeGen Java Applet. * on Sat Oct 11 13:45:17 UTC 2003 */ +// cppcheck-suppress duplInheritedMember void EMC_COOLANT_FLOOD_ON::update(CMS * cms) { EMC_COOLANT_CMD_MSG::update(cms); @@ -1871,6 +1957,7 @@ void EMC_COOLANT_FLOOD_ON::update(CMS * cms) * Automatically generated by NML CodeGen Java Applet. * on Sat Oct 11 13:45:17 UTC 2003 */ +// cppcheck-suppress duplInheritedMember void EMC_COOLANT_STAT::update(CMS * cms) { EMC_COOLANT_STAT_MSG::update(cms); @@ -1883,6 +1970,7 @@ void EMC_COOLANT_STAT::update(CMS * cms) * Automatically generated by NML CodeGen Java Applet. * on Sat Oct 11 13:45:17 UTC 2003 */ +// cppcheck-suppress duplInheritedMember void EMC_TRAJ_SET_TELEOP_ENABLE::update(CMS * cms) { EMC_TRAJ_CMD_MSG::update(cms); @@ -1894,6 +1982,7 @@ void EMC_TRAJ_SET_TELEOP_ENABLE::update(CMS * cms) * Automatically generated by NML CodeGen Java Applet. * on Sat Oct 11 13:45:17 UTC 2003 */ +// cppcheck-suppress duplInheritedMember void EMC_JOINT_HALT::update(CMS * cms) { EMC_JOINT_CMD_MSG::update(cms); @@ -1904,6 +1993,7 @@ void EMC_JOINT_HALT::update(CMS * cms) * Automatically generated by NML CodeGen Java Applet. * on Sat Oct 11 13:45:17 UTC 2003 */ +// cppcheck-suppress duplInheritedMember void EMC_TASK_PLAN_PAUSE::update(CMS * cms) { EMC_TASK_CMD_MSG::update(cms); @@ -1914,6 +2004,7 @@ void EMC_TASK_PLAN_PAUSE::update(CMS * cms) * Automanually generated by Alex Joni. * on Sat Sep 09 00:18:17 GMT+3 2006 */ +// cppcheck-suppress duplInheritedMember void EMC_TASK_PLAN_SET_OPTIONAL_STOP::update(CMS * cms) { EMC_TASK_CMD_MSG::update(cms); @@ -1925,6 +2016,7 @@ void EMC_TASK_PLAN_SET_OPTIONAL_STOP::update(CMS * cms) * Automanually generated by Alex Joni. * on Sun Oct 22 17:30:00 GMT+3 2006 */ +// cppcheck-suppress duplInheritedMember void EMC_TASK_PLAN_SET_BLOCK_DELETE::update(CMS * cms) { EMC_TASK_CMD_MSG::update(cms); @@ -1936,6 +2028,7 @@ void EMC_TASK_PLAN_SET_BLOCK_DELETE::update(CMS * cms) * Automanually generated by Alex Joni. * on Sat Sep 24 20:25:27 GMT+3 2006 */ +// cppcheck-suppress duplInheritedMember void EMC_TASK_PLAN_OPTIONAL_STOP::update(CMS * cms) { EMC_TASK_CMD_MSG::update(cms); @@ -1946,6 +2039,7 @@ void EMC_TASK_PLAN_OPTIONAL_STOP::update(CMS * cms) * Automatically generated by NML CodeGen Java Applet. * on Sat Oct 11 13:45:17 UTC 2003 */ +// cppcheck-suppress duplInheritedMember void EMC_TRAJ_PROBE::update(CMS * cms) { EMC_TRAJ_CMD_MSG::update(cms); @@ -1962,6 +2056,7 @@ void EMC_TRAJ_PROBE::update(CMS * cms) * Automatically generated by Alex Joni. * on Sun Aug 19 1:36:17 GMT+3 2007 */ +// cppcheck-suppress duplInheritedMember void EMC_AUX_INPUT_WAIT::update(CMS * cms) { EMC_AUX_CMD_MSG::update(cms); @@ -1977,6 +2072,7 @@ void EMC_AUX_INPUT_WAIT::update(CMS * cms) * Manually generated by Alex Joni. * on Sun Mar 04 18:15:17 EET 2007 */ +// cppcheck-suppress duplInheritedMember void EMC_TRAJ_RIGID_TAP::update(CMS * cms) { EMC_TRAJ_CMD_MSG::update(cms); @@ -1992,6 +2088,7 @@ void EMC_TRAJ_RIGID_TAP::update(CMS * cms) * Automatically generated by NML CodeGen Java Applet. * on Sat Oct 11 13:45:17 UTC 2003 */ +// cppcheck-suppress duplInheritedMember void EMC_TOOL_UNLOAD::update(CMS * cms) { EMC_TOOL_CMD_MSG::update(cms); @@ -2002,6 +2099,7 @@ void EMC_TOOL_UNLOAD::update(CMS * cms) * Automatically generated by NML CodeGen Java Applet. * on Sat Oct 11 13:45:17 UTC 2003 */ +// cppcheck-suppress duplInheritedMember void EMC_MOTION_SET_DOUT::update(CMS * cms) { EMC_MOTION_CMD_MSG::update(cms); @@ -2017,6 +2115,7 @@ void EMC_MOTION_SET_DOUT::update(CMS * cms) * 'Automatically' generated by Alex Joni. * on Wed May 17 17:34:17 GMT+2+DST 2006 */ +// cppcheck-suppress duplInheritedMember void EMC_MOTION_ADAPTIVE::update(CMS * cms) { EMC_MOTION_CMD_MSG::update(cms); diff --git a/src/emc/nml_intf/emc_nml.hh b/src/emc/nml_intf/emc_nml.hh index d943ef4485d..9f58782ed80 100644 --- a/src/emc/nml_intf/emc_nml.hh +++ b/src/emc/nml_intf/emc_nml.hh @@ -1701,13 +1701,13 @@ class EMC_SPINDLE_CMD_MSG:public RCS_CMD_MSG { public: EMC_SPINDLE_CMD_MSG(NMLTYPE t, size_t s) : RCS_CMD_MSG(t, s), - spindle(0) + _spindle(0) {}; // For internal NML/CMS use only. void update(CMS * cms); - int spindle; + int _spindle; }; class EMC_SPINDLE_SPEED:public EMC_SPINDLE_CMD_MSG { diff --git a/src/emc/nml_intf/interpl.cc b/src/emc/nml_intf/interpl.cc index 142ea3a26ef..8258d4355c1 100644 --- a/src/emc/nml_intf/interpl.cc +++ b/src/emc/nml_intf/interpl.cc @@ -38,7 +38,7 @@ int NML_INTERP_LIST::append(std::unique_ptr&& nml_msg_ptr) return -1; } - if (0 == nml_msg_ptr->type) { + if (0 == nml_msg_ptr->_type) { rcs_print_error("NML_INTERP_LIST::append : attempt to append 0 type\n"); return -1; } @@ -58,7 +58,7 @@ int NML_INTERP_LIST::append(std::unique_ptr&& nml_msg_ptr) "line_number=%d\n", this, linked_list.front().command->size, - emc_symbol_lookup(linked_list.front().command->type), + emc_symbol_lookup(linked_list.front().command->_type), linked_list.size(), linked_list.front().line_number); } @@ -84,7 +84,7 @@ std::unique_ptr NML_INTERP_LIST::get() rcs_print("NML_INTERP_LIST(%p)::get(): {size=%ld, type=%s}, list_size=%lu\n", this, node.command->size, - emc_symbol_lookup(node.command->type), + emc_symbol_lookup(node.command->_type), linked_list.size()); } @@ -104,7 +104,7 @@ void NML_INTERP_LIST::print() rcs_print("NML_INTERP_LIST::print(): list size=%lu\n", linked_list.size()); for (auto& i : linked_list) { auto& msg = *(i.command); - rcs_print("--> type=%s, line_number=%d\n", emc_symbol_lookup(msg.type), i.line_number); + rcs_print("--> type=%s, line_number=%d\n", emc_symbol_lookup(msg._type), i.line_number); } rcs_print("\n"); } diff --git a/src/emc/task/emctaskmain.cc b/src/emc/task/emctaskmain.cc index 92e79e4bcce..34ee1fec4bb 100644 --- a/src/emc/task/emctaskmain.cc +++ b/src/emc/task/emctaskmain.cc @@ -459,7 +459,7 @@ static int checkInterpList(NML_INTERP_LIST * il, EMC_STAT * /*stat*/) while (il->len() > 0) { auto cmd = il->get(); - switch (cmd->type) { + switch (cmd->_type) { case EMC_OPERATOR_ERROR_TYPE: { auto error_msg = static_cast(cmd.get()); @@ -731,7 +731,7 @@ static bool allow_while_idle_type() { // expect immediate command RCS_CMD_MSG *emcCommand; emcCommand = emcCommandBuffer->get_address(); - switch(emcCommand->type) { + switch(emcCommand->_type) { case EMC_JOG_CONT_TYPE: case EMC_JOG_INCR_TYPE: case EMC_JOG_STOP_TYPE: @@ -756,7 +756,7 @@ static int emcTaskPlan(void) // check for new command if (emcCommand->serial_number != emcStatus->echo_serial_number) { // flag it here locally as a new command - type = emcCommand->type; + type = emcCommand->_type; } else { // no new command-- reset local flag type = 0; @@ -1498,7 +1498,7 @@ static EMC_TASK_EXEC emcTaskCheckPreconditions(NMLmsg * cmd) return EMC_TASK_EXEC::DONE; } - switch (cmd->type) { + switch (cmd->_type) { // operator messages, if queued, will go out when everything before // them is done case EMC_OPERATOR_ERROR_TYPE: @@ -1604,7 +1604,7 @@ static EMC_TASK_EXEC emcTaskCheckPreconditions(NMLmsg * cmd) // unrecognized command if (emc_debug & EMC_DEBUG_TASK_ISSUE) { rcs_print_error("preconditions: unrecognized command %d:%s\n", - (int)cmd->type, emc_symbol_lookup(cmd->type)); + (int)cmd->_type, emc_symbol_lookup(cmd->_type)); } return EMC_TASK_EXEC::ERROR; break; @@ -1638,10 +1638,10 @@ static int emcTaskIssueCommand(NMLmsg * cmd) return 0; } if (emc_debug & EMC_DEBUG_TASK_ISSUE) { - rcs_print("Issuing %s -- \t (%s)\n", emcSymbolLookup(cmd->type), + rcs_print("Issuing %s -- \t (%s)\n", emcSymbolLookup(cmd->_type), emcCommandBuffer->msg2str(cmd)); } - switch (cmd->type) { + switch (cmd->_type) { // general commands case EMC_OPERATOR_ERROR_TYPE: @@ -2399,7 +2399,7 @@ static int emcTaskIssueCommand(NMLmsg * cmd) // unrecognized command if (emc_debug & EMC_DEBUG_TASK_ISSUE) { rcs_print_error("ignoring issue of unknown command %d:%s\n", - (int)cmd->type, emc_symbol_lookup(cmd->type)); + (int)cmd->_type, emc_symbol_lookup(cmd->_type)); } retval = 0; // don't consider this an error break; @@ -2407,8 +2407,8 @@ static int emcTaskIssueCommand(NMLmsg * cmd) if (retval == -1) { if (emc_debug & EMC_DEBUG_TASK_ISSUE) { - rcs_print_error("error executing command %d:%s\n", (int)cmd->type, - emc_symbol_lookup(cmd->type)); + rcs_print_error("error executing command %d:%s\n", (int)cmd->_type, + emc_symbol_lookup(cmd->_type)); } } /* debug */ @@ -2433,7 +2433,7 @@ static EMC_TASK_EXEC emcTaskCheckPostconditions(NMLmsg * cmd) return EMC_TASK_EXEC::DONE; } - switch (cmd->type) { + switch (cmd->_type) { case EMC_OPERATOR_ERROR_TYPE: case EMC_OPERATOR_TEXT_TYPE: case EMC_OPERATOR_DISPLAY_TYPE: @@ -2510,7 +2510,7 @@ static EMC_TASK_EXEC emcTaskCheckPostconditions(NMLmsg * cmd) // unrecognized command if (emc_debug & EMC_DEBUG_TASK_ISSUE) { rcs_print_error("postconditions: unrecognized command %d:%s\n", - (int)cmd->type, emc_symbol_lookup(cmd->type)); + (int)cmd->_type, emc_symbol_lookup(cmd->_type)); } return EMC_TASK_EXEC::DONE; break; @@ -3511,11 +3511,11 @@ int main(int argc, char *argv[]) // is not an NML_MODULE and they won't be set automatically // do task - emcStatus->task.command_type = emcCommand->type; + emcStatus->task.command_type = emcCommand->_type; emcStatus->task.echo_serial_number = emcCommand->serial_number; // do top level - emcStatus->command_type = emcCommand->type; + emcStatus->command_type = emcCommand->_type; emcStatus->echo_serial_number = emcCommand->serial_number; if (taskPlanError || taskExecuteError || diff --git a/src/libnml/nml/cmd_msg.hh b/src/libnml/nml/cmd_msg.hh index 4aa0787dd2e..333856295c6 100644 --- a/src/libnml/nml/cmd_msg.hh +++ b/src/libnml/nml/cmd_msg.hh @@ -30,6 +30,8 @@ class RCS_CMD_CHANNEL:public NML { RCS_CMD_CHANNEL(NML_FORMAT_PTR, const char *, const char *, const char *, int set_to_server = 0); ~RCS_CMD_CHANNEL(); + // Sub-class calls base-class + // cppcheck-suppress duplInheritedMember RCS_CMD_MSG *get_address() { return ((RCS_CMD_MSG *) NML::get_address()); }; diff --git a/src/libnml/nml/nml.cc b/src/libnml/nml/nml.cc index 41bf5be63b6..ce5e0ff2153 100644 --- a/src/libnml/nml/nml.cc +++ b/src/libnml/nml/nml.cc @@ -1051,13 +1051,13 @@ NMLTYPE NML::read() case CMS_READ_OLD: return (0); case CMS_READ_OK: - if (((NMLmsg *) cms->subdiv_data)->type <= 0 && !cms->isserver) { + if (((NMLmsg *) cms->subdiv_data)->_type <= 0 && !cms->isserver) { rcs_print_error ("NML: New data received but type of %d is invalid.\n", - (int)((NMLmsg *) cms->subdiv_data)->type); + (int)((NMLmsg *) cms->subdiv_data)->_type); return -1; } - return (((NMLmsg *) cms->subdiv_data)->type); + return (((NMLmsg *) cms->subdiv_data)->_type); default: set_error(); @@ -1104,13 +1104,13 @@ NMLTYPE NML::read() return (0); case CMS_READ_OK: error_type = NML_NO_ERROR; - if (((NMLmsg *) cms->subdiv_data)->type <= 0 && !cms->isserver) { + if (((NMLmsg *) cms->subdiv_data)->_type <= 0 && !cms->isserver) { rcs_print_error ("NML: New data received but type of %d is invalid.\n", - (int)((NMLmsg *) cms->subdiv_data)->type); + (int)((NMLmsg *) cms->subdiv_data)->_type); return -1; } - return (((NMLmsg *) cms->subdiv_data)->type); + return (((NMLmsg *) cms->subdiv_data)->_type); default: set_error(); @@ -1144,13 +1144,13 @@ NMLTYPE NML::blocking_read(double blocking_timeout) case CMS_READ_OLD: return (0); case CMS_READ_OK: - if (((NMLmsg *) cms->subdiv_data)->type <= 0 && !cms->isserver) { + if (((NMLmsg *) cms->subdiv_data)->_type <= 0 && !cms->isserver) { rcs_print_error ("NML: New data received but type of %d is invalid.\n", - (int)((NMLmsg *) cms->subdiv_data)->type); + (int)((NMLmsg *) cms->subdiv_data)->_type); return -1; } - return (((NMLmsg *) cms->subdiv_data)->type); + return (((NMLmsg *) cms->subdiv_data)->_type); case CMS_TIMED_OUT: error_type = NML_NO_ERROR; return 0; @@ -1226,13 +1226,13 @@ NMLTYPE NML::blocking_read(double blocking_timeout) case CMS_READ_OLD: return (0); case CMS_READ_OK: - if (((NMLmsg *) cms->subdiv_data)->type <= 0 && !cms->isserver) { + if (((NMLmsg *) cms->subdiv_data)->_type <= 0 && !cms->isserver) { rcs_print_error ("NML: New data received but type of %d is invalid.\n", - (int)((NMLmsg *) cms->subdiv_data)->type); + (int)((NMLmsg *) cms->subdiv_data)->_type); return -1; } - return (((NMLmsg *) cms->subdiv_data)->type); + return (((NMLmsg *) cms->subdiv_data)->_type); case CMS_TIMED_OUT: error_type = NML_NO_ERROR; return 0; @@ -1328,13 +1328,13 @@ NMLTYPE NML::peek() case CMS_READ_OLD: return (0); case CMS_READ_OK: - if (((NMLmsg *) cms->subdiv_data)->type <= 0 && !cms->isserver) { + if (((NMLmsg *) cms->subdiv_data)->_type <= 0 && !cms->isserver) { rcs_print_error ("NML: New data received but type of %d is invalid.\n", - (int)((NMLmsg *) cms->subdiv_data)->type); + (int)((NMLmsg *) cms->subdiv_data)->_type); return -1; } - return (((NMLmsg *) cms->subdiv_data)->type); + return (((NMLmsg *) cms->subdiv_data)->_type); default: set_error(); @@ -1374,13 +1374,13 @@ NMLTYPE NML::peek() case CMS_READ_OLD: return (0); case CMS_READ_OK: - if (((NMLmsg *) cms->subdiv_data)->type <= 0 && !cms->isserver) { + if (((NMLmsg *) cms->subdiv_data)->_type <= 0 && !cms->isserver) { rcs_print_error ("NML: New data received but type of %d is invalid.\n", - (int)((NMLmsg *) cms->subdiv_data)->type); + (int)((NMLmsg *) cms->subdiv_data)->_type); return -1; } - return (((NMLmsg *) cms->subdiv_data)->type); + return (((NMLmsg *) cms->subdiv_data)->_type); default: set_error(); @@ -1450,7 +1450,7 @@ int NML::format_output() if (forced_type > 0) { new_type = forced_type; } - ((NMLmsg *) cms->subdiv_data)->type = new_type; /* Store type + ((NMLmsg *) cms->subdiv_data)->_type = new_type; /* Store type in message. */ ((NMLmsg *) cms->subdiv_data)->size = new_size; /* Store size @@ -1498,12 +1498,12 @@ int NML::format_output() cms->rewind(); /* Move to the start of the encoded buffer. */ /* Get the type and size from the message. */ - new_type = ((NMLmsg *) cms->subdiv_data)->type; + new_type = ((NMLmsg *) cms->subdiv_data)->_type; new_size = ((NMLmsg *) cms->subdiv_data)->size; if (forced_type > 0) { new_type = forced_type; - ((NMLmsg *) cms->subdiv_data)->type = forced_type; + ((NMLmsg *) cms->subdiv_data)->_type = forced_type; } /* Store the type and size in the encoded buffer. */ @@ -1555,7 +1555,7 @@ int NML::format_output() return (-1); } if (forced_type > 0) { - ((NMLmsg *) cms->subdiv_data)->type = forced_type; + ((NMLmsg *) cms->subdiv_data)->_type = forced_type; } return (((int) cms->status < 0) ? -1 : 0); @@ -1612,7 +1612,7 @@ int NML::write(NMLmsg * nml_msg, int *serial_number) return (-1); } - if ((nml_msg->size == 0 || nml_msg->type == 0) && !cms->isserver) { + if ((nml_msg->size == 0 || nml_msg->_type == 0) && !cms->isserver) { error_type = NML_INVALID_MESSAGE_ERROR; rcs_print_error("NML::write: Message size or type is zero.\n"); rcs_print_error @@ -1776,7 +1776,7 @@ int NML::write_if_read(NMLmsg * nml_msg, int *serial_number) return (-1); } - if ((nml_msg->size == 0 || nml_msg->type == 0) && !cms->isserver) { + if ((nml_msg->size == 0 || nml_msg->_type == 0) && !cms->isserver) { error_type = NML_INVALID_MESSAGE_ERROR; rcs_print_error ("NML::write_if_read: Message size or type is zero.\n"); @@ -1872,7 +1872,7 @@ int NML::format_input(NMLmsg * nml_msg) cms->format_high_ptr = cms->format_low_ptr + nml_msg->size; /* Handle the generic part of the message. */ cms->rewind(); /* Move to the start of the encoded buffer. */ - cms->update(nml_msg->type); /* Store message type in encoded + cms->update(nml_msg->_type); /* Store message type in encoded buffer. */ cms->update(nml_msg->size); /* Store message size in encoded buffer. */ @@ -1885,7 +1885,7 @@ int NML::format_input(NMLmsg * nml_msg) } /* Run through list of format functions. */ - if (-1 == run_format_chain(nml_msg->type, nml_msg)) { + if (-1 == run_format_chain(nml_msg->_type, nml_msg)) { rcs_print_error("NMLwrite: format error\n"); if (verbose_nml_error_messages) { rcs_print_error(" (Buffer = %s, Process = %s)\n", @@ -1914,7 +1914,7 @@ int NML::format_input(NMLmsg * nml_msg) cms->format_high_ptr = cms->format_low_ptr + cms->size; /* Store the new type and size in the raw message. */ - ((NMLmsg *) cms->subdiv_data)->type = new_type; + ((NMLmsg *) cms->subdiv_data)->_type = new_type; ((NMLmsg *) cms->subdiv_data)->size = new_size; /* Check the list of format functions. */ @@ -2081,7 +2081,7 @@ NMLTYPE NML::str2msg(const char *string) return (0); case CMS_READ_OK: error_type = NML_NO_ERROR; - return (((NMLmsg *) cms->subdiv_data)->type); + return (((NMLmsg *) cms->subdiv_data)->_type); case CMS_TIMED_OUT: error_type = NML_TIMED_OUT; return -1; diff --git a/src/libnml/nml/nmlmsg.cc b/src/libnml/nml/nmlmsg.cc index 00fbda71cc9..c7a8263c33e 100644 --- a/src/libnml/nml/nmlmsg.cc +++ b/src/libnml/nml/nmlmsg.cc @@ -28,7 +28,7 @@ extern "C" { /* Constructor */ NMLmsg::NMLmsg(NMLTYPE t, long s) { - type = t; + _type = t; size = s; if (automatically_clear) { clear(); @@ -38,15 +38,15 @@ NMLmsg::NMLmsg(NMLTYPE t, long s) sizeof(NMLmsg)); size = sizeof(NMLmsg); } - if (type <= 0) { + if (_type <= 0) { rcs_print_error("NMLmsg: type(=%d) should be greater than zero.\n", - (int)type); + (int)_type); } }; NMLmsg::NMLmsg(NMLTYPE t, size_t s) { - type = t; + _type = t; size = s; if (automatically_clear) { clear(); @@ -56,9 +56,9 @@ NMLmsg::NMLmsg(NMLTYPE t, size_t s) sizeof(NMLmsg)); size = sizeof(NMLmsg); } - if (type <= 0) { + if (_type <= 0) { rcs_print_error("NMLmsg: type(=%d) should be greater than zero.\n", - (int)type); + (int)_type); } } @@ -67,16 +67,16 @@ NMLmsg::NMLmsg(NMLTYPE t, long s, int noclear) if (automatically_clear && !noclear) { clear(); } - type = t; + _type = t; size = s; if (size < ((long) sizeof(NMLmsg))) { rcs_print_error("NMLmsg: size(=%ld) must be atleast %zu\n", size, sizeof(NMLmsg)); size = sizeof(NMLmsg); } - if (type <= 0) { + if (_type <= 0) { rcs_print_error("NMLmsg: type(=%d) should be greater than zero.\n", - (int)type); + (int)_type); } }; @@ -85,10 +85,10 @@ void NMLmsg::clear() long temp_size; NMLTYPE temp_type; temp_size = size; - temp_type = type; + temp_type = _type; memset((void *) this, 0, size); size = temp_size; - type = temp_type; + _type = temp_type; if (size < ((long) sizeof(NMLmsg))) { rcs_print_error("NMLmsg: size(=%ld) must be atleast %zu\n", size, sizeof(NMLmsg)); diff --git a/src/libnml/nml/nmlmsg.hh b/src/libnml/nml/nmlmsg.hh index e8d2a942d4a..1bc480c3912 100644 --- a/src/libnml/nml/nmlmsg.hh +++ b/src/libnml/nml/nmlmsg.hh @@ -53,7 +53,7 @@ class NMLmsg { static int automatically_clear; /* controls whether NMLmsgs are set to zero in the constructor. */ - NMLTYPE type; /* Each derived type should have a unique id */ + NMLTYPE _type; /* Each derived type should have a unique id */ long size; /* The size is used so that the entire buffer is not copied unnecessarily. */ }; diff --git a/src/libnml/nml/stat_msg.cc b/src/libnml/nml/stat_msg.cc index c5b3b7d305d..34aaaafc998 100644 --- a/src/libnml/nml/stat_msg.cc +++ b/src/libnml/nml/stat_msg.cc @@ -28,7 +28,7 @@ RCS_STAT_MSG::RCS_STAT_MSG(NMLTYPE t, size_t sz):NMLmsg(t, sz) command_type = -1; echo_serial_number = -1; status = RCS_STATUS::UNINITIALIZED; - state = -1; + _state = -1; } int RCS_STAT_MSG_format(NMLTYPE t, void *buf, CMS * cms) @@ -36,7 +36,7 @@ int RCS_STAT_MSG_format(NMLTYPE t, void *buf, CMS * cms) cms->update(((RCS_STAT_MSG *) buf)->command_type); cms->update(((RCS_STAT_MSG *) buf)->echo_serial_number); cms->update(((RCS_STAT_MSG *) buf)->status_int); - cms->update(((RCS_STAT_MSG *) buf)->state); + cms->update(((RCS_STAT_MSG *) buf)->_state); switch (t) { case RCS_GENERIC_STATUS_TYPE: diff --git a/src/libnml/nml/stat_msg.hh b/src/libnml/nml/stat_msg.hh index 55e48183b00..210350ac876 100644 --- a/src/libnml/nml/stat_msg.hh +++ b/src/libnml/nml/stat_msg.hh @@ -39,7 +39,7 @@ class RCS_STAT_MSG:public NMLmsg { RCS_STATUS status; int status_int; }; - int state; + int _state; }; extern int RCS_STAT_MSG_format(NMLTYPE, void *, CMS *); @@ -49,6 +49,8 @@ class RCS_STAT_CHANNEL:public NML { RCS_STAT_CHANNEL(NML_FORMAT_PTR, const char *, const char *, const char *, int set_to_server = 0); ~RCS_STAT_CHANNEL(); + // Sub-class calls base-class + // cppcheck-suppress duplInheritedMember RCS_STAT_MSG *get_address() { return ((RCS_STAT_MSG *) NML::get_address()); };