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

Replace dbgrep by dbglob, leaving dbgrep as an alias

Browse Source
This commit is contained in:
Simon Rose
2025-04-04 14:44:35 +01:00
committed by Andrew Johnson
parent 43afae523e
commit f3c72ea38e
3 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/database/src/ioc/db/dbIocRegister.c
+16 -7
View File
@@ -233,18 +233,26 @@ static const iocshFuncDef dblaFuncDef = {"dbla",1,dblaArgs,
"Example: dbla(\"alia*\")\n"};
static void dblaCallFunc(const iocshArgBuf *args) { iocshSetError(dbla(args[0].sval));}
/* dbglob */
static const iocshArg dbglobArg0 = { "pattern",iocshArgStringRecord};
static const iocshArg dbglobArg1 = { "fields",iocshArgString};
static const iocshArg * const dbglobArgs[2] = {&dbglobArg0,&dbglobArg1};
static const iocshFuncDef dbglobFuncDef = {"dbglob",2,dbglobArgs,
"List record names matching pattern and optionally print field values. \n"
"The pattern can contain any characters that are legal in record names as well as:\n"
" - \"?\", which matches 0 or one characters.\n"
" - \"*\", which matches 0 or more characters.\n\n"
"Example: dbglob(\"*gpibAi*\")\n"
" dbglob(\"*gpibAi*\",\"VAL DESC\")\n"};
static void dbglobCallFunc(const iocshArgBuf *args) { iocshSetError(dbglob(args[0].sval,args[1].sval));}
/* dbgrep */
static const iocshArg dbgrepArg0 = { "pattern",iocshArgStringRecord};
static const iocshArg dbgrepArg1 = { "fields",iocshArgString};
static const iocshArg * const dbgrepArgs[2] = {&dbgrepArg0,&dbgrepArg1};
static const iocshFuncDef dbgrepFuncDef = {"dbgrep",2,dbgrepArgs,
"List record names matching pattern and optionally print field values. \n"
"The pattern can contain any characters that are legal in record names as well as:\n"
" - \"?\", which matches 0 or one characters.\n"
" - \"*\", which matches 0 or more characters.\n\n"
"Example: dbgrep(\"*gpibAi*\")\n"
" dbgrep(\"*gpibAi*\",\"VAL DESC\")\n"};
static void dbgrepCallFunc(const iocshArgBuf *args) { iocshSetError(dbgrep(args[0].sval,args[1].sval));}
"See dbglob.\n"};
static void dbgrepCallFunc(const iocshArgBuf *args) { iocshSetError(dbglob(args[0].sval,args[1].sval));}
/* dbgf */
static const iocshArg dbgfArg0 = { "record name",iocshArgStringRecord};
@@ -600,6 +608,7 @@ void dbIocRegister(void)
iocshRegister(&dbnrFuncDef,dbnrCallFunc);
iocshRegister(&dblaFuncDef,dblaCallFunc);
iocshRegister(&dbliFuncDef,dbliCallFunc);
iocshRegister(&dbglobFuncDef,dbglobCallFunc);
iocshRegister(&dbgrepFuncDef,dbgrepCallFunc);
iocshRegister(&dbgfFuncDef,dbgfCallFunc);
iocshRegister(&dbpfFuncDef,dbpfCallFunc);
modules/database/src/ioc/db/dbTest.c
+7 -3
View File
@@ -295,7 +295,7 @@ long dbli(const char *pattern)
return 0;
}
long dbgrep(const char *pmask,const char *fields)
long dbglob(const char *pmask,const char *fields)
{
DBENTRY dbentry;
DBENTRY *pdbentry = &dbentry;
@@ -305,7 +305,7 @@ long dbgrep(const char *pmask,const char *fields)
char **papfields = 0;
if (!pmask || !*pmask) {
printf("Usage: dbgrep \"pattern\" \"fields\"\n");
printf("Usage: dbglob \"pattern\" \"fields\"\n");
return 1;
}
@@ -340,7 +340,11 @@ long dbgrep(const char *pmask,const char *fields)
dbFinishEntry(pdbentry);
return 0;
}
long dbgrep(const char *pname, const char *fields) {
return dbglob(pname, fields);
}
long dbgf(const char *pname)
{
/* declare buffer long just to ensure correct alignment */
modules/database/src/ioc/db/dbTest.h
+2
View File
@@ -29,6 +29,8 @@ DBCORE_API long dbla(const char *pmask);
/* list infos */
DBCORE_API long dbli(const char *patern);
/*list records with mask*/
DBCORE_API long dbglob(const char *pmask,const char *fields);
/*list records with mask; alias for dbglob*/
DBCORE_API long dbgrep(const char *pmask,const char *fields);
/*get field value*/
DBCORE_API long dbgf(const char *pname);