epics/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

iocshRegisterVariable() avoid spurious redefinition warning

Browse Source 
Compare the contents, not the container.
This commit is contained in:
Michael Davidsaver
2020-06-15 11:04:59 -07:00
parent 2c389a90d1
commit 9e3d5d52ab
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/libcom/src/iocsh/iocsh.cpp
View File

@@ -181,7 +181,7 @@ void epicsStdCall iocshRegisterVariable (const iocshVarDef *piocshVarDef)
for (l = NULL, p = iocshVariableHead ; p != NULL ; l = p, p = p->next) {
i = strcmp (piocshVarDef->name, p->pVarDef->name);
if (i == 0) {
if (p->pVarDef != piocshVarDef) {
if ((p->pVarDef->type != piocshVarDef->type) && (p->pVarDef->pval != piocshVarDef->pval)) {
errlogPrintf("Warning: iocshRegisterVariable redefining %s.\n",
piocshVarDef->name);
p->pVarDef = piocshVarDef;