libCom: iocshRegisterVariable() only warn on actual redefinition

Avoid noise if simply called twice.
2018-11-04 11:39:14 -08:00
parent 00d937cc02
commit ebe7cf046e
1 changed files with 5 additions and 3 deletions
--- a/modules/libcom/src/iocsh/iocsh.cpp
+++ b/modules/libcom/src/iocsh/iocsh.cpp
@@ -178,9 +178,11 @@ void epicsShareAPI 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) {
-                errlogPrintf("Warning: iocshRegisterVariable redefining %s.\n",
-                    piocshVarDef->name);
-                p->pVarDef = piocshVarDef;
+                if (p->pVarDef != piocshVarDef) {
+                    errlogPrintf("Warning: iocshRegisterVariable redefining %s.\n",
+                        piocshVarDef->name);
+                    p->pVarDef = piocshVarDef;
+                }
                found = 1;
                break;
            }