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

code streamlined

Browse Source
This commit is contained in:
zimoch
2021-04-16 19:17:50 +02:00
parent 9926fe3036
commit be78b33570
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1126,27 +1126,26 @@ static void varHandler(const iocshVarDef *v, const char *setString)
static void varCallFunc(const iocshArgBuf *args)
{
struct iocshVariable *v;
if(args[0].sval == NULL) {
for (v = iocshVariableHead ; v != NULL ; v = v->next)
varHandler(v->pVarDef, args[1].sval);
}
else if(args[1].sval == NULL) {
const char *name = args[0].sval;
const char *value = args[1].sval;
if (!value) {
int found = 0;
for (v = iocshVariableHead ; v != NULL ; v = v->next)
if (epicsStrGlobMatch(v->pVarDef->name, args[0].sval) != 0) {
if (!name || epicsStrGlobMatch(v->pVarDef->name, name) != 0) {
varHandler(v->pVarDef, NULL);
found = 1;
}
if (!found)
fprintf(epicsGetStderr(), "No var matching %s found.\n", args[0].sval);
if (!found && name != NULL)
fprintf(epicsGetStderr(), "No var matching %s found.\n", name);
}
else {
v = (iocshVariable *)registryFind(iocshVarID, args[0].sval);
if (v == NULL) {
fprintf(epicsGetStderr(), "Var %s not found.\n", args[0].sval);
fprintf(epicsGetStderr(), "Var %s not found.\n", name);
}
else {
varHandler(v->pVarDef, args[1].sval);
varHandler(v->pVarDef, value);
}
}
}