Skip to content

Commit 8b0c257

Browse files
BsAtHomeBsAtHome
committed
Mark duplicate inherited methods update() and get_address() as fine.
Rename duplicate inherited members in base-class prefixing with '_'.
1 parent cb18af7 commit 8b0c257

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
@@ -1051,13 +1051,13 @@ NMLTYPE NML::read()
10511051
case CMS_READ_OLD:
10521052
return (0);
10531053
case CMS_READ_OK:
1054-
if (((NMLmsg *) cms->subdiv_data)->type <= 0 && !cms->isserver) {
1054+
if (((NMLmsg *) cms->subdiv_data)->_type <= 0 && !cms->isserver) {
10551055
rcs_print_error
10561056
("NML: New data received but type of %d is invalid.\n",
1057-
(int)((NMLmsg *) cms->subdiv_data)->type);
1057+
(int)((NMLmsg *) cms->subdiv_data)->_type);
10581058
return -1;
10591059
}
1060-
return (((NMLmsg *) cms->subdiv_data)->type);
1060+
return (((NMLmsg *) cms->subdiv_data)->_type);
10611061

10621062
default:
10631063
set_error();
@@ -1104,13 +1104,13 @@ NMLTYPE NML::read()
11041104
return (0);
11051105
case CMS_READ_OK:
11061106
error_type = NML_NO_ERROR;
1107-
if (((NMLmsg *) cms->subdiv_data)->type <= 0 && !cms->isserver) {
1107+
if (((NMLmsg *) cms->subdiv_data)->_type <= 0 && !cms->isserver) {
11081108
rcs_print_error
11091109
("NML: New data received but type of %d is invalid.\n",
1110-
(int)((NMLmsg *) cms->subdiv_data)->type);
1110+
(int)((NMLmsg *) cms->subdiv_data)->_type);
11111111
return -1;
11121112
}
1113-
return (((NMLmsg *) cms->subdiv_data)->type);
1113+
return (((NMLmsg *) cms->subdiv_data)->_type);
11141114

11151115
default:
11161116
set_error();
@@ -1144,13 +1144,13 @@ NMLTYPE NML::blocking_read(double blocking_timeout)
11441144
case CMS_READ_OLD:
11451145
return (0);
11461146
case CMS_READ_OK:
1147-
if (((NMLmsg *) cms->subdiv_data)->type <= 0 && !cms->isserver) {
1147+
if (((NMLmsg *) cms->subdiv_data)->_type <= 0 && !cms->isserver) {
11481148
rcs_print_error
11491149
("NML: New data received but type of %d is invalid.\n",
1150-
(int)((NMLmsg *) cms->subdiv_data)->type);
1150+
(int)((NMLmsg *) cms->subdiv_data)->_type);
11511151
return -1;
11521152
}
1153-
return (((NMLmsg *) cms->subdiv_data)->type);
1153+
return (((NMLmsg *) cms->subdiv_data)->_type);
11541154
case CMS_TIMED_OUT:
11551155
error_type = NML_NO_ERROR;
11561156
return 0;
@@ -1226,13 +1226,13 @@ NMLTYPE NML::blocking_read(double blocking_timeout)
12261226
case CMS_READ_OLD:
12271227
return (0);
12281228
case CMS_READ_OK:
1229-
if (((NMLmsg *) cms->subdiv_data)->type <= 0 && !cms->isserver) {
1229+
if (((NMLmsg *) cms->subdiv_data)->_type <= 0 && !cms->isserver) {
12301230
rcs_print_error
12311231
("NML: New data received but type of %d is invalid.\n",
1232-
(int)((NMLmsg *) cms->subdiv_data)->type);
1232+
(int)((NMLmsg *) cms->subdiv_data)->_type);
12331233
return -1;
12341234
}
1235-
return (((NMLmsg *) cms->subdiv_data)->type);
1235+
return (((NMLmsg *) cms->subdiv_data)->_type);
12361236
case CMS_TIMED_OUT:
12371237
error_type = NML_NO_ERROR;
12381238
return 0;
@@ -1328,13 +1328,13 @@ NMLTYPE NML::peek()
13281328
case CMS_READ_OLD:
13291329
return (0);
13301330
case CMS_READ_OK:
1331-
if (((NMLmsg *) cms->subdiv_data)->type <= 0 && !cms->isserver) {
1331+
if (((NMLmsg *) cms->subdiv_data)->_type <= 0 && !cms->isserver) {
13321332
rcs_print_error
13331333
("NML: New data received but type of %d is invalid.\n",
1334-
(int)((NMLmsg *) cms->subdiv_data)->type);
1334+
(int)((NMLmsg *) cms->subdiv_data)->_type);
13351335
return -1;
13361336
}
1337-
return (((NMLmsg *) cms->subdiv_data)->type);
1337+
return (((NMLmsg *) cms->subdiv_data)->_type);
13381338

13391339
default:
13401340
set_error();
@@ -1374,13 +1374,13 @@ NMLTYPE NML::peek()
13741374
case CMS_READ_OLD:
13751375
return (0);
13761376
case CMS_READ_OK:
1377-
if (((NMLmsg *) cms->subdiv_data)->type <= 0 && !cms->isserver) {
1377+
if (((NMLmsg *) cms->subdiv_data)->_type <= 0 && !cms->isserver) {
13781378
rcs_print_error
13791379
("NML: New data received but type of %d is invalid.\n",
1380-
(int)((NMLmsg *) cms->subdiv_data)->type);
1380+
(int)((NMLmsg *) cms->subdiv_data)->_type);
13811381
return -1;
13821382
}
1383-
return (((NMLmsg *) cms->subdiv_data)->type);
1383+
return (((NMLmsg *) cms->subdiv_data)->_type);
13841384

13851385
default:
13861386
set_error();
@@ -1450,7 +1450,7 @@ int NML::format_output()
14501450
if (forced_type > 0) {
14511451
new_type = forced_type;
14521452
}
1453-
((NMLmsg *) cms->subdiv_data)->type = new_type; /* Store type
1453+
((NMLmsg *) cms->subdiv_data)->_type = new_type; /* Store type
14541454
in
14551455
message. */
14561456
((NMLmsg *) cms->subdiv_data)->size = new_size; /* Store size
@@ -1498,12 +1498,12 @@ int NML::format_output()
14981498
cms->rewind(); /* Move to the start of the encoded buffer. */
14991499

15001500
/* Get the type and size from the message. */
1501-
new_type = ((NMLmsg *) cms->subdiv_data)->type;
1501+
new_type = ((NMLmsg *) cms->subdiv_data)->_type;
15021502
new_size = ((NMLmsg *) cms->subdiv_data)->size;
15031503

15041504
if (forced_type > 0) {
15051505
new_type = forced_type;
1506-
((NMLmsg *) cms->subdiv_data)->type = forced_type;
1506+
((NMLmsg *) cms->subdiv_data)->_type = forced_type;
15071507
}
15081508

15091509
/* Store the type and size in the encoded buffer. */
@@ -1555,7 +1555,7 @@ int NML::format_output()
15551555
return (-1);
15561556
}
15571557
if (forced_type > 0) {
1558-
((NMLmsg *) cms->subdiv_data)->type = forced_type;
1558+
((NMLmsg *) cms->subdiv_data)->_type = forced_type;
15591559
}
15601560

15611561
return (((int) cms->status < 0) ? -1 : 0);
@@ -1612,7 +1612,7 @@ int NML::write(NMLmsg * nml_msg, int *serial_number)
16121612
return (-1);
16131613
}
16141614

1615-
if ((nml_msg->size == 0 || nml_msg->type == 0) && !cms->isserver) {
1615+
if ((nml_msg->size == 0 || nml_msg->_type == 0) && !cms->isserver) {
16161616
error_type = NML_INVALID_MESSAGE_ERROR;
16171617
rcs_print_error("NML::write: Message size or type is zero.\n");
16181618
rcs_print_error
@@ -1776,7 +1776,7 @@ int NML::write_if_read(NMLmsg * nml_msg, int *serial_number)
17761776
return (-1);
17771777
}
17781778

1779-
if ((nml_msg->size == 0 || nml_msg->type == 0) && !cms->isserver) {
1779+
if ((nml_msg->size == 0 || nml_msg->_type == 0) && !cms->isserver) {
17801780
error_type = NML_INVALID_MESSAGE_ERROR;
17811781
rcs_print_error
17821782
("NML::write_if_read: Message size or type is zero.\n");
@@ -1872,7 +1872,7 @@ int NML::format_input(NMLmsg * nml_msg)
18721872
cms->format_high_ptr = cms->format_low_ptr + nml_msg->size;
18731873
/* Handle the generic part of the message. */
18741874
cms->rewind(); /* Move to the start of the encoded buffer. */
1875-
cms->update(nml_msg->type); /* Store message type in encoded
1875+
cms->update(nml_msg->_type); /* Store message type in encoded
18761876
buffer. */
18771877
cms->update(nml_msg->size); /* Store message size in encoded
18781878
buffer. */
@@ -1885,7 +1885,7 @@ int NML::format_input(NMLmsg * nml_msg)
18851885
}
18861886

18871887
/* Run through list of format functions. */
1888-
if (-1 == run_format_chain(nml_msg->type, nml_msg)) {
1888+
if (-1 == run_format_chain(nml_msg->_type, nml_msg)) {
18891889
rcs_print_error("NMLwrite: format error\n");
18901890
if (verbose_nml_error_messages) {
18911891
rcs_print_error(" (Buffer = %s, Process = %s)\n",
@@ -1914,7 +1914,7 @@ int NML::format_input(NMLmsg * nml_msg)
19141914
cms->format_high_ptr = cms->format_low_ptr + cms->size;
19151915

19161916
/* Store the new type and size in the raw message. */
1917-
((NMLmsg *) cms->subdiv_data)->type = new_type;
1917+
((NMLmsg *) cms->subdiv_data)->_type = new_type;
19181918
((NMLmsg *) cms->subdiv_data)->size = new_size;
19191919

19201920
/* Check the list of format functions. */
@@ -2081,7 +2081,7 @@ NMLTYPE NML::str2msg(const char *string)
20812081
return (0);
20822082
case CMS_READ_OK:
20832083
error_type = NML_NO_ERROR;
2084-
return (((NMLmsg *) cms->subdiv_data)->type);
2084+
return (((NMLmsg *) cms->subdiv_data)->_type);
20852085
case CMS_TIMED_OUT:
20862086
error_type = NML_TIMED_OUT;
20872087
return -1;

0 commit comments

Comments
 (0)