Skip to content

Commit 5fe48a6

Browse files
andypughandypugh
authored
Merge pull request #3357 from BsAtHome/fix_cppcheck-dupinheritmember
Fix more cppcheck indicated duplicate inherited methods and members
2 parents bccfbd9 + 8b0c257 commit 5fe48a6

File tree

10 files changed

+167
-64
lines changed

10 files changed

+167
-64
lines changed

‎src/emc/nml_intf/emc.cc‎

Lines changed: 100 additions & 1 deletion
Large diffs are not rendered by default.

‎src/emc/nml_intf/emc_nml.hh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1701,13 +1701,13 @@ class EMC_SPINDLE_CMD_MSG:public RCS_CMD_MSG {
17011701
public:
17021702
EMC_SPINDLE_CMD_MSG(NMLTYPE t, size_t s)
17031703
: RCS_CMD_MSG(t, s),
1704-
spindle(0)
1704+
_spindle(0)
17051705
{};
17061706

17071707
// For internal NML/CMS use only.
17081708
void update(CMS * cms);
17091709

1710-
int spindle;
1710+
int _spindle;
17111711
};
17121712

17131713
class EMC_SPINDLE_SPEED:public EMC_SPINDLE_CMD_MSG {

‎src/emc/nml_intf/interpl.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ int NML_INTERP_LIST::append(std::unique_ptr<NMLmsg>&& nml_msg_ptr)
3838
return -1;
3939
}
4040

41-
if (0 == nml_msg_ptr->type) {
41+
if (0 == nml_msg_ptr->_type) {
4242
rcs_print_error("NML_INTERP_LIST::append : attempt to append 0 type\n");
4343
return -1;
4444
}
@@ -58,7 +58,7 @@ int NML_INTERP_LIST::append(std::unique_ptr<NMLmsg>&& nml_msg_ptr)
5858
"line_number=%d\n",
5959
this,
6060
linked_list.front().command->size,
61-
emc_symbol_lookup(linked_list.front().command->type),
61+
emc_symbol_lookup(linked_list.front().command->_type),
6262
linked_list.size(),
6363
linked_list.front().line_number);
6464
}
@@ -84,7 +84,7 @@ std::unique_ptr<NMLmsg> NML_INTERP_LIST::get()
8484
rcs_print("NML_INTERP_LIST(%p)::get(): {size=%ld, type=%s}, list_size=%lu\n",
8585
this,
8686
node.command->size,
87-
emc_symbol_lookup(node.command->type),
87+
emc_symbol_lookup(node.command->_type),
8888
linked_list.size());
8989
}
9090

@@ -104,7 +104,7 @@ void NML_INTERP_LIST::print()
104104
rcs_print("NML_INTERP_LIST::print(): list size=%lu\n", linked_list.size());
105105
for (auto& i : linked_list) {
106106
auto& msg = *(i.command);
107-
rcs_print("--> type=%s, line_number=%d\n", emc_symbol_lookup(msg.type), i.line_number);
107+
rcs_print("--> type=%s, line_number=%d\n", emc_symbol_lookup(msg._type), i.line_number);
108108
}
109109
rcs_print("\n");
110110
}

‎src/emc/task/emctaskmain.cc‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,7 @@ static int checkInterpList(NML_INTERP_LIST * il, EMC_STAT * /*stat*/)
459459
while (il->len() > 0) {
460460
auto cmd = il->get();
461461

462-
switch (cmd->type) {
462+
switch (cmd->_type) {
463463

464464
case EMC_OPERATOR_ERROR_TYPE: {
465465
auto error_msg = static_cast<EMC_OPERATOR_ERROR*>(cmd.get());
@@ -731,7 +731,7 @@ static bool allow_while_idle_type() {
731731
// expect immediate command
732732
RCS_CMD_MSG *emcCommand;
733733
emcCommand = emcCommandBuffer->get_address();
734-
switch(emcCommand->type) {
734+
switch(emcCommand->_type) {
735735
case EMC_JOG_CONT_TYPE:
736736
case EMC_JOG_INCR_TYPE:
737737
case EMC_JOG_STOP_TYPE:
@@ -756,7 +756,7 @@ static int emcTaskPlan(void)
756756
// check for new command
757757
if (emcCommand->serial_number != emcStatus->echo_serial_number) {
758758
// flag it here locally as a new command
759-
type = emcCommand->type;
759+
type = emcCommand->_type;
760760
} else {
761761
// no new command-- reset local flag
762762
type = 0;
@@ -1498,7 +1498,7 @@ static EMC_TASK_EXEC emcTaskCheckPreconditions(NMLmsg * cmd)
14981498
return EMC_TASK_EXEC::DONE;
14991499
}
15001500

1501-
switch (cmd->type) {
1501+
switch (cmd->_type) {
15021502
// operator messages, if queued, will go out when everything before
15031503
// them is done
15041504
case EMC_OPERATOR_ERROR_TYPE:
@@ -1604,7 +1604,7 @@ static EMC_TASK_EXEC emcTaskCheckPreconditions(NMLmsg * cmd)
16041604
// unrecognized command
16051605
if (emc_debug & EMC_DEBUG_TASK_ISSUE) {
16061606
rcs_print_error("preconditions: unrecognized command %d:%s\n",
1607-
(int)cmd->type, emc_symbol_lookup(cmd->type));
1607+
(int)cmd->_type, emc_symbol_lookup(cmd->_type));
16081608
}
16091609
return EMC_TASK_EXEC::ERROR;
16101610
break;
@@ -1638,10 +1638,10 @@ static int emcTaskIssueCommand(NMLmsg * cmd)
16381638
return 0;
16391639
}
16401640
if (emc_debug & EMC_DEBUG_TASK_ISSUE) {
1641-
rcs_print("Issuing %s -- \t (%s)\n", emcSymbolLookup(cmd->type),
1641+
rcs_print("Issuing %s -- \t (%s)\n", emcSymbolLookup(cmd->_type),
16421642
emcCommandBuffer->msg2str(cmd));
16431643
}
1644-
switch (cmd->type) {
1644+
switch (cmd->_type) {
16451645
// general commands
16461646

16471647
case EMC_OPERATOR_ERROR_TYPE:
@@ -2399,16 +2399,16 @@ static int emcTaskIssueCommand(NMLmsg * cmd)
23992399
// unrecognized command
24002400
if (emc_debug & EMC_DEBUG_TASK_ISSUE) {
24012401
rcs_print_error("ignoring issue of unknown command %d:%s\n",
2402-
(int)cmd->type, emc_symbol_lookup(cmd->type));
2402+
(int)cmd->_type, emc_symbol_lookup(cmd->_type));
24032403
}
24042404
retval = 0; // don't consider this an error
24052405
break;
24062406
}
24072407

24082408
if (retval == -1) {
24092409
if (emc_debug & EMC_DEBUG_TASK_ISSUE) {
2410-
rcs_print_error("error executing command %d:%s\n", (int)cmd->type,
2411-
emc_symbol_lookup(cmd->type));
2410+
rcs_print_error("error executing command %d:%s\n", (int)cmd->_type,
2411+
emc_symbol_lookup(cmd->_type));
24122412
}
24132413
}
24142414
/* debug */
@@ -2433,7 +2433,7 @@ static EMC_TASK_EXEC emcTaskCheckPostconditions(NMLmsg * cmd)
24332433
return EMC_TASK_EXEC::DONE;
24342434
}
24352435

2436-
switch (cmd->type) {
2436+
switch (cmd->_type) {
24372437
case EMC_OPERATOR_ERROR_TYPE:
24382438
case EMC_OPERATOR_TEXT_TYPE:
24392439
case EMC_OPERATOR_DISPLAY_TYPE:
@@ -2510,7 +2510,7 @@ static EMC_TASK_EXEC emcTaskCheckPostconditions(NMLmsg * cmd)
25102510
// unrecognized command
25112511
if (emc_debug & EMC_DEBUG_TASK_ISSUE) {
25122512
rcs_print_error("postconditions: unrecognized command %d:%s\n",
2513-
(int)cmd->type, emc_symbol_lookup(cmd->type));
2513+
(int)cmd->_type, emc_symbol_lookup(cmd->_type));
25142514
}
25152515
return EMC_TASK_EXEC::DONE;
25162516
break;
@@ -3511,11 +3511,11 @@ int main(int argc, char *argv[])
35113511
// is not an NML_MODULE and they won't be set automatically
35123512

35133513
// do task
3514-
emcStatus->task.command_type = emcCommand->type;
3514+
emcStatus->task.command_type = emcCommand->_type;
35153515
emcStatus->task.echo_serial_number = emcCommand->serial_number;
35163516

35173517
// do top level
3518-
emcStatus->command_type = emcCommand->type;
3518+
emcStatus->command_type = emcCommand->_type;
35193519
emcStatus->echo_serial_number = emcCommand->serial_number;
35203520

35213521
if (taskPlanError || taskExecuteError ||

‎src/libnml/nml/cmd_msg.hh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ class RCS_CMD_CHANNEL:public NML {
3030
RCS_CMD_CHANNEL(NML_FORMAT_PTR, const char *, const char *, const char *,
3131
int set_to_server = 0);
3232
~RCS_CMD_CHANNEL();
33+
// Sub-class calls base-class
34+
// cppcheck-suppress duplInheritedMember
3335
RCS_CMD_MSG *get_address() {
3436
return ((RCS_CMD_MSG *) NML::get_address());
3537
};

‎src/libnml/nml/nml.cc‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1045,13 +1045,13 @@ NMLTYPE NML::read()
10451045
case CMS_READ_OLD:
10461046
return (0);
10471047
case CMS_READ_OK:
1048-
if (((NMLmsg *) cms->subdiv_data)->type <= 0 && !cms->isserver) {
1048+
if (((NMLmsg *) cms->subdiv_data)->_type <= 0 && !cms->isserver) {
10491049
rcs_print_error
10501050
("NML: New data received but type of %d is invalid.\n",
1051-
(int)((NMLmsg *) cms->subdiv_data)->type);
1051+
(int)((NMLmsg *) cms->subdiv_data)->_type);
10521052
return -1;
10531053
}
1054-
return (((NMLmsg *) cms->subdiv_data)->type);
1054+
return (((NMLmsg *) cms->subdiv_data)->_type);
10551055

10561056
default:
10571057
set_error();
@@ -1098,13 +1098,13 @@ NMLTYPE NML::read()
10981098
return (0);
10991099
case CMS_READ_OK:
11001100
error_type = NML_NO_ERROR;
1101-
if (((NMLmsg *) cms->subdiv_data)->type <= 0 && !cms->isserver) {
1101+
if (((NMLmsg *) cms->subdiv_data)->_type <= 0 && !cms->isserver) {
11021102
rcs_print_error
11031103
("NML: New data received but type of %d is invalid.\n",
1104-
(int)((NMLmsg *) cms->subdiv_data)->type);
1104+
(int)((NMLmsg *) cms->subdiv_data)->_type);
11051105
return -1;
11061106
}
1107-
return (((NMLmsg *) cms->subdiv_data)->type);
1107+
return (((NMLmsg *) cms->subdiv_data)->_type);
11081108

11091109
default:
11101110
set_error();
@@ -1138,13 +1138,13 @@ NMLTYPE NML::blocking_read(double blocking_timeout)
11381138
case CMS_READ_OLD:
11391139
return (0);
11401140
case CMS_READ_OK:
1141-
if (((NMLmsg *) cms->subdiv_data)->type <= 0 && !cms->isserver) {
1141+
if (((NMLmsg *) cms->subdiv_data)->_type <= 0 && !cms->isserver) {
11421142
rcs_print_error
11431143
("NML: New data received but type of %d is invalid.\n",
1144-
(int)((NMLmsg *) cms->subdiv_data)->type);
1144+
(int)((NMLmsg *) cms->subdiv_data)->_type);
11451145
return -1;
11461146
}
1147-
return (((NMLmsg *) cms->subdiv_data)->type);
1147+
return (((NMLmsg *) cms->subdiv_data)->_type);
11481148
case CMS_TIMED_OUT:
11491149
error_type = NML_NO_ERROR;
11501150
return 0;
@@ -1220,13 +1220,13 @@ NMLTYPE NML::blocking_read(double blocking_timeout)
12201220
case CMS_READ_OLD:
12211221
return (0);
12221222
case CMS_READ_OK:
1223-
if (((NMLmsg *) cms->subdiv_data)->type <= 0 && !cms->isserver) {
1223+
if (((NMLmsg *) cms->subdiv_data)->_type <= 0 && !cms->isserver) {
12241224
rcs_print_error
12251225
("NML: New data received but type of %d is invalid.\n",
1226-
(int)((NMLmsg *) cms->subdiv_data)->type);
1226+
(int)((NMLmsg *) cms->subdiv_data)->_type);
12271227
return -1;
12281228
}
1229-
return (((NMLmsg *) cms->subdiv_data)->type);
1229+
return (((NMLmsg *) cms->subdiv_data)->_type);
12301230
case CMS_TIMED_OUT:
12311231
error_type = NML_NO_ERROR;
12321232
return 0;
@@ -1322,13 +1322,13 @@ NMLTYPE NML::peek()
13221322
case CMS_READ_OLD:
13231323
return (0);
13241324
case CMS_READ_OK:
1325-
if (((NMLmsg *) cms->subdiv_data)->type <= 0 && !cms->isserver) {
1325+
if (((NMLmsg *) cms->subdiv_data)->_type <= 0 && !cms->isserver) {
13261326
rcs_print_error
13271327
("NML: New data received but type of %d is invalid.\n",
1328-
(int)((NMLmsg *) cms->subdiv_data)->type);
1328+
(int)((NMLmsg *) cms->subdiv_data)->_type);
13291329
return -1;
13301330
}
1331-
return (((NMLmsg *) cms->subdiv_data)->type);
1331+
return (((NMLmsg *) cms->subdiv_data)->_type);
13321332

13331333
default:
13341334
set_error();
@@ -1368,13 +1368,13 @@ NMLTYPE NML::peek()
13681368
case CMS_READ_OLD:
13691369
return (0);
13701370
case CMS_READ_OK:
1371-
if (((NMLmsg *) cms->subdiv_data)->type <= 0 && !cms->isserver) {
1371+
if (((NMLmsg *) cms->subdiv_data)->_type <= 0 && !cms->isserver) {
13721372
rcs_print_error
13731373
("NML: New data received but type of %d is invalid.\n",
1374-
(int)((NMLmsg *) cms->subdiv_data)->type);
1374+
(int)((NMLmsg *) cms->subdiv_data)->_type);
13751375
return -1;
13761376
}
1377-
return (((NMLmsg *) cms->subdiv_data)->type);
1377+
return (((NMLmsg *) cms->subdiv_data)->_type);
13781378

13791379
default:
13801380
set_error();
@@ -1444,7 +1444,7 @@ int NML::format_output()
14441444
if (forced_type > 0) {
14451445
new_type = forced_type;
14461446
}
1447-
((NMLmsg *) cms->subdiv_data)->type = new_type; /* Store type
1447+
((NMLmsg *) cms->subdiv_data)->_type = new_type; /* Store type
14481448
in
14491449
message. */
14501450
((NMLmsg *) cms->subdiv_data)->size = new_size; /* Store size
@@ -1492,12 +1492,12 @@ int NML::format_output()
14921492
cms->rewind(); /* Move to the start of the encoded buffer. */
14931493

14941494
/* Get the type and size from the message. */
1495-
new_type = ((NMLmsg *) cms->subdiv_data)->type;
1495+
new_type = ((NMLmsg *) cms->subdiv_data)->_type;
14961496
new_size = ((NMLmsg *) cms->subdiv_data)->size;
14971497

14981498
if (forced_type > 0) {
14991499
new_type = forced_type;
1500-
((NMLmsg *) cms->subdiv_data)->type = forced_type;
1500+
((NMLmsg *) cms->subdiv_data)->_type = forced_type;
15011501
}
15021502

15031503
/* Store the type and size in the encoded buffer. */
@@ -1549,7 +1549,7 @@ int NML::format_output()
15491549
return (-1);
15501550
}
15511551
if (forced_type > 0) {
1552-
((NMLmsg *) cms->subdiv_data)->type = forced_type;
1552+
((NMLmsg *) cms->subdiv_data)->_type = forced_type;
15531553
}
15541554

15551555
return (((int) cms->status < 0) ? -1 : 0);
@@ -1606,7 +1606,7 @@ int NML::write(NMLmsg * nml_msg, int *serial_number)
16061606
return (-1);
16071607
}
16081608

1609-
if ((nml_msg->size == 0 || nml_msg->type == 0) && !cms->isserver) {
1609+
if ((nml_msg->size == 0 || nml_msg->_type == 0) && !cms->isserver) {
16101610
error_type = NML_INVALID_MESSAGE_ERROR;
16111611
rcs_print_error("NML::write: Message size or type is zero.\n");
16121612
rcs_print_error
@@ -1770,7 +1770,7 @@ int NML::write_if_read(NMLmsg * nml_msg, int *serial_number)
17701770
return (-1);
17711771
}
17721772

1773-
if ((nml_msg->size == 0 || nml_msg->type == 0) && !cms->isserver) {
1773+
if ((nml_msg->size == 0 || nml_msg->_type == 0) && !cms->isserver) {
17741774
error_type = NML_INVALID_MESSAGE_ERROR;
17751775
rcs_print_error
17761776
("NML::write_if_read: Message size or type is zero.\n");
@@ -1866,7 +1866,7 @@ int NML::format_input(NMLmsg * nml_msg)
18661866
cms->format_high_ptr = cms->format_low_ptr + nml_msg->size;
18671867
/* Handle the generic part of the message. */
18681868
cms->rewind(); /* Move to the start of the encoded buffer. */
1869-
cms->update(nml_msg->type); /* Store message type in encoded
1869+
cms->update(nml_msg->_type); /* Store message type in encoded
18701870
buffer. */
18711871
cms->update(nml_msg->size); /* Store message size in encoded
18721872
buffer. */
@@ -1879,7 +1879,7 @@ int NML::format_input(NMLmsg * nml_msg)
18791879
}
18801880

18811881
/* Run through list of format functions. */
1882-
if (-1 == run_format_chain(nml_msg->type, nml_msg)) {
1882+
if (-1 == run_format_chain(nml_msg->_type, nml_msg)) {
18831883
rcs_print_error("NMLwrite: format error\n");
18841884
if (verbose_nml_error_messages) {
18851885
rcs_print_error(" (Buffer = %s, Process = %s)\n",
@@ -1908,7 +1908,7 @@ int NML::format_input(NMLmsg * nml_msg)
19081908
cms->format_high_ptr = cms->format_low_ptr + cms->size;
19091909

19101910
/* Store the new type and size in the raw message. */
1911-
((NMLmsg *) cms->subdiv_data)->type = new_type;
1911+
((NMLmsg *) cms->subdiv_data)->_type = new_type;
19121912
((NMLmsg *) cms->subdiv_data)->size = new_size;
19131913

19141914
/* Check the list of format functions. */
@@ -2075,7 +2075,7 @@ NMLTYPE NML::str2msg(const char *string)
20752075
return (0);
20762076
case CMS_READ_OK:
20772077
error_type = NML_NO_ERROR;
2078-
return (((NMLmsg *) cms->subdiv_data)->type);
2078+
return (((NMLmsg *) cms->subdiv_data)->_type);
20792079
case CMS_TIMED_OUT:
20802080
error_type = NML_TIMED_OUT;
20812081
return -1;

0 commit comments

Comments
 (0)