epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

dbGetInfoPointer should return void*, not const char*

Browse Source 
Short-circuit return in dbGetInfo if no item
This commit is contained in:
Andrew Johnson
2003-07-18 14:58:40 +00:00
parent 6661789143
commit e13dafb8af
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/dbStatic/dbStaticLib.c
View File

@@ -2633,7 +2633,7 @@ long epicsShareAPI dbPutInfoPointer(DBENTRY *pdbentry, void *pointer)
return (0);
}
const char * epicsShareAPI dbGetInfoPointer(DBENTRY *pdbentry)
void * epicsShareAPI dbGetInfoPointer(DBENTRY *pdbentry)
{
dbInfoNode *pinfo = pdbentry->pinfonode;
if (!pinfo) return (NULL);
@@ -2642,8 +2642,8 @@ const char * epicsShareAPI dbGetInfoPointer(DBENTRY *pdbentry)
const char * epicsShareAPI dbGetInfo(DBENTRY *pdbentry,const char *name)
{
dbFindInfo(pdbentry, name);
return (dbGetInfoString(pdbentry));
if (dbFindInfo(pdbentry, name)) return NULL;
return dbGetInfoString(pdbentry);
}
long epicsShareAPI dbPutInfo(DBENTRY *pdbentry,const char *name,const char *string)

2
src/dbStatic/dbStaticLib.h
View File

@@ -166,7 +166,7 @@ epicsShareFunc long epicsShareAPI dbPutInfoString(
DBENTRY *pdbentry,const char *string);
epicsShareFunc long epicsShareAPI dbPutInfoPointer(
DBENTRY *pdbentry, void *pointer);
epicsShareFunc const char * epicsShareAPI dbGetInfoPointer(DBENTRY *pdbentry);
epicsShareFunc void * epicsShareAPI dbGetInfoPointer(DBENTRY *pdbentry);
epicsShareFunc const char * epicsShareAPI dbGetInfo(
DBENTRY *pdbentry,const char *name);
epicsShareFunc long epicsShareAPI dbPutInfo(