From c43b60c6ef635c67c5ae7c1c5db994a29be025ac Mon Sep 17 00:00:00 2001 From: Marty Kraimer Date: Thu, 15 Jul 2004 12:03:41 +0000 Subject: [PATCH] allow null string or * --- src/db/dbCaTest.c | 4 ++-- src/db/dbLock.c | 2 ++ src/db/dbTest.c | 5 +++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/db/dbCaTest.c b/src/db/dbCaTest.c index ff11dba19..70faeddbc 100644 --- a/src/db/dbCaTest.c +++ b/src/db/dbCaTest.c @@ -67,8 +67,8 @@ long epicsShareAPI dbcar(char *precordname,int level) caLink *pca; int j; - - if(precordname && *precordname==0) precordname=0; + if (precordname && ((*precordname == '\0') || !strcmp(precordname,"*"))) + precordname = NULL; dbInitEntry(pdbbase,pdbentry); status = dbFirstRecordType(pdbentry); while(!status) { diff --git a/src/db/dbLock.c b/src/db/dbLock.c index 47f6be68d..a6d9f5356 100644 --- a/src/db/dbLock.c +++ b/src/db/dbLock.c @@ -486,6 +486,8 @@ long epicsShareAPI dblsr(char *recordname,int level) printf("globalLock %p\n",globalLock); printf("lockSetModifyLock %p\n",lockSetModifyLock); + if (recordname && ((*recordname == '\0') || !strcmp(recordname,"*"))) + recordname = NULL; if(recordname) { dbInitEntry(pdbbase,pdbentry); status = dbFindRecord(pdbentry,recordname); diff --git a/src/db/dbTest.c b/src/db/dbTest.c index 764122388..46ae86896 100644 --- a/src/db/dbTest.c +++ b/src/db/dbTest.c @@ -100,6 +100,9 @@ long epicsShareAPI dbl( char *fieldnames = 0; char **papfields = 0; + if(precordTypename + && ((*precordTypename == '\0') || !strcmp(precordTypename,"*"))) + precordTypename = NULL; if (fields && (*fields == '\0')) fields = NULL; if(fields) { @@ -673,6 +676,8 @@ long epicsShareAPI dbior(const char *pdrvName,int interest_level) fprintf(stderr,"no database has been loaded\n"); return(0); } + if(pdrvName && ((*pdrvName == '\0') || !strcmp(pdrvName,"*"))) + pdrvName = NULL; for(pdrvSup = (drvSup *)ellFirst(&pdbbase->drvList); pdrvSup; pdrvSup = (drvSup *)ellNext(&pdrvSup->node)) { pname = pdrvSup->name;