From b8d0d978271a841a08253aa50794c31f44849fb9 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Sun, 15 Jul 2012 16:08:50 -0500 Subject: [PATCH] Removed all epicsShareAPI attributes from src/ioc. There were none at all in src/std. --- src/ioc/as/asCa.c | 10 +- src/ioc/as/asCa.h | 10 +- src/ioc/as/asDbLib.c | 34 ++-- src/ioc/as/asDbLib.h | 34 ++-- src/ioc/as/asIocRegister.c | 2 +- src/ioc/as/asIocRegister.h | 2 +- src/ioc/bpt/cvtTable.h | 4 +- src/ioc/db/cvtBpt.c | 4 +- src/ioc/db/dbAccess.c | 38 ++-- src/ioc/db/dbAccessDefs.h | 38 ++-- src/ioc/db/dbBkpt.c | 22 +-- src/ioc/db/dbBkpt.h | 22 +-- src/ioc/db/dbEvent.c | 40 ++-- src/ioc/db/dbEvent.h | 40 ++-- src/ioc/db/dbIocRegister.c | 2 +- src/ioc/db/dbIocRegister.h | 2 +- src/ioc/db/dbLock.c | 24 +-- src/ioc/db/dbLock.h | 24 +-- src/ioc/db/dbNotify.c | 14 +- src/ioc/db/dbNotify.h | 16 +- src/ioc/db/dbTest.c | 26 +-- src/ioc/db/dbTest.h | 26 +-- src/ioc/db/db_access.c | 4 +- src/ioc/db/db_access_routines.h | 2 +- src/ioc/db/db_test.c | 4 +- src/ioc/db/db_test.h | 6 +- src/ioc/db/recGbl.c | 24 +-- src/ioc/dbStatic/dbLexRoutines.c | 4 +- src/ioc/dbStatic/dbPvdLib.c | 2 +- src/ioc/dbStatic/dbStaticIocRegister.c | 2 +- src/ioc/dbStatic/dbStaticIocRegister.h | 2 +- src/ioc/dbStatic/dbStaticLib.c | 222 +++++++++++----------- src/ioc/dbStatic/dbStaticLib.h | 230 +++++++++++------------ src/ioc/dbStatic/dbStaticNoRun.c | 6 +- src/ioc/dbStatic/dbStaticRun.c | 6 +- src/ioc/dbtemplate/dbLoadTemplate.h | 2 +- src/ioc/dbtemplate/dbLoadTemplate.y | 2 +- src/ioc/dbtemplate/dbtoolsIocRegister.c | 2 +- src/ioc/dbtemplate/dbtoolsIocRegister.h | 2 +- src/ioc/misc/epicsRelease.c | 2 +- src/ioc/misc/epicsRelease.h | 2 +- src/ioc/misc/iocshRegisterCommon.c | 2 +- src/ioc/misc/iocshRegisterCommon.h | 2 +- src/ioc/misc/miscIocRegister.c | 2 +- src/ioc/misc/miscIocRegister.h | 2 +- src/ioc/registry/registryCommon.c | 6 +- src/ioc/registry/registryCommon.h | 6 +- src/ioc/registry/registryDeviceSupport.c | 4 +- src/ioc/registry/registryDeviceSupport.h | 4 +- src/ioc/registry/registryDriverSupport.c | 4 +- src/ioc/registry/registryDriverSupport.h | 4 +- src/ioc/registry/registryFunction.c | 6 +- src/ioc/registry/registryFunction.h | 6 +- src/ioc/registry/registryIocRegister.c | 2 +- src/ioc/registry/registryIocRegister.h | 2 +- src/ioc/registry/registryRecordType.c | 4 +- src/ioc/registry/registryRecordType.h | 4 +- src/ioc/rsrv/camsgtask.c | 4 +- src/ioc/rsrv/caservertask.c | 2 +- src/ioc/rsrv/rsrv.h | 6 +- src/ioc/rsrv/rsrvIocRegister.c | 2 +- src/ioc/rsrv/rsrvIocRegister.h | 2 +- 62 files changed, 518 insertions(+), 518 deletions(-) diff --git a/src/ioc/as/asCa.c b/src/ioc/as/asCa.c index fd6ba8c7e..4db25c395 100644 --- a/src/ioc/as/asCa.c +++ b/src/ioc/as/asCa.c @@ -225,7 +225,7 @@ static void asCaTask(void) } } -void epicsShareAPI asCaStart(void) +void asCaStart(void) { if(asCaDebug) printf("asCaStart called\n"); if(firstTime) { @@ -249,7 +249,7 @@ void epicsShareAPI asCaStart(void) epicsMutexUnlock(asCaTaskLock); } -void epicsShareAPI asCaStop(void) +void asCaStop(void) { if(threadid==0) return; if(asCaDebug) printf("asCaStop called\n"); @@ -260,9 +260,9 @@ void epicsShareAPI asCaStop(void) epicsMutexUnlock(asCaTaskLock); } -int epicsShareAPI ascar(int level) { return ascarFP(stdout,level);} +int ascar(int level) { return ascarFP(stdout,level);} -int epicsShareAPI ascarFP(FILE *fp,int level) +int ascarFP(FILE *fp,int level) { ASG *pasg; int n=0,nbad=0; @@ -303,7 +303,7 @@ int epicsShareAPI ascarFP(FILE *fp,int level) return(0); } -void epicsShareAPI ascaStats(int *pchans, int *pdiscon) +void ascaStats(int *pchans, int *pdiscon) { ASG *pasg; int n = 0; diff --git a/src/ioc/as/asCa.h b/src/ioc/as/asCa.h index efc5ccbb5..360296fe2 100644 --- a/src/ioc/as/asCa.h +++ b/src/ioc/as/asCa.h @@ -17,11 +17,11 @@ extern "C" { #endif -epicsShareFunc void epicsShareAPI asCaStart(void); -epicsShareFunc void epicsShareAPI asCaStop(void); -epicsShareFunc int epicsShareAPI ascar(int level); -epicsShareFunc int epicsShareAPI ascarFP(FILE *fp, int level); -epicsShareFunc void epicsShareAPI ascaStats(int *pchans, int *pdiscon); +epicsShareFunc void asCaStart(void); +epicsShareFunc void asCaStop(void); +epicsShareFunc int ascar(int level); +epicsShareFunc int ascarFP(FILE *fp, int level); +epicsShareFunc void ascaStats(int *pchans, int *pdiscon); #ifdef __cplusplus } diff --git a/src/ioc/as/asDbLib.c b/src/ioc/as/asDbLib.c index a12d1902c..330796d6b 100644 --- a/src/ioc/as/asDbLib.c +++ b/src/ioc/as/asDbLib.c @@ -67,7 +67,7 @@ static long asDbAddRecords(void) return(0); } -int epicsShareAPI asSetFilename(const char *acf) +int asSetFilename(const char *acf) { if(pacf) free ((void *)pacf); if(acf) { @@ -83,7 +83,7 @@ int epicsShareAPI asSetFilename(const char *acf) return(0); } -int epicsShareAPI asSetSubstitutions(const char *substitutions) +int asSetSubstitutions(const char *substitutions) { if(psubstitutions) free ((void *)psubstitutions); if(substitutions) { @@ -144,7 +144,7 @@ static long asInitCommon(void) return(status); } -int epicsShareAPI asInit(void) +int asInit(void) { return(asInitCommon()); } @@ -170,7 +170,7 @@ static void asInitTask(ASDBCALLBACK *pcallback) } } -int epicsShareAPI asInitAsyn(ASDBCALLBACK *pcallback) +int asInitAsyn(ASDBCALLBACK *pcallback) { if(!pacf) return(0); if(asInitTheadId) { @@ -196,12 +196,12 @@ int epicsShareAPI asInitAsyn(ASDBCALLBACK *pcallback) return(0); } -int epicsShareAPI asDbGetAsl(struct dbChannel *chan) +int asDbGetAsl(struct dbChannel *chan) { return dbChannelFldDes(chan)->as_level; } -void * epicsShareAPI asDbGetMemberPvt(struct dbChannel *chan) +void * asDbGetMemberPvt(struct dbChannel *chan) { return dbChannelRecord(chan)->asp; } @@ -216,7 +216,7 @@ static void astacCallback(ASCLIENTPVT clientPvt,asClientStatus status) (asCheckPut(clientPvt) ? "Yes" : "No")); } -int epicsShareAPI astac(const char *pname,const char *user,const char *location) +int astac(const char *pname,const char *user,const char *location) { DBADDR *paddr; long status; @@ -260,62 +260,62 @@ static void myMemberCallback(ASMEMBERPVT memPvt,FILE *fp) if(precord) fprintf(fp," Record:%s",precord->name); } -int epicsShareAPI asdbdump(void) +int asdbdump(void) { asDumpFP(stdout,myMemberCallback,NULL,1); return(0); } -int epicsShareAPI asdbdumpFP(FILE *fp) +int asdbdumpFP(FILE *fp) { asDumpFP(fp,myMemberCallback,NULL,1); return(0); } -int epicsShareAPI aspuag(const char *uagname) +int aspuag(const char *uagname) { asDumpUagFP(stdout,uagname); return(0); } -int epicsShareAPI aspuagFP(FILE *fp,const char *uagname) +int aspuagFP(FILE *fp,const char *uagname) { asDumpUagFP(fp,uagname); return(0); } -int epicsShareAPI asphag(const char *hagname) +int asphag(const char *hagname) { asDumpHagFP(stdout,hagname); return(0); } -int epicsShareAPI asphagFP(FILE *fp,const char *hagname) +int asphagFP(FILE *fp,const char *hagname) { asDumpHagFP(fp,hagname); return(0); } -int epicsShareAPI asprules(const char *asgname) +int asprules(const char *asgname) { asDumpRulesFP(stdout,asgname); return(0); } -int epicsShareAPI asprulesFP(FILE *fp,const char *asgname) +int asprulesFP(FILE *fp,const char *asgname) { asDumpRulesFP(fp,asgname); return(0); } -int epicsShareAPI aspmem(const char *asgname,int clients) +int aspmem(const char *asgname,int clients) { asDumpMemFP(stdout,asgname,myMemberCallback,clients); return(0); } -int epicsShareAPI aspmemFP(FILE *fp,const char *asgname,int clients) +int aspmemFP(FILE *fp,const char *asgname,int clients) { asDumpMemFP(fp,asgname,myMemberCallback,clients); return(0); diff --git a/src/ioc/as/asDbLib.h b/src/ioc/as/asDbLib.h index b40a8d9df..04e35611f 100644 --- a/src/ioc/as/asDbLib.h +++ b/src/ioc/as/asDbLib.h @@ -28,24 +28,24 @@ struct dbChannel; extern "C" { #endif -epicsShareFunc int epicsShareAPI asSetFilename(const char *acf); -epicsShareFunc int epicsShareAPI asSetSubstitutions(const char *substitutions); -epicsShareFunc int epicsShareAPI asInit(void); -epicsShareFunc int epicsShareAPI asInitAsyn(ASDBCALLBACK *pcallback); -epicsShareFunc int epicsShareAPI asDbGetAsl(struct dbChannel *chan); -epicsShareFunc void * epicsShareAPI asDbGetMemberPvt(struct dbChannel *chan); -epicsShareFunc int epicsShareAPI asdbdump(void); -epicsShareFunc int epicsShareAPI asdbdumpFP(FILE *fp); -epicsShareFunc int epicsShareAPI aspuag(const char *uagname); -epicsShareFunc int epicsShareAPI aspuagFP(FILE *fp,const char *uagname); -epicsShareFunc int epicsShareAPI asphag(const char *hagname); -epicsShareFunc int epicsShareAPI asphagFP(FILE *fp,const char *hagname); -epicsShareFunc int epicsShareAPI asprules(const char *asgname); -epicsShareFunc int epicsShareAPI asprulesFP(FILE *fp,const char *asgname); -epicsShareFunc int epicsShareAPI aspmem(const char *asgname,int clients); -epicsShareFunc int epicsShareAPI aspmemFP( +epicsShareFunc int asSetFilename(const char *acf); +epicsShareFunc int asSetSubstitutions(const char *substitutions); +epicsShareFunc int asInit(void); +epicsShareFunc int asInitAsyn(ASDBCALLBACK *pcallback); +epicsShareFunc int asDbGetAsl(struct dbChannel *chan); +epicsShareFunc void * asDbGetMemberPvt(struct dbChannel *chan); +epicsShareFunc int asdbdump(void); +epicsShareFunc int asdbdumpFP(FILE *fp); +epicsShareFunc int aspuag(const char *uagname); +epicsShareFunc int aspuagFP(FILE *fp,const char *uagname); +epicsShareFunc int asphag(const char *hagname); +epicsShareFunc int asphagFP(FILE *fp,const char *hagname); +epicsShareFunc int asprules(const char *asgname); +epicsShareFunc int asprulesFP(FILE *fp,const char *asgname); +epicsShareFunc int aspmem(const char *asgname,int clients); +epicsShareFunc int aspmemFP( FILE *fp,const char *asgname,int clients); -epicsShareFunc int epicsShareAPI astac( +epicsShareFunc int astac( const char *recordname,const char *user,const char *location); #ifdef __cplusplus diff --git a/src/ioc/as/asIocRegister.c b/src/ioc/as/asIocRegister.c index 71c5bd7de..f276b26ad 100644 --- a/src/ioc/as/asIocRegister.c +++ b/src/ioc/as/asIocRegister.c @@ -112,7 +112,7 @@ static void asDumpHashCallFunc(const iocshArgBuf *args) asDumpHash(); } -void epicsShareAPI asIocRegister(void) +void asIocRegister(void) { iocshRegister(&asSetFilenameFuncDef,asSetFilenameCallFunc); iocshRegister(&asSetSubstitutionsFuncDef,asSetSubstitutionsCallFunc); diff --git a/src/ioc/as/asIocRegister.h b/src/ioc/as/asIocRegister.h index 50d44a5ac..a7421cdac 100644 --- a/src/ioc/as/asIocRegister.h +++ b/src/ioc/as/asIocRegister.h @@ -16,7 +16,7 @@ extern "C" { #endif -epicsShareFunc void epicsShareAPI asIocRegister(void); +epicsShareFunc void asIocRegister(void); #ifdef __cplusplus } diff --git a/src/ioc/bpt/cvtTable.h b/src/ioc/bpt/cvtTable.h index e407732af..3147db934 100644 --- a/src/ioc/bpt/cvtTable.h +++ b/src/ioc/bpt/cvtTable.h @@ -24,10 +24,10 @@ extern "C" { #endif /* Global Routines*/ -epicsShareFunc long epicsShareAPI cvtEngToRawBpt( +epicsShareFunc long cvtEngToRawBpt( double *pval,short linr,short init,void **ppbrk,short *plbrk); -epicsShareFunc long epicsShareAPI cvtRawToEngBpt( +epicsShareFunc long cvtRawToEngBpt( double *pval,short linr,short init,void **ppbrk, short *plbrk); #ifdef __cplusplus diff --git a/src/ioc/db/cvtBpt.c b/src/ioc/db/cvtBpt.c index aec79ca2b..7807accc2 100644 --- a/src/ioc/db/cvtBpt.c +++ b/src/ioc/db/cvtBpt.c @@ -42,7 +42,7 @@ static brkTable *findBrkTable(short linr) } /* Used by both ao and ai record types */ -long epicsShareAPI cvtRawToEngBpt(double *pval, short linr, short init, +long cvtRawToEngBpt(double *pval, short linr, short init, void **ppbrk, short *plbrk) { double val = *pval; @@ -122,7 +122,7 @@ long epicsShareAPI cvtRawToEngBpt(double *pval, short linr, short init, } /* Used by the ao record type */ -long epicsShareAPI cvtEngToRawBpt(double *pval, short linr, short init, +long cvtEngToRawBpt(double *pval, short linr, short init, void **ppbrk, short *plbrk) { double val = *pval; diff --git a/src/ioc/db/dbAccess.c b/src/ioc/db/dbAccess.c index 005edce3d..dd9094fe1 100644 --- a/src/ioc/db/dbAccess.c +++ b/src/ioc/db/dbAccess.c @@ -92,12 +92,12 @@ static short mapDBFToDBR[DBF_NTYPES] = { /* The following is to handle SPC_AS */ static SPC_ASCALLBACK spcAsCallback = 0; -void epicsShareAPI dbSpcAsRegisterCallback(SPC_ASCALLBACK func) +void dbSpcAsRegisterCallback(SPC_ASCALLBACK func) { spcAsCallback = func; } -long epicsShareAPI dbPutSpecial(DBADDR *paddr,int pass) +long dbPutSpecial(DBADDR *paddr,int pass) { long int (*pspecial)()=NULL; struct rset *prset; @@ -393,7 +393,7 @@ static void getOptions(DBADDR *paddr, char **poriginal, long *options, *poriginal = pbuffer; } -struct rset * epicsShareAPI dbGetRset(const struct dbAddr *paddr) +struct rset * dbGetRset(const struct dbAddr *paddr) { struct dbFldDes *pfldDes = paddr->pfldDes; @@ -401,7 +401,7 @@ struct rset * epicsShareAPI dbGetRset(const struct dbAddr *paddr) return(pfldDes->pdbRecordType->prset); } -long epicsShareAPI dbPutAttribute( +long dbPutAttribute( const char *recordTypename,const char *name,const char*value) { DBENTRY dbEntry; @@ -417,7 +417,7 @@ long epicsShareAPI dbPutAttribute( return(status); } -int epicsShareAPI dbIsValueField(const struct dbFldDes *pdbFldDes) +int dbIsValueField(const struct dbFldDes *pdbFldDes) { if (pdbFldDes->pdbRecordType->indvalFlddes == pdbFldDes->indRecordType) return TRUE; @@ -425,7 +425,7 @@ int epicsShareAPI dbIsValueField(const struct dbFldDes *pdbFldDes) return FALSE; } -int epicsShareAPI dbGetFieldIndex(const struct dbAddr *paddr) +int dbGetFieldIndex(const struct dbAddr *paddr) { return paddr->pfldDes->indRecordType; } @@ -435,7 +435,7 @@ int epicsShareAPI dbGetFieldIndex(const struct dbAddr *paddr) * Will notify if processing is complete by callback. * (only if you are interested in completion) */ -long epicsShareAPI dbScanPassive(dbCommon *pfrom, dbCommon *pto) +long dbScanPassive(dbCommon *pfrom, dbCommon *pto) { /* if not passive just return success */ if (pto->scan != 0) @@ -455,7 +455,7 @@ long epicsShareAPI dbScanPassive(dbCommon *pfrom, dbCommon *pto) * 5. Run the process routine specific to the record type. * 6. Check to see if record contents should be automatically printed. */ -long epicsShareAPI dbProcess(dbCommon *precord) +long dbProcess(dbCommon *precord) { struct rset *prset = precord->rset; dbRecordType *pdbRecordType = precord->rdes; @@ -585,7 +585,7 @@ all_done: * Returns error codes from StaticLib module, not * from dbAccess. */ -long epicsShareAPI dbNameToAddr(const char *pname, DBADDR *paddr) +long dbNameToAddr(const char *pname, DBADDR *paddr) { DBENTRY dbEntry; dbFldDes *pflddes; @@ -654,7 +654,7 @@ finish: return status; } -long epicsShareAPI dbValueSize(short dbr_type) +long dbValueSize(short dbr_type) { /* sizes for value associated with each DBR request type */ static long size[] = { @@ -673,7 +673,7 @@ long epicsShareAPI dbValueSize(short dbr_type) } -long epicsShareAPI dbBufferSize(short dbr_type, long options, long no_elements) +long dbBufferSize(short dbr_type, long options, long no_elements) { long nbytes=0; @@ -691,12 +691,12 @@ long epicsShareAPI dbBufferSize(short dbr_type, long options, long no_elements) if (options & DBR_AL_DOUBLE) nbytes += dbr_alDouble_size; return(nbytes); } -int epicsShareAPI dbLoadDatabase(const char *file, const char *path, const char *subs) +int dbLoadDatabase(const char *file, const char *path, const char *subs) { return dbReadDatabase(&pdbbase, file, path, subs); } -int epicsShareAPI dbLoadRecords(const char* file, const char* subs) +int dbLoadRecords(const char* file, const char* subs) { return dbReadDatabase(&pdbbase, file, 0, subs); } @@ -770,7 +770,7 @@ static long getAttrValue(DBADDR *paddr, short dbrType, return 0; } -long epicsShareAPI dbGetField(DBADDR *paddr,short dbrType, +long dbGetField(DBADDR *paddr,short dbrType, void *pbuffer, long *options, long *nRequest, void *pflin) { dbCommon *precord = paddr->precord; @@ -782,7 +782,7 @@ long epicsShareAPI dbGetField(DBADDR *paddr,short dbrType, return status; } -long epicsShareAPI dbGet(DBADDR *paddr, short dbrType, +long dbGet(DBADDR *paddr, short dbrType, void *pbuffer, long *options, long *nRequest, void *pflin) { char *pbuf = pbuffer; @@ -887,11 +887,11 @@ long epicsShareAPI dbGet(DBADDR *paddr, short dbrType, return status; } -devSup* epicsShareAPI dbDTYPtoDevSup(dbRecordType *prdes, int dtyp) { +devSup* dbDTYPtoDevSup(dbRecordType *prdes, int dtyp) { return (devSup *)ellNth(&prdes->devList, dtyp+1); } -devSup* epicsShareAPI dbDSETtoDevSup(dbRecordType *prdes, struct dset *pdset) { +devSup* dbDSETtoDevSup(dbRecordType *prdes, struct dset *pdset) { devSup *pdevSup = (devSup *)ellFirst(&prdes->devList); while (pdevSup) { if (pdset == pdevSup->pdset) return pdevSup; @@ -1063,7 +1063,7 @@ finish: return status; } -long epicsShareAPI dbPutField(DBADDR *paddr, short dbrType, +long dbPutField(DBADDR *paddr, short dbrType, const void *pbuffer, long nRequest) { long status = 0; @@ -1137,7 +1137,7 @@ static long putAcks(DBADDR *paddr, const void *pbuffer, long nRequest, return 0; } -long epicsShareAPI dbPut(DBADDR *paddr, short dbrType, +long dbPut(DBADDR *paddr, short dbrType, const void *pbuffer, long nRequest) { dbCommon *precord = paddr->precord; diff --git a/src/ioc/db/dbAccessDefs.h b/src/ioc/db/dbAccessDefs.h index 7e5c7a78d..ba794a520 100644 --- a/src/ioc/db/dbAccessDefs.h +++ b/src/ioc/db/dbAccessDefs.h @@ -200,41 +200,41 @@ struct dbr_alDouble {DBRalDouble}; #define S_db_cntCont (M_dbAccess|65) /*Cannot resume dbContTask*/ #define S_db_noMemory (M_dbAccess|66) /*unable to allocate data structure from pool*/ -epicsShareFunc long epicsShareAPI dbPutSpecial(struct dbAddr *paddr,int pass); -epicsShareFunc struct rset * epicsShareAPI dbGetRset(const struct dbAddr *paddr); -epicsShareFunc long epicsShareAPI dbPutAttribute( +epicsShareFunc long dbPutSpecial(struct dbAddr *paddr,int pass); +epicsShareFunc struct rset * dbGetRset(const struct dbAddr *paddr); +epicsShareFunc long dbPutAttribute( const char *recordTypename,const char *name,const char*value); -epicsShareFunc int epicsShareAPI dbIsValueField(const struct dbFldDes *pdbFldDes); -epicsShareFunc int epicsShareAPI dbGetFieldIndex(const struct dbAddr *paddr); -epicsShareFunc long epicsShareAPI dbScanPassive( +epicsShareFunc int dbIsValueField(const struct dbFldDes *pdbFldDes); +epicsShareFunc int dbGetFieldIndex(const struct dbAddr *paddr); +epicsShareFunc long dbScanPassive( struct dbCommon *pfrom,struct dbCommon *pto); -epicsShareFunc long epicsShareAPI dbProcess(struct dbCommon *precord); -epicsShareFunc long epicsShareAPI dbNameToAddr( +epicsShareFunc long dbProcess(struct dbCommon *precord); +epicsShareFunc long dbNameToAddr( const char *pname,struct dbAddr *); -epicsShareFunc devSup* epicsShareAPI dbDTYPtoDevSup(dbRecordType *prdes, int dtyp); -epicsShareFunc devSup* epicsShareAPI dbDSETtoDevSup(dbRecordType *prdes, struct dset *pdset); -epicsShareFunc long epicsShareAPI dbGetField( +epicsShareFunc devSup* dbDTYPtoDevSup(dbRecordType *prdes, int dtyp); +epicsShareFunc devSup* dbDSETtoDevSup(dbRecordType *prdes, struct dset *pdset); +epicsShareFunc long dbGetField( struct dbAddr *,short dbrType,void *pbuffer,long *options, long *nRequest,void *pfl); -epicsShareFunc long epicsShareAPI dbGet( +epicsShareFunc long dbGet( struct dbAddr *,short dbrType,void *pbuffer,long *options, long *nRequest,void *pfl); -epicsShareFunc long epicsShareAPI dbPutField( +epicsShareFunc long dbPutField( struct dbAddr *,short dbrType,const void *pbuffer,long nRequest); -epicsShareFunc long epicsShareAPI dbPut( +epicsShareFunc long dbPut( struct dbAddr *,short dbrType,const void *pbuffer,long nRequest); typedef void(*SPC_ASCALLBACK)(struct dbCommon *); /*dbSpcAsRegisterCallback called by access security */ -epicsShareFunc void epicsShareAPI dbSpcAsRegisterCallback(SPC_ASCALLBACK func); -epicsShareFunc long epicsShareAPI dbBufferSize( +epicsShareFunc void dbSpcAsRegisterCallback(SPC_ASCALLBACK func); +epicsShareFunc long dbBufferSize( short dbrType,long options,long nRequest); -epicsShareFunc long epicsShareAPI dbValueSize(short dbrType); +epicsShareFunc long dbValueSize(short dbrType); -epicsShareFunc int epicsShareAPI dbLoadDatabase( +epicsShareFunc int dbLoadDatabase( const char *filename, const char *path, const char *substitutions); -epicsShareFunc int epicsShareAPI dbLoadRecords( +epicsShareFunc int dbLoadRecords( const char* filename, const char* substitutions); #ifdef __cplusplus diff --git a/src/ioc/db/dbBkpt.c b/src/ioc/db/dbBkpt.c index 681886676..1abc4eb2d 100644 --- a/src/ioc/db/dbBkpt.c +++ b/src/ioc/db/dbBkpt.c @@ -254,7 +254,7 @@ static long FIND_CONT_NODE( /* * Initialise the breakpoint stack */ -void epicsShareAPI dbBkptInit(void) +void dbBkptInit(void) { if (! bkpt_stack_sem) { bkpt_stack_sem = epicsMutexMustCreate(); @@ -273,7 +273,7 @@ void epicsShareAPI dbBkptInit(void) * 7. Add breakpoint to list of breakpoints in structure. * 8. Spawn continuation task if it isn't already running. */ -long epicsShareAPI dbb(const char *record_name) +long dbb(const char *record_name) { struct dbAddr addr; struct LS_LIST *pnode; @@ -393,7 +393,7 @@ long epicsShareAPI dbb(const char *record_name) * 5. Turn off break point field. * 6. Give up semaphore to "signal" bkptCont task to quit. */ -long epicsShareAPI dbd(const char *record_name) +long dbd(const char *record_name) { struct dbAddr addr; struct LS_LIST *pnode; @@ -479,7 +479,7 @@ long epicsShareAPI dbd(const char *record_name) * 2. Turn off stepping mode. * 2. Resume dbBkptCont. */ -long epicsShareAPI dbc(const char *record_name) +long dbc(const char *record_name) { struct LS_LIST *pnode; struct dbCommon *precord = NULL; @@ -518,7 +518,7 @@ long epicsShareAPI dbc(const char *record_name) * 1. Find top node in lockset stack. * 2. Resume dbBkptCont. */ -long epicsShareAPI dbs(const char *record_name) +long dbs(const char *record_name) { struct LS_LIST *pnode; struct dbCommon *precord = NULL; @@ -643,7 +643,7 @@ static void dbBkptCont(dbCommon *precord) * if so, turn on stepping mode. * 6. If stepping mode is set, stop and report the breakpoint. */ -int epicsShareAPI dbBkpt(dbCommon *precord) +int dbBkpt(dbCommon *precord) { struct LS_LIST *pnode; struct EP_LIST *pqe; @@ -796,7 +796,7 @@ int epicsShareAPI dbBkpt(dbCommon *precord) } /* print record after processing */ -void epicsShareAPI dbPrint(dbCommon *precord ) +void dbPrint(dbCommon *precord ) { struct LS_LIST *pnode; @@ -815,7 +815,7 @@ void epicsShareAPI dbPrint(dbCommon *precord ) } /* print stopped record */ -long epicsShareAPI dbp(const char *record_name, int interest_level) +long dbp(const char *record_name, int interest_level) { struct LS_LIST *pnode; struct dbCommon *precord; @@ -838,7 +838,7 @@ long epicsShareAPI dbp(const char *record_name, int interest_level) } /* toggle printing after processing a certain record */ -long epicsShareAPI dbap(const char *record_name) +long dbap(const char *record_name) { struct dbAddr addr; struct dbCommon *precord; @@ -870,7 +870,7 @@ long epicsShareAPI dbap(const char *record_name) } /* print list of stopped records, and breakpoints set in locksets */ -long epicsShareAPI dbstat(void) +long dbstat(void) { struct LS_LIST *pnode; struct BP_LIST *pbl; @@ -933,7 +933,7 @@ long epicsShareAPI dbstat(void) /* * Process a record without printing it. */ -long epicsShareAPI dbprc(char *record_name) +long dbprc(char *record_name) { struct dbAddr addr; struct dbCommon *precord; diff --git a/src/ioc/db/dbBkpt.h b/src/ioc/db/dbBkpt.h index 05a637244..49c905289 100644 --- a/src/ioc/db/dbBkpt.h +++ b/src/ioc/db/dbBkpt.h @@ -82,18 +82,18 @@ struct LS_LIST { #define MAX_EP_COUNT 99999 -epicsShareFunc void epicsShareAPI dbBkptInit(void); -epicsShareFunc long epicsShareAPI dbb(const char *recordname); -epicsShareFunc long epicsShareAPI dbd(const char *recordname); -epicsShareFunc long epicsShareAPI dbc(const char *recordname); -epicsShareFunc long epicsShareAPI dbs(const char *recordname); -epicsShareFunc long epicsShareAPI dbstat(void); -epicsShareFunc long epicsShareAPI dbp( +epicsShareFunc void dbBkptInit(void); +epicsShareFunc long dbb(const char *recordname); +epicsShareFunc long dbd(const char *recordname); +epicsShareFunc long dbc(const char *recordname); +epicsShareFunc long dbs(const char *recordname); +epicsShareFunc long dbstat(void); +epicsShareFunc long dbp( const char *record_name, int interest_level); -epicsShareFunc long epicsShareAPI dbap(const char *record_name); -epicsShareFunc int epicsShareAPI dbBkpt(struct dbCommon *precord); -epicsShareFunc void epicsShareAPI dbPrint(struct dbCommon *precord); -epicsShareFunc long epicsShareAPI dbprc(char *record_name); +epicsShareFunc long dbap(const char *record_name); +epicsShareFunc int dbBkpt(struct dbCommon *precord); +epicsShareFunc void dbPrint(struct dbCommon *precord); +epicsShareFunc long dbprc(char *record_name); extern long lset_stack_count; diff --git a/src/ioc/db/dbEvent.c b/src/ioc/db/dbEvent.c index 53e7b5e36..fba01eadb 100644 --- a/src/ioc/db/dbEvent.c +++ b/src/ioc/db/dbEvent.c @@ -129,7 +129,7 @@ static unsigned short ringSpace ( const struct event_que *pevq ) /* * db_event_list () */ -int epicsShareAPI db_event_list ( const char *pname, unsigned level ) +int db_event_list ( const char *pname, unsigned level ) { return dbel ( pname, level ); } @@ -137,7 +137,7 @@ int epicsShareAPI db_event_list ( const char *pname, unsigned level ) /* * dbel () */ -int epicsShareAPI dbel ( const char *pname, unsigned level ) +int dbel ( const char *pname, unsigned level ) { DBADDR addr; long status; @@ -250,7 +250,7 @@ int epicsShareAPI dbel ( const char *pname, unsigned level ) * * returns: ptr to event user block or NULL if memory can't be allocated */ -dbEventCtx epicsShareAPI db_init_events (void) +dbEventCtx db_init_events (void) { struct event_user * evUser; @@ -325,7 +325,7 @@ fail: * itself * */ -void epicsShareAPI db_close_events (dbEventCtx ctx) +void db_close_events (dbEventCtx ctx) { struct event_user * const evUser = (struct event_user *) ctx; @@ -382,7 +382,7 @@ static struct event_que * create_ev_que ( struct event_user * const evUser ) /* * DB_ADD_EVENT() */ -dbEventSubscription epicsShareAPI db_add_event ( +dbEventSubscription db_add_event ( dbEventCtx ctx, struct dbChannel *chan, EVENTFUNC *user_sub, void *user_arg, unsigned select) { @@ -464,7 +464,7 @@ dbEventSubscription epicsShareAPI db_add_event ( /* * db_event_enable() */ -void epicsShareAPI db_event_enable (dbEventSubscription event) +void db_event_enable (dbEventSubscription event) { struct evSubscrip * const pevent = (struct evSubscrip *) event; struct dbCommon * const precord = dbChannelRecord(pevent->chan); @@ -480,7 +480,7 @@ void epicsShareAPI db_event_enable (dbEventSubscription event) /* * db_event_disable() */ -void epicsShareAPI db_event_disable (dbEventSubscription event) +void db_event_disable (dbEventSubscription event) { struct evSubscrip * const pevent = (struct evSubscrip *) event; struct dbCommon * const precord = dbChannelRecord(pevent->chan); @@ -523,7 +523,7 @@ static void event_remove ( struct event_que *ev_que, * the same block at the same time. * */ -void epicsShareAPI db_cancel_event (dbEventSubscription event) +void db_cancel_event (dbEventSubscription event) { struct evSubscrip * const pevent = (struct evSubscrip *) event; unsigned short getix; @@ -589,7 +589,7 @@ void epicsShareAPI db_cancel_event (dbEventSubscription event) * * waits for extra labor in progress to finish */ -void epicsShareAPI db_flush_extra_labor_event (dbEventCtx ctx) +void db_flush_extra_labor_event (dbEventCtx ctx) { struct event_user * const evUser = (struct event_user *) ctx; @@ -609,7 +609,7 @@ void epicsShareAPI db_flush_extra_labor_event (dbEventCtx ctx) * when labor is offloaded to the * event task */ -int epicsShareAPI db_add_extra_labor_event ( +int db_add_extra_labor_event ( dbEventCtx ctx, EXTRALABORFUNC *func, void *arg) { struct event_user * const evUser = (struct event_user *) ctx; @@ -625,7 +625,7 @@ int epicsShareAPI db_add_extra_labor_event ( /* * DB_POST_EXTRA_LABOR() */ -int epicsShareAPI db_post_extra_labor (dbEventCtx ctx) +int db_post_extra_labor (dbEventCtx ctx) { struct event_user * const evUser = (struct event_user *) ctx; int doit; @@ -653,7 +653,7 @@ int epicsShareAPI db_post_extra_labor (dbEventCtx ctx) * NOTE: This assumes that the db scan lock is already applied * (as it copies data from the record) */ -db_field_log* epicsShareAPI db_create_event_log (struct evSubscrip *pevent) +db_field_log* db_create_event_log (struct evSubscrip *pevent) { db_field_log *pLog = (db_field_log *) freeListCalloc(dbevFieldLogFreeList); @@ -687,7 +687,7 @@ db_field_log* epicsShareAPI db_create_event_log (struct evSubscrip *pevent) * DB_CREATE_READ_LOG() * */ -db_field_log* epicsShareAPI db_create_read_log (struct dbChannel *chan) +db_field_log* db_create_read_log (struct dbChannel *chan) { db_field_log *pLog = (db_field_log *) freeListCalloc(dbevFieldLogFreeList); @@ -804,7 +804,7 @@ static void db_queue_event_log (evSubscrip *pevent, db_field_log *pLog) * NOTE: This assumes that the db scan lock is already applied * */ -int epicsShareAPI db_post_events( +int db_post_events( void *pRecord, void *pField, unsigned int caEventMask @@ -840,7 +840,7 @@ unsigned int caEventMask /* * DB_POST_SINGLE_EVENT() */ -void epicsShareAPI db_post_single_event (dbEventSubscription event) +void db_post_single_event (dbEventSubscription event) { struct evSubscrip * const pevent = (struct evSubscrip *) event; struct dbCommon * const prec = dbChannelRecord(pevent->chan); @@ -1044,7 +1044,7 @@ static void event_task (void *pParm) /* * DB_START_EVENTS() */ -int epicsShareAPI db_start_events ( +int db_start_events ( dbEventCtx ctx,const char *taskname, void (*init_func)(void *), void *init_func_arg, unsigned osiPriority ) { @@ -1082,7 +1082,7 @@ int epicsShareAPI db_start_events ( /* * db_event_change_priority() */ -void epicsShareAPI db_event_change_priority ( dbEventCtx ctx, +void db_event_change_priority ( dbEventCtx ctx, unsigned epicsPriority ) { struct event_user * const evUser = ( struct event_user * ) ctx; @@ -1092,7 +1092,7 @@ void epicsShareAPI db_event_change_priority ( dbEventCtx ctx, /* * db_event_flow_ctrl_mode_on() */ -void epicsShareAPI db_event_flow_ctrl_mode_on (dbEventCtx ctx) +void db_event_flow_ctrl_mode_on (dbEventCtx ctx) { struct event_user * const evUser = (struct event_user *) ctx; @@ -1111,7 +1111,7 @@ void epicsShareAPI db_event_flow_ctrl_mode_on (dbEventCtx ctx) /* * db_event_flow_ctrl_mode_off() */ -void epicsShareAPI db_event_flow_ctrl_mode_off (dbEventCtx ctx) +void db_event_flow_ctrl_mode_off (dbEventCtx ctx) { struct event_user * const evUser = (struct event_user *) ctx; @@ -1130,7 +1130,7 @@ void epicsShareAPI db_event_flow_ctrl_mode_off (dbEventCtx ctx) /* * db_delete_field_log() */ -void epicsShareAPI db_delete_field_log (db_field_log *pfl) +void db_delete_field_log (db_field_log *pfl) { if (pfl) { /* Free field if reference type field log and dtor is set */ diff --git a/src/ioc/db/dbEvent.h b/src/ioc/db/dbEvent.h index 323a3d4e0..fe0e52f90 100644 --- a/src/ioc/db/dbEvent.h +++ b/src/ioc/db/dbEvent.h @@ -40,44 +40,44 @@ struct dbChannel; struct db_field_log; struct evSubscrip; -epicsShareFunc int epicsShareAPI db_event_list ( +epicsShareFunc int db_event_list ( const char *name, unsigned level); -epicsShareFunc int epicsShareAPI dbel ( +epicsShareFunc int dbel ( const char *name, unsigned level); -epicsShareFunc int epicsShareAPI db_post_events ( +epicsShareFunc int db_post_events ( void *pRecord, void *pField, unsigned caEventMask ); typedef void * dbEventCtx; typedef void EXTRALABORFUNC (void *extralabor_arg); -epicsShareFunc dbEventCtx epicsShareAPI db_init_events (void); -epicsShareFunc int epicsShareAPI db_start_events ( +epicsShareFunc dbEventCtx db_init_events (void); +epicsShareFunc int db_start_events ( dbEventCtx ctx, const char *taskname, void (*init_func)(void *), void *init_func_arg, unsigned osiPriority ); -epicsShareFunc void epicsShareAPI db_close_events (dbEventCtx ctx); -epicsShareFunc void epicsShareAPI db_event_flow_ctrl_mode_on (dbEventCtx ctx); -epicsShareFunc void epicsShareAPI db_event_flow_ctrl_mode_off (dbEventCtx ctx); -epicsShareFunc int epicsShareAPI db_add_extra_labor_event ( +epicsShareFunc void db_close_events (dbEventCtx ctx); +epicsShareFunc void db_event_flow_ctrl_mode_on (dbEventCtx ctx); +epicsShareFunc void db_event_flow_ctrl_mode_off (dbEventCtx ctx); +epicsShareFunc int db_add_extra_labor_event ( dbEventCtx ctx, EXTRALABORFUNC *func, void *arg); -epicsShareFunc void epicsShareAPI db_flush_extra_labor_event (dbEventCtx); -epicsShareFunc int epicsShareAPI db_post_extra_labor (dbEventCtx ctx); -epicsShareFunc void epicsShareAPI db_event_change_priority ( dbEventCtx ctx, unsigned epicsPriority ); +epicsShareFunc void db_flush_extra_labor_event (dbEventCtx); +epicsShareFunc int db_post_extra_labor (dbEventCtx ctx); +epicsShareFunc void db_event_change_priority ( dbEventCtx ctx, unsigned epicsPriority ); typedef void EVENTFUNC (void *user_arg, struct dbChannel *chan, int eventsRemaining, struct db_field_log *pfl); typedef void * dbEventSubscription; -epicsShareFunc dbEventSubscription epicsShareAPI db_add_event ( +epicsShareFunc dbEventSubscription db_add_event ( dbEventCtx ctx, struct dbChannel *chan, EVENTFUNC *user_sub, void *user_arg, unsigned select); -epicsShareFunc void epicsShareAPI db_cancel_event (dbEventSubscription es); -epicsShareFunc void epicsShareAPI db_post_single_event (dbEventSubscription es); -epicsShareFunc void epicsShareAPI db_event_enable (dbEventSubscription es); -epicsShareFunc void epicsShareAPI db_event_disable (dbEventSubscription es); +epicsShareFunc void db_cancel_event (dbEventSubscription es); +epicsShareFunc void db_post_single_event (dbEventSubscription es); +epicsShareFunc void db_event_enable (dbEventSubscription es); +epicsShareFunc void db_event_disable (dbEventSubscription es); -epicsShareFunc struct db_field_log* epicsShareAPI db_create_event_log (struct evSubscrip *pevent); -epicsShareFunc struct db_field_log* epicsShareAPI db_create_read_log (struct dbChannel *chan); -epicsShareFunc void epicsShareAPI db_delete_field_log (struct db_field_log *pfl); +epicsShareFunc struct db_field_log* db_create_event_log (struct evSubscrip *pevent); +epicsShareFunc struct db_field_log* db_create_read_log (struct dbChannel *chan); +epicsShareFunc void db_delete_field_log (struct db_field_log *pfl); #define DB_EVENT_OK 0 #define DB_EVENT_ERROR (-1) diff --git a/src/ioc/db/dbIocRegister.c b/src/ioc/db/dbIocRegister.c index 58172bbb1..0de2d7172 100644 --- a/src/ioc/db/dbIocRegister.c +++ b/src/ioc/db/dbIocRegister.c @@ -350,7 +350,7 @@ static void dbStateShowAllCallFunc (const iocshArgBuf *args) dbStateShowAll(args[0].ival); } -void epicsShareAPI dbIocRegister(void) +void dbIocRegister(void) { iocshRegister(&dbbFuncDef,dbbCallFunc); iocshRegister(&dbdFuncDef,dbdCallFunc); diff --git a/src/ioc/db/dbIocRegister.h b/src/ioc/db/dbIocRegister.h index 31e72227a..973009c5b 100644 --- a/src/ioc/db/dbIocRegister.h +++ b/src/ioc/db/dbIocRegister.h @@ -16,7 +16,7 @@ extern "C" { #endif -epicsShareFunc void epicsShareAPI dbIocRegister(void); +epicsShareFunc void dbIocRegister(void); #ifdef __cplusplus } diff --git a/src/ioc/db/dbLock.c b/src/ioc/db/dbLock.c index 538be59a8..eb2e113f7 100644 --- a/src/ioc/db/dbLock.c +++ b/src/ioc/db/dbLock.c @@ -149,7 +149,7 @@ static lockSet * allocLockSet( return(plockSet); } -unsigned long epicsShareAPI dbLockGetLockId(dbCommon *precord) +unsigned long dbLockGetLockId(dbCommon *precord) { lockRecord *plockRecord = precord->lset; lockSet *plockSet; @@ -163,13 +163,13 @@ unsigned long epicsShareAPI dbLockGetLockId(dbCommon *precord) return(id); } -void epicsShareAPI dbLockSetGblLock(void) +void dbLockSetGblLock(void) { assert(dbLockIsInitialized); epicsMutexMustLock(globalLock); } -void epicsShareAPI dbLockSetGblUnlock(void) +void dbLockSetGblUnlock(void) { lockSet *plockSet; lockSet *pnext; @@ -192,7 +192,7 @@ void epicsShareAPI dbLockSetGblUnlock(void) return; } -void epicsShareAPI dbLockSetRecordLock(dbCommon *precord) +void dbLockSetRecordLock(dbCommon *precord) { lockRecord *plockRecord = precord->lset; lockSet *plockSet; @@ -228,7 +228,7 @@ void epicsShareAPI dbLockSetRecordLock(dbCommon *precord) epicsMutexUnlock(lockSetModifyLock); } -void epicsShareAPI dbScanLock(dbCommon *precord) +void dbScanLock(dbCommon *precord) { lockRecord *plockRecord = precord->lset; lockSet *plockSet; @@ -293,7 +293,7 @@ getGlobalLock: } } -void epicsShareAPI dbScanUnlock(dbCommon *precord) +void dbScanUnlock(dbCommon *precord) { lockRecord *plockRecord = precord->lset; lockSet *plockSet; @@ -316,7 +316,7 @@ void epicsShareAPI dbScanUnlock(dbCommon *precord) return; } -void epicsShareAPI dbLockInitRecords(dbBase *pdbbase) +void dbLockInitRecords(dbBase *pdbbase) { int link; dbRecordType *pdbRecordType; @@ -378,7 +378,7 @@ void epicsShareAPI dbLockInitRecords(dbBase *pdbbase) } } -void epicsShareAPI dbLockSetMerge(dbCommon *pfirst,dbCommon *psecond) +void dbLockSetMerge(dbCommon *pfirst,dbCommon *psecond) { lockRecord *p1lockRecord = pfirst->lset; lockRecord *p2lockRecord = psecond->lset; @@ -421,7 +421,7 @@ all_done: return; } -void epicsShareAPI dbLockSetSplit(dbCommon *psource) +void dbLockSetSplit(dbCommon *psource) { lockSet *plockSet; lockRecord *plockRecord; @@ -483,7 +483,7 @@ void epicsShareAPI dbLockSetSplit(dbCommon *psource) free(paplockRecord); } -long epicsShareAPI dblsr(char *recordname,int level) +long dblsr(char *recordname,int level) { int link; DBENTRY dbentry; @@ -561,7 +561,7 @@ long epicsShareAPI dblsr(char *recordname,int level) return(0); } -long epicsShareAPI dbLockShowLocked(int level) +long dbLockShowLocked(int level) { int indListType; lockSet *plockSet; @@ -617,7 +617,7 @@ long epicsShareAPI dbLockShowLocked(int level) return(0); } -int * epicsShareAPI dbLockSetAddrTrace(dbCommon *precord) +int * dbLockSetAddrTrace(dbCommon *precord) { lockRecord *plockRecord = precord->lset; lockSet *plockSet = plockRecord->plockSet; diff --git a/src/ioc/db/dbLock.h b/src/ioc/db/dbLock.h index 5e82925ef..062996601 100644 --- a/src/ioc/db/dbLock.h +++ b/src/ioc/db/dbLock.h @@ -22,29 +22,29 @@ extern "C" { struct dbCommon; struct dbBase; -epicsShareFunc void epicsShareAPI dbScanLock(struct dbCommon *precord); -epicsShareFunc void epicsShareAPI dbScanUnlock(struct dbCommon *precord); -epicsShareFunc unsigned long epicsShareAPI dbLockGetLockId( +epicsShareFunc void dbScanLock(struct dbCommon *precord); +epicsShareFunc void dbScanUnlock(struct dbCommon *precord); +epicsShareFunc unsigned long dbLockGetLockId( struct dbCommon *precord); -epicsShareFunc void epicsShareAPI dbLockInitRecords(struct dbBase *pdbbase); -epicsShareFunc void epicsShareAPI dbLockSetMerge( +epicsShareFunc void dbLockInitRecords(struct dbBase *pdbbase); +epicsShareFunc void dbLockSetMerge( struct dbCommon *pfirst,struct dbCommon *psecond); -epicsShareFunc void epicsShareAPI dbLockSetSplit(struct dbCommon *psource); +epicsShareFunc void dbLockSetSplit(struct dbCommon *psource); /*The following are for code that modifies lock sets*/ -epicsShareFunc void epicsShareAPI dbLockSetGblLock(void); -epicsShareFunc void epicsShareAPI dbLockSetGblUnlock(void); -epicsShareFunc void epicsShareAPI dbLockSetRecordLock(struct dbCommon *precord); +epicsShareFunc void dbLockSetGblLock(void); +epicsShareFunc void dbLockSetGblUnlock(void); +epicsShareFunc void dbLockSetRecordLock(struct dbCommon *precord); /* Lock Set Report */ -epicsShareFunc long epicsShareAPI dblsr(char *recordname,int level); +epicsShareFunc long dblsr(char *recordname,int level); /* If recordname NULL then all records*/ /* level = (0,1,2) (lock set state, + recordname, +DB links) */ -epicsShareFunc long epicsShareAPI dbLockShowLocked(int level); +epicsShareFunc long dbLockShowLocked(int level); /*KLUDGE to support field TPRO*/ -epicsShareFunc int * epicsShareAPI dbLockSetAddrTrace(struct dbCommon *precord); +epicsShareFunc int * dbLockSetAddrTrace(struct dbCommon *precord); #ifdef __cplusplus } diff --git a/src/ioc/db/dbNotify.c b/src/ioc/db/dbNotify.c index f20cab6b7..020f6d7c7 100644 --- a/src/ioc/db/dbNotify.c +++ b/src/ioc/db/dbNotify.c @@ -298,7 +298,7 @@ static void notifyCallback(CALLBACK *pcallback) callDone(precord, ppn); } -void epicsShareAPI dbProcessNotifyInit(void) +void dbProcessNotifyInit(void) { if (pnotifyGlobal) return; @@ -307,7 +307,7 @@ void epicsShareAPI dbProcessNotifyInit(void) ellInit(&pnotifyGlobal->freeList); } -void epicsShareAPI dbProcessNotify(processNotify *ppn) +void dbProcessNotify(processNotify *ppn) { struct dbChannel *chan = ppn->chan; dbCommon *precord = dbChannelRecord(chan); @@ -368,7 +368,7 @@ void epicsShareAPI dbProcessNotify(processNotify *ppn) processNotifyCommon(ppn, precord); } -void epicsShareAPI dbNotifyCancel(processNotify *ppn) +void dbNotifyCancel(processNotify *ppn) { dbCommon *precord = dbChannelRecord(ppn->chan); notifyState state; @@ -428,7 +428,7 @@ void epicsShareAPI dbNotifyCancel(processNotify *ppn) dbScanUnlock(precord); } -void epicsShareAPI dbNotifyCompletion(dbCommon *precord) +void dbNotifyCompletion(dbCommon *precord) { processNotify *ppn = precord->ppn; notifyPvt *pnotifyPvt; @@ -460,7 +460,7 @@ void epicsShareAPI dbNotifyCompletion(dbCommon *precord) epicsMutexUnlock(pnotifyGlobal->lock); } -void epicsShareAPI dbNotifyAdd(dbCommon *pfrom, dbCommon *pto) +void dbNotifyAdd(dbCommon *pfrom, dbCommon *pto) { processNotify *ppn = pfrom->ppn; notifyPvt *pnotifyPvt; @@ -573,7 +573,7 @@ static void tpnThread(void *pvt) free(ptpnInfo); } -long epicsShareAPI dbtpn(char *pname, char *pvalue) +long dbtpn(char *pname, char *pvalue) { struct dbChannel *chan; tpnInfo *ptpnInfo; @@ -604,7 +604,7 @@ long epicsShareAPI dbtpn(char *pname, char *pvalue) return 0; } -int epicsShareAPI dbNotifyDump(void) +int dbNotifyDump(void) { epicsMutexLockStatus lockStatus; dbRecordType *pdbRecordType; diff --git a/src/ioc/db/dbNotify.h b/src/ioc/db/dbNotify.h index c4f3d4832..47a1c9134 100644 --- a/src/ioc/db/dbNotify.h +++ b/src/ioc/db/dbNotify.h @@ -71,31 +71,31 @@ typedef struct processNotify { /* dbProcessNotify and dbNotifyCancel are called by user*/ -epicsShareFunc void epicsShareAPI dbProcessNotify(processNotify *pprocessNotify); -epicsShareFunc void epicsShareAPI dbNotifyCancel(processNotify *pprocessNotify); +epicsShareFunc void dbProcessNotify(processNotify *pprocessNotify); +epicsShareFunc void dbNotifyCancel(processNotify *pprocessNotify); /* dbProcessNotifyInit called by iocInit */ -epicsShareFunc void epicsShareAPI dbProcessNotifyInit(void); +epicsShareFunc void dbProcessNotifyInit(void); /*dbNotifyAdd called by dbScanPassive and dbScanLink*/ -epicsShareFunc void epicsShareAPI dbNotifyAdd( +epicsShareFunc void dbNotifyAdd( struct dbCommon *pfrom,struct dbCommon *pto); /*dbNotifyCompletion called by recGblFwdLink or dbAccess*/ -epicsShareFunc void epicsShareAPI dbNotifyCompletion(struct dbCommon *precord); +epicsShareFunc void dbNotifyCompletion(struct dbCommon *precord); /* db_put_process defined here since it requires dbNotify. * src_type is the old DBR type * This is called by a dbNotify putCallback that uses oldDbr types */ -epicsShareFunc int epicsShareAPI db_put_process( +epicsShareFunc int db_put_process( processNotify *processNotify,notifyPutType type, int src_type,const void *psrc, int no_elements); /* dbtpn is test routine for dbNotify putProcessRequest */ -epicsShareFunc long epicsShareAPI dbtpn(char *recordname,char *value); +epicsShareFunc long dbtpn(char *recordname,char *value); /* dbNotifyDump is an INVASIVE debug utility. Don't use this needlessly*/ -epicsShareFunc int epicsShareAPI dbNotifyDump(void); +epicsShareFunc int dbNotifyDump(void); /* This module provides code to handle process notify. * client code semantics are: diff --git a/src/ioc/db/dbTest.c b/src/ioc/db/dbTest.c index 979344c4f..96a805ae2 100644 --- a/src/ioc/db/dbTest.c +++ b/src/ioc/db/dbTest.c @@ -82,7 +82,7 @@ static char *dbr[DBR_ENUM+2]={ "STRING","CHAR","UCHAR","SHORT","USHORT","LONG","ULONG", "FLOAT","DOUBLE","ENUM","NOACCESS"}; -long epicsShareAPI dba(const char*pname) +long dba(const char*pname) { DBADDR addr; @@ -95,7 +95,7 @@ long epicsShareAPI dba(const char*pname) return 0; } -long epicsShareAPI dbl(const char *precordTypename, const char *fields) +long dbl(const char *precordTypename, const char *fields) { DBENTRY dbentry; DBENTRY *pdbentry=&dbentry; @@ -176,7 +176,7 @@ long epicsShareAPI dbl(const char *precordTypename, const char *fields) return 0; } -long epicsShareAPI dbnr(int verbose) +long dbnr(int verbose) { DBENTRY dbentry; DBENTRY *pdbentry=&dbentry; @@ -212,7 +212,7 @@ long epicsShareAPI dbnr(int verbose) return 0; } -long epicsShareAPI dbla(const char *pmask) +long dbla(const char *pmask) { DBENTRY dbentry; DBENTRY *pdbentry = &dbentry; @@ -241,7 +241,7 @@ long epicsShareAPI dbla(const char *pmask) return 0; } -long epicsShareAPI dbgrep(const char *pmask) +long dbgrep(const char *pmask) { DBENTRY dbentry; DBENTRY *pdbentry = &dbentry; @@ -270,7 +270,7 @@ long epicsShareAPI dbgrep(const char *pmask) return 0; } -long epicsShareAPI dbgf(const char *pname) +long dbgf(const char *pname) { /* declare buffer long just to ensure correct alignment */ long buffer[100]; @@ -304,7 +304,7 @@ long epicsShareAPI dbgf(const char *pname) return 0; } -long epicsShareAPI dbpf(const char *pname,const char *pvalue) +long dbpf(const char *pname,const char *pvalue) { DBADDR addr; long status = 0; @@ -336,7 +336,7 @@ long epicsShareAPI dbpf(const char *pname,const char *pvalue) return status; } -long epicsShareAPI dbpr(const char *pname,int interest_level) +long dbpr(const char *pname,int interest_level) { static TAB_BUFFER msg_Buff; TAB_BUFFER *pMsgBuff = &msg_Buff; @@ -358,7 +358,7 @@ long epicsShareAPI dbpr(const char *pname,int interest_level) return 0; } -long epicsShareAPI dbtr(const char *pname) +long dbtr(const char *pname) { DBADDR addr; long status; @@ -383,7 +383,7 @@ long epicsShareAPI dbtr(const char *pname) return 0; } -long epicsShareAPI dbtgf(const char *pname) +long dbtgf(const char *pname) { /* declare buffer long just to ensure correct alignment */ long buffer[400]; @@ -470,7 +470,7 @@ long epicsShareAPI dbtgf(const char *pname) return(0); } -long epicsShareAPI dbtpf(const char *pname, const char *pvalue) +long dbtpf(const char *pname, const char *pvalue) { /* declare buffer long just to ensure correct alignment */ long buffer[100]; @@ -587,7 +587,7 @@ long epicsShareAPI dbtpf(const char *pname, const char *pvalue) return(0); } -long epicsShareAPI dbior(const char *pdrvName,int interest_level) +long dbior(const char *pdrvName,int interest_level) { char *pname; drvSup *pdrvSup; @@ -638,7 +638,7 @@ long epicsShareAPI dbior(const char *pdrvName,int interest_level) return 0; } -int epicsShareAPI dbhcr(void) +int dbhcr(void) { if (!pdbbase) { printf("No database loaded\n"); diff --git a/src/ioc/db/dbTest.h b/src/ioc/db/dbTest.h index 231403a62..6d457b59e 100644 --- a/src/ioc/db/dbTest.h +++ b/src/ioc/db/dbTest.h @@ -17,33 +17,33 @@ extern "C" { #endif /*dbAddr info */ -epicsShareFunc long epicsShareAPI dba(const char *pname); +epicsShareFunc long dba(const char *pname); /*list records*/ -epicsShareFunc long epicsShareAPI dbl( +epicsShareFunc long dbl( const char *precordTypename,const char *fields); /*list number of records of each type*/ -epicsShareFunc long epicsShareAPI dbnr(int verbose); +epicsShareFunc long dbnr(int verbose); /* list aliases */ -epicsShareFunc long epicsShareAPI dbla(const char *pmask); +epicsShareFunc long dbla(const char *pmask); /*list records with mask*/ -epicsShareFunc long epicsShareAPI dbgrep(const char *pmask); +epicsShareFunc long dbgrep(const char *pmask); /*get field value*/ -epicsShareFunc long epicsShareAPI dbgf(const char *pname); +epicsShareFunc long dbgf(const char *pname); /*put field value*/ -epicsShareFunc long epicsShareAPI dbpf(const char *pname,const char *pvalue); +epicsShareFunc long dbpf(const char *pname,const char *pvalue); /*print record*/ -epicsShareFunc long epicsShareAPI dbpr(const char *pname,int interest_level); +epicsShareFunc long dbpr(const char *pname,int interest_level); /*test record*/ -epicsShareFunc long epicsShareAPI dbtr(const char *pname); +epicsShareFunc long dbtr(const char *pname); /*test get field*/ -epicsShareFunc long epicsShareAPI dbtgf(const char *pname); +epicsShareFunc long dbtgf(const char *pname); /*test put field*/ -epicsShareFunc long epicsShareAPI dbtpf(const char *pname,const char *pvalue); +epicsShareFunc long dbtpf(const char *pname,const char *pvalue); /*I/O report */ -epicsShareFunc long epicsShareAPI dbior( +epicsShareFunc long dbior( const char *pdrvName,int interest_level); /*Hardware Configuration Report*/ -epicsShareFunc int epicsShareAPI dbhcr(void); +epicsShareFunc int dbhcr(void); #ifdef __cplusplus } diff --git a/src/ioc/db/db_access.c b/src/ioc/db/db_access.c index c354fed12..262895802 100644 --- a/src/ioc/db/db_access.c +++ b/src/ioc/db/db_access.c @@ -149,7 +149,7 @@ int dbChannel_get(struct dbChannel *chan, /* Performs the work of the public db_get_field API, but also returns the number * of elements actually copied to the buffer. The caller is responsible for * zeroing the remaining part of the buffer. */ -int epicsShareAPI dbChannel_get_count( +int dbChannel_get_count( struct dbChannel *chan, int buffer_type, void *pbuffer, long *nRequest, void *pfl) { @@ -1012,7 +1012,7 @@ static int mapOldType (short oldtype) return dbrType; } -int epicsShareAPI db_put_process(processNotify *ppn, notifyPutType type, +int db_put_process(processNotify *ppn, notifyPutType type, int src_type, const void *psrc, int no_elements) { int status = 0; diff --git a/src/ioc/db/db_access_routines.h b/src/ioc/db/db_access_routines.h index d890f1d1c..36b926d1a 100644 --- a/src/ioc/db/db_access_routines.h +++ b/src/ioc/db/db_access_routines.h @@ -34,7 +34,7 @@ epicsShareFunc int dbChannel_get(struct dbChannel *chan, int buffer_type, void *pbuffer, long no_elements, void *pfl); epicsShareFunc int dbChannel_put(struct dbChannel *chan, int src_type, const void *psrc, long no_elements); -epicsShareFunc int epicsShareAPI dbChannel_get_count(struct dbChannel *chan, +epicsShareFunc int dbChannel_get_count(struct dbChannel *chan, int buffer_type, void *pbuffer, long *nRequest, void *pfl); diff --git a/src/ioc/db/db_test.c b/src/ioc/db/db_test.c index aa8e3b55c..2aabe7883 100644 --- a/src/ioc/db/db_test.c +++ b/src/ioc/db/db_test.c @@ -82,7 +82,7 @@ int gft(char *pname) * TPF * Test put field */ -int epicsShareAPI pft(char *pname, char *pvalue) +int pft(char *pname, char *pvalue) { struct dbChannel *chan; struct dbCommon *precord; @@ -217,7 +217,7 @@ static void tpnThread(void *pvt) free(ptpnInfo); } -int epicsShareAPI tpn(char *pname, char *pvalue) +int tpn(char *pname, char *pvalue) { struct dbChannel *chan; tpnInfo *ptpnInfo; diff --git a/src/ioc/db/db_test.h b/src/ioc/db/db_test.h index 52b00a979..b0f703226 100644 --- a/src/ioc/db/db_test.h +++ b/src/ioc/db/db_test.h @@ -16,9 +16,9 @@ extern "C" { #endif -epicsShareFunc int epicsShareAPI gft(char *pname); -epicsShareFunc int epicsShareAPI pft(char *pname,char *pvalue); -epicsShareFunc int epicsShareAPI tpn(char *pname,char *pvalue); +epicsShareFunc int gft(char *pname); +epicsShareFunc int pft(char *pname,char *pvalue); +epicsShareFunc int tpn(char *pname,char *pvalue); #ifdef __cplusplus } #endif diff --git a/src/ioc/db/recGbl.c b/src/ioc/db/recGbl.c index c07e38235..cfe2cde92 100644 --- a/src/ioc/db/recGbl.c +++ b/src/ioc/db/recGbl.c @@ -50,7 +50,7 @@ static void getMaxRangeValues(short field_type, double *pupper_limit, -void epicsShareAPI recGblDbaddrError(long status, const struct dbAddr *paddr, +void recGblDbaddrError(long status, const struct dbAddr *paddr, const char *pmessage) { dbCommon *precord = 0; @@ -69,7 +69,7 @@ void epicsShareAPI recGblDbaddrError(long status, const struct dbAddr *paddr, return; } -void epicsShareAPI recGblRecordError(long status, void *pdbc, +void recGblRecordError(long status, void *pdbc, const char *pmessage) { dbCommon *precord = pdbc; @@ -81,7 +81,7 @@ void epicsShareAPI recGblRecordError(long status, void *pdbc, return; } -void epicsShareAPI recGblRecSupError(long status, const struct dbAddr *paddr, +void recGblRecSupError(long status, const struct dbAddr *paddr, const char *pmessage, const char *psupport_name) { dbCommon *precord = 0; @@ -106,7 +106,7 @@ void epicsShareAPI recGblRecSupError(long status, const struct dbAddr *paddr, return; } -void epicsShareAPI recGblGetPrec(const struct dbAddr *paddr,long *precision) +void recGblGetPrec(const struct dbAddr *paddr,long *precision) { dbFldDes *pdbFldDes = paddr->pfldDes; @@ -133,7 +133,7 @@ void epicsShareAPI recGblGetPrec(const struct dbAddr *paddr,long *precision) return; } -void epicsShareAPI recGblGetGraphicDouble( +void recGblGetGraphicDouble( const struct dbAddr *paddr,struct dbr_grDouble *pgd) { dbFldDes *pdbFldDes = paddr->pfldDes; @@ -144,7 +144,7 @@ void epicsShareAPI recGblGetGraphicDouble( return; } -void epicsShareAPI recGblGetAlarmDouble( +void recGblGetAlarmDouble( const struct dbAddr *paddr,struct dbr_alDouble *pad) { pad->upper_alarm_limit = 0; @@ -155,7 +155,7 @@ void epicsShareAPI recGblGetAlarmDouble( return; } -void epicsShareAPI recGblGetControlDouble( +void recGblGetControlDouble( const struct dbAddr *paddr,struct dbr_ctrlDouble *pcd) { dbFldDes *pdbFldDes=paddr->pfldDes; @@ -166,7 +166,7 @@ void epicsShareAPI recGblGetControlDouble( return; } -int epicsShareAPI recGblInitConstantLink( +int recGblInitConstantLink( struct link *plink,short dbftype,void *pdest) { long status = dbLoadLink(plink, dbftype, pdest); @@ -176,7 +176,7 @@ int epicsShareAPI recGblInitConstantLink( return TRUE; } -unsigned short epicsShareAPI recGblResetAlarms(void *precord) +unsigned short recGblResetAlarms(void *precord) { dbCommon *pdbc = precord; epicsEnum16 prev_stat = pdbc->stat; @@ -225,7 +225,7 @@ int recGblSetSevr(void *precord, epicsEnum16 new_stat, epicsEnum16 new_sevr) return FALSE; } -void epicsShareAPI recGblFwdLink(void *precord) +void recGblFwdLink(void *precord) { dbCommon *pdbc = precord; @@ -241,7 +241,7 @@ void epicsShareAPI recGblFwdLink(void *precord) pdbc->putf = FALSE; } -void epicsShareAPI recGblGetTimeStamp(void *pvoid) +void recGblGetTimeStamp(void *pvoid) { dbCommon* prec = (dbCommon*)pvoid; struct link *plink = &prec->tsel; @@ -264,7 +264,7 @@ void epicsShareAPI recGblGetTimeStamp(void *pvoid) } } -void epicsShareAPI recGblTSELwasModified(struct link *plink) +void recGblTSELwasModified(struct link *plink) { struct pv_link *ppv_link = &plink->value.pv_link; char *pfieldname; diff --git a/src/ioc/dbStatic/dbLexRoutines.c b/src/ioc/dbStatic/dbLexRoutines.c index 67bc8af17..050c3d443 100644 --- a/src/ioc/dbStatic/dbLexRoutines.c +++ b/src/ioc/dbStatic/dbLexRoutines.c @@ -293,11 +293,11 @@ cleanup: return(status); } -long epicsShareAPI dbReadDatabase(DBBASE **ppdbbase,const char *filename, +long dbReadDatabase(DBBASE **ppdbbase,const char *filename, const char *path,const char *substitutions) {return (dbReadCOM(ppdbbase,filename,0,path,substitutions));} -long epicsShareAPI dbReadDatabaseFP(DBBASE **ppdbbase,FILE *fp, +long dbReadDatabaseFP(DBBASE **ppdbbase,FILE *fp, const char *path,const char *substitutions) {return (dbReadCOM(ppdbbase,0,fp,path,substitutions));} diff --git a/src/ioc/dbStatic/dbPvdLib.c b/src/ioc/dbStatic/dbPvdLib.c index 49060366b..8f7162a6c 100644 --- a/src/ioc/dbStatic/dbPvdLib.c +++ b/src/ioc/dbStatic/dbPvdLib.c @@ -189,7 +189,7 @@ void dbPvdFreeMem(dbBase *pdbbase) free(ppvd); } -void epicsShareAPI dbPvdDump(dbBase *pdbbase, int verbose) +void dbPvdDump(dbBase *pdbbase, int verbose) { unsigned int empty = 0; dbPvd *ppvd; diff --git a/src/ioc/dbStatic/dbStaticIocRegister.c b/src/ioc/dbStatic/dbStaticIocRegister.c index b77b0d29c..079f2d6e5 100644 --- a/src/ioc/dbStatic/dbStaticIocRegister.c +++ b/src/ioc/dbStatic/dbStaticIocRegister.c @@ -151,7 +151,7 @@ static void dbReportDeviceConfigCallFunc(const iocshArgBuf *args) dbReportDeviceConfig(*iocshPpdbbase,stdout); } -void epicsShareAPI dbStaticIocRegister(void) +void dbStaticIocRegister(void) { iocshRegister(&dbDumpPathFuncDef, dbDumpPathCallFunc); iocshRegister(&dbDumpRecordFuncDef, dbDumpRecordCallFunc); diff --git a/src/ioc/dbStatic/dbStaticIocRegister.h b/src/ioc/dbStatic/dbStaticIocRegister.h index 762f2b123..0b7ff743b 100644 --- a/src/ioc/dbStatic/dbStaticIocRegister.h +++ b/src/ioc/dbStatic/dbStaticIocRegister.h @@ -16,7 +16,7 @@ extern "C" { #endif -epicsShareFunc void epicsShareAPI dbStaticIocRegister(void); +epicsShareFunc void dbStaticIocRegister(void); #ifdef __cplusplus } diff --git a/src/ioc/dbStatic/dbStaticLib.c b/src/ioc/dbStatic/dbStaticLib.c index c498397b8..80b02e5e3 100644 --- a/src/ioc/dbStatic/dbStaticLib.c +++ b/src/ioc/dbStatic/dbStaticLib.c @@ -204,7 +204,7 @@ static void entryErrMessage(DBENTRY *pdbentry,long status,char *mess); static void zeroDbentry(DBENTRY *pdbentry); static char *getpMessage(DBENTRY *pdbentry); static long putPvLink(DBENTRY *pdbentry,short pvlMask,const char *pvname); -static long epicsShareAPI dbAddOnePath (DBBASE *pdbbase, const char *path, unsigned length); +static long dbAddOnePath (DBBASE *pdbbase, const char *path, unsigned length); /* internal routines*/ static FILE *openOutstream(const char *filename) @@ -531,7 +531,7 @@ dbDeviceMenu *dbGetDeviceMenu(DBENTRY *pdbentry) /* Beginning of Public Routines */ #define INC_SIZE 256 -void epicsShareAPI dbCatString(char **string,int *stringLength,char *src,char *separator) +void dbCatString(char **string,int *stringLength,char *src,char *separator) { if((*string==NULL) || ((strlen(*string)+strlen(src)+2) > (size_t)*stringLength)) { @@ -557,7 +557,7 @@ void epicsShareAPI dbCatString(char **string,int *stringLength,char *src,char *s *stringLength += strlen(src); } -dbBase * epicsShareAPI dbAllocBase(void) +dbBase * dbAllocBase(void) { dbBase *pdbbase; @@ -574,7 +574,7 @@ dbBase * epicsShareAPI dbAllocBase(void) dbPvdInitPvt(pdbbase); return (pdbbase); } -void epicsShareAPI dbFreeBase(dbBase *pdbbase) +void dbFreeBase(dbBase *pdbbase) { dbMenu *pdbMenu; dbMenu *pdbMenuNext; @@ -744,7 +744,7 @@ void epicsShareAPI dbFreeBase(dbBase *pdbbase) return; } -DBENTRY * epicsShareAPI dbAllocEntry(dbBase *pdbbase) +DBENTRY * dbAllocEntry(dbBase *pdbbase) { DBENTRY *pdbentry; @@ -754,20 +754,20 @@ DBENTRY * epicsShareAPI dbAllocEntry(dbBase *pdbbase) return(pdbentry); } -void epicsShareAPI dbFreeEntry(DBENTRY *pdbentry) +void dbFreeEntry(DBENTRY *pdbentry) { if(pdbentry->message) free((void *)pdbentry->message); if(pdbentry->formpvt) dbFreeForm(pdbentry); dbmfFree(pdbentry); } -void epicsShareAPI dbInitEntry(dbBase *pdbbase,DBENTRY *pdbentry) +void dbInitEntry(dbBase *pdbbase,DBENTRY *pdbentry) { memset((char *)pdbentry,'\0',sizeof(DBENTRY)); pdbentry->pdbbase = pdbbase; } -void epicsShareAPI dbFinishEntry(DBENTRY *pdbentry) +void dbFinishEntry(DBENTRY *pdbentry) { if(pdbentry->message) { free((void *)pdbentry->message); @@ -776,7 +776,7 @@ void epicsShareAPI dbFinishEntry(DBENTRY *pdbentry) if(pdbentry->formpvt) dbFreeForm(pdbentry); } -DBENTRY * epicsShareAPI dbCopyEntry(DBENTRY *pdbentry) +DBENTRY * dbCopyEntry(DBENTRY *pdbentry) { DBENTRY *pnew; @@ -787,7 +787,7 @@ DBENTRY * epicsShareAPI dbCopyEntry(DBENTRY *pdbentry) return(pnew); } -void epicsShareAPI dbCopyEntryContents(DBENTRY *pfrom,DBENTRY *pto) +void dbCopyEntryContents(DBENTRY *pfrom,DBENTRY *pto) { *pto = *pfrom; pto->message = NULL; @@ -795,7 +795,7 @@ void epicsShareAPI dbCopyEntryContents(DBENTRY *pfrom,DBENTRY *pto) } -long epicsShareAPI dbPath(DBBASE *pdbbase,const char *path) +long dbPath(DBBASE *pdbbase,const char *path) { if(!pdbbase) return(-1); dbFreePath(pdbbase); @@ -803,7 +803,7 @@ long epicsShareAPI dbPath(DBBASE *pdbbase,const char *path) return(dbAddPath(pdbbase,path)); } -long epicsShareAPI dbAddPath(DBBASE *pdbbase,const char *path) +long dbAddPath(DBBASE *pdbbase,const char *path) { ELLLIST *ppathList; const char *pcolon; @@ -875,7 +875,7 @@ long epicsShareAPI dbAddPath(DBBASE *pdbbase,const char *path) return(0); } -static long epicsShareAPI dbAddOnePath (DBBASE *pdbbase, const char *path, unsigned length) +static long dbAddOnePath (DBBASE *pdbbase, const char *path, unsigned length) { ELLLIST *ppathList; dbPathNode *pdbPathNode; @@ -892,7 +892,7 @@ static long epicsShareAPI dbAddOnePath (DBBASE *pdbbase, const char *path, unsig } -long epicsShareAPI dbWriteRecord(DBBASE *ppdbbase,const char *filename, +long dbWriteRecord(DBBASE *ppdbbase,const char *filename, const char *precordTypename,int level) { FILE *stream; @@ -905,7 +905,7 @@ long epicsShareAPI dbWriteRecord(DBBASE *ppdbbase,const char *filename, return status; } -long epicsShareAPI dbWriteRecordFP( +long dbWriteRecordFP( DBBASE *pdbbase,FILE *fp,const char *precordTypename,int level) { DBENTRY dbentry; @@ -989,7 +989,7 @@ long epicsShareAPI dbWriteRecordFP( return(0); } -long epicsShareAPI dbWriteMenu( +long dbWriteMenu( DBBASE *ppdbbase,const char *filename,const char *menuName) { FILE *stream; @@ -1001,7 +1001,7 @@ long epicsShareAPI dbWriteMenu( return status; } -long epicsShareAPI dbWriteMenuFP(DBBASE *pdbbase,FILE *fp,const char *menuName) +long dbWriteMenuFP(DBBASE *pdbbase,FILE *fp,const char *menuName) { dbMenu *pdbMenu; int gotMatch; @@ -1032,7 +1032,7 @@ long epicsShareAPI dbWriteMenuFP(DBBASE *pdbbase,FILE *fp,const char *menuName) return(0); } -long epicsShareAPI dbWriteRecordType( +long dbWriteRecordType( DBBASE *pdbbase,const char *filename,const char *recordTypeName) { FILE *stream; @@ -1044,7 +1044,7 @@ long epicsShareAPI dbWriteRecordType( return status; } -long epicsShareAPI dbWriteRecordTypeFP( +long dbWriteRecordTypeFP( DBBASE *pdbbase,FILE *fp,const char *recordTypeName) { dbRecordType *pdbRecordType; @@ -1129,7 +1129,7 @@ long epicsShareAPI dbWriteRecordTypeFP( return(0); } -long epicsShareAPI dbWriteDevice(DBBASE *pdbbase,const char *filename) +long dbWriteDevice(DBBASE *pdbbase,const char *filename) { FILE *stream; long status; @@ -1140,7 +1140,7 @@ long epicsShareAPI dbWriteDevice(DBBASE *pdbbase,const char *filename) return status; } -long epicsShareAPI dbWriteDeviceFP(DBBASE *pdbbase,FILE *fp) +long dbWriteDeviceFP(DBBASE *pdbbase,FILE *fp) { dbRecordType *pdbRecordType; devSup *pdevSup; @@ -1171,7 +1171,7 @@ long epicsShareAPI dbWriteDeviceFP(DBBASE *pdbbase,FILE *fp) return(0); } -long epicsShareAPI dbWriteDriver(DBBASE *pdbbase,const char *filename) +long dbWriteDriver(DBBASE *pdbbase,const char *filename) { FILE *stream; long status; @@ -1182,7 +1182,7 @@ long epicsShareAPI dbWriteDriver(DBBASE *pdbbase,const char *filename) return status; } -long epicsShareAPI dbWriteDriverFP(DBBASE *pdbbase,FILE *fp) +long dbWriteDriverFP(DBBASE *pdbbase,FILE *fp) { drvSup *pdrvSup; @@ -1197,7 +1197,7 @@ long epicsShareAPI dbWriteDriverFP(DBBASE *pdbbase,FILE *fp) return(0); } -long epicsShareAPI dbWriteRegistrarFP(DBBASE *pdbbase,FILE *fp) +long dbWriteRegistrarFP(DBBASE *pdbbase,FILE *fp) { dbText *ptext; @@ -1212,7 +1212,7 @@ long epicsShareAPI dbWriteRegistrarFP(DBBASE *pdbbase,FILE *fp) return(0); } -long epicsShareAPI dbWriteFunctionFP(DBBASE *pdbbase,FILE *fp) +long dbWriteFunctionFP(DBBASE *pdbbase,FILE *fp) { dbText *ptext; @@ -1227,7 +1227,7 @@ long epicsShareAPI dbWriteFunctionFP(DBBASE *pdbbase,FILE *fp) return(0); } -long epicsShareAPI dbWriteVariableFP(DBBASE *pdbbase,FILE *fp) +long dbWriteVariableFP(DBBASE *pdbbase,FILE *fp) { dbVariableDef *pvar; @@ -1242,7 +1242,7 @@ long epicsShareAPI dbWriteVariableFP(DBBASE *pdbbase,FILE *fp) return(0); } -long epicsShareAPI dbWriteBreaktable(DBBASE *pdbbase,const char *filename) +long dbWriteBreaktable(DBBASE *pdbbase,const char *filename) { FILE *stream; long status; @@ -1253,7 +1253,7 @@ long epicsShareAPI dbWriteBreaktable(DBBASE *pdbbase,const char *filename) return status; } -long epicsShareAPI dbWriteBreaktableFP(DBBASE *pdbbase,FILE *fp) +long dbWriteBreaktableFP(DBBASE *pdbbase,FILE *fp) { brkTable *pbrkTable; brkInt *pbrkInt; @@ -1277,7 +1277,7 @@ long epicsShareAPI dbWriteBreaktableFP(DBBASE *pdbbase,FILE *fp) return(0); } -long epicsShareAPI dbFindRecordType(DBENTRY *pdbentry,const char *recordType) +long dbFindRecordType(DBENTRY *pdbentry,const char *recordType) { dbBase *pdbbase = pdbentry->pdbbase; GPHENTRY *phash; @@ -1289,7 +1289,7 @@ long epicsShareAPI dbFindRecordType(DBENTRY *pdbentry,const char *recordType) return(0); } -long epicsShareAPI dbFirstRecordType(DBENTRY *pdbentry) +long dbFirstRecordType(DBENTRY *pdbentry) { dbRecordType *precordType; @@ -1300,7 +1300,7 @@ long epicsShareAPI dbFirstRecordType(DBENTRY *pdbentry) return(0); } -long epicsShareAPI dbNextRecordType(DBENTRY *pdbentry) +long dbNextRecordType(DBENTRY *pdbentry) { dbRecordType *precordType = pdbentry->precordType; @@ -1311,17 +1311,17 @@ long epicsShareAPI dbNextRecordType(DBENTRY *pdbentry) return(0); } -char * epicsShareAPI dbGetRecordTypeName(DBENTRY *pdbentry) +char * dbGetRecordTypeName(DBENTRY *pdbentry) { return(pdbentry->precordType->name); } -int epicsShareAPI dbGetNRecordTypes(DBENTRY *pdbentry) +int dbGetNRecordTypes(DBENTRY *pdbentry) { return(ellCount(&pdbentry->pdbbase->recordTypeList)); } -long epicsShareAPI dbPutRecordAttribute( +long dbPutRecordAttribute( DBENTRY *pdbentry, const char *name, const char*value) { dbRecordType *precordType = pdbentry->precordType; @@ -1368,7 +1368,7 @@ long epicsShareAPI dbPutRecordAttribute( return(0); } -long epicsShareAPI dbGetAttributePart(DBENTRY *pdbentry, const char **ppname) +long dbGetAttributePart(DBENTRY *pdbentry, const char **ppname) { dbRecordType *precordType = pdbentry->precordType; const char *pname = *ppname; @@ -1392,19 +1392,19 @@ long epicsShareAPI dbGetAttributePart(DBENTRY *pdbentry, const char **ppname) return S_dbLib_fieldNotFound; } -long epicsShareAPI dbGetRecordAttribute(DBENTRY *pdbentry, const char *pname) +long dbGetRecordAttribute(DBENTRY *pdbentry, const char *pname) { return dbGetAttributePart(pdbentry, &pname); } -long epicsShareAPI dbFirstField(DBENTRY *pdbentry,int dctonly) +long dbFirstField(DBENTRY *pdbentry,int dctonly) { pdbentry->indfield = -1; return(dbNextField(pdbentry,dctonly)); } -long epicsShareAPI dbNextField(DBENTRY *pdbentry,int dctonly) +long dbNextField(DBENTRY *pdbentry,int dctonly) { dbRecordType *precordType = pdbentry->precordType; dbRecordNode *precnode = pdbentry->precnode; @@ -1440,7 +1440,7 @@ long epicsShareAPI dbNextField(DBENTRY *pdbentry,int dctonly) } } -int epicsShareAPI dbGetFieldType(DBENTRY *pdbentry) +int dbGetFieldType(DBENTRY *pdbentry) { dbFldDes *pflddes = pdbentry->pflddes; long status; @@ -1453,7 +1453,7 @@ int epicsShareAPI dbGetFieldType(DBENTRY *pdbentry) return(mapDBFtoDCT[pflddes->field_type]); } -int epicsShareAPI dbGetNFields(DBENTRY *pdbentry,int dctonly) +int dbGetNFields(DBENTRY *pdbentry,int dctonly) { dbRecordType *precordType = pdbentry->precordType; dbFldDes *pflddes; @@ -1470,7 +1470,7 @@ int epicsShareAPI dbGetNFields(DBENTRY *pdbentry,int dctonly) return(n); } -char * epicsShareAPI dbGetFieldName(DBENTRY *pdbentry) +char * dbGetFieldName(DBENTRY *pdbentry) { dbFldDes *pflddes = pdbentry->pflddes; @@ -1478,7 +1478,7 @@ char * epicsShareAPI dbGetFieldName(DBENTRY *pdbentry) return(pflddes->name); } -char * epicsShareAPI dbGetDefault(DBENTRY *pdbentry) +char * dbGetDefault(DBENTRY *pdbentry) { dbFldDes *pflddes = pdbentry->pflddes; @@ -1486,7 +1486,7 @@ char * epicsShareAPI dbGetDefault(DBENTRY *pdbentry) return(pflddes->initial); } -char * epicsShareAPI dbGetPrompt(DBENTRY *pdbentry) +char * dbGetPrompt(DBENTRY *pdbentry) { dbFldDes *pflddes = pdbentry->pflddes; @@ -1494,7 +1494,7 @@ char * epicsShareAPI dbGetPrompt(DBENTRY *pdbentry) return(&pflddes->prompt[0]); } -int epicsShareAPI dbGetPromptGroup(DBENTRY *pdbentry) +int dbGetPromptGroup(DBENTRY *pdbentry) { dbFldDes *pflddes = pdbentry->pflddes; @@ -1502,7 +1502,7 @@ int epicsShareAPI dbGetPromptGroup(DBENTRY *pdbentry) return(pflddes->promptgroup); } -long epicsShareAPI dbCreateRecord(DBENTRY *pdbentry,const char *precordName) +long dbCreateRecord(DBENTRY *pdbentry,const char *precordName) { dbRecordType *precordType = pdbentry->precordType; dbFldDes *pdbFldDes; @@ -1549,7 +1549,7 @@ long epicsShareAPI dbCreateRecord(DBENTRY *pdbentry,const char *precordName) return(0); } -long epicsShareAPI dbDeleteAliases(DBENTRY *pdbentry) +long dbDeleteAliases(DBENTRY *pdbentry) { dbBase *pdbbase = pdbentry->pdbbase; dbRecordType *precordType = pdbentry->precordType; @@ -1578,7 +1578,7 @@ long epicsShareAPI dbDeleteAliases(DBENTRY *pdbentry) return 0; } -long epicsShareAPI dbDeleteRecord(DBENTRY *pdbentry) +long dbDeleteRecord(DBENTRY *pdbentry) { dbBase *pdbbase = pdbentry->pdbbase; dbRecordType *precordType = pdbentry->precordType; @@ -1608,7 +1608,7 @@ long epicsShareAPI dbDeleteRecord(DBENTRY *pdbentry) return 0; } -long epicsShareAPI dbFreeRecords(DBBASE *pdbbase) +long dbFreeRecords(DBBASE *pdbbase) { DBENTRY dbentry; dbRecordType *pdbRecordType; @@ -1631,7 +1631,7 @@ long epicsShareAPI dbFreeRecords(DBBASE *pdbbase) return(0); } -long epicsShareAPI dbFindRecordPart(DBENTRY *pdbentry, const char **ppname) +long dbFindRecordPart(DBENTRY *pdbentry, const char **ppname) { dbBase *pdbbase = pdbentry->pdbbase; const char *pname = *ppname; @@ -1657,7 +1657,7 @@ long epicsShareAPI dbFindRecordPart(DBENTRY *pdbentry, const char **ppname) return 0; } -long epicsShareAPI dbFindRecord(DBENTRY *pdbentry, const char *pname) +long dbFindRecord(DBENTRY *pdbentry, const char *pname) { long status = dbFindRecordPart(pdbentry, &pname); @@ -1667,7 +1667,7 @@ long epicsShareAPI dbFindRecord(DBENTRY *pdbentry, const char *pname) return 0; } -long epicsShareAPI dbFirstRecord(DBENTRY *pdbentry) +long dbFirstRecord(DBENTRY *pdbentry) { dbRecordType *precordType = pdbentry->precordType; dbRecordNode *precnode; @@ -1681,7 +1681,7 @@ long epicsShareAPI dbFirstRecord(DBENTRY *pdbentry) return(0); } -long epicsShareAPI dbNextRecord(DBENTRY *pdbentry) +long dbNextRecord(DBENTRY *pdbentry) { dbRecordNode *precnode=pdbentry->precnode; long status=0; @@ -1694,7 +1694,7 @@ long epicsShareAPI dbNextRecord(DBENTRY *pdbentry) return(status); } -int epicsShareAPI dbGetNRecords(DBENTRY *pdbentry) +int dbGetNRecords(DBENTRY *pdbentry) { dbRecordType *precordType = pdbentry->precordType; @@ -1702,7 +1702,7 @@ int epicsShareAPI dbGetNRecords(DBENTRY *pdbentry) return(ellCount(&precordType->recList)); } -int epicsShareAPI dbGetNAliases(DBENTRY *pdbentry) +int dbGetNAliases(DBENTRY *pdbentry) { dbRecordType *precordType = pdbentry->precordType; @@ -1710,7 +1710,7 @@ int epicsShareAPI dbGetNAliases(DBENTRY *pdbentry) return(precordType->no_aliases); } -char * epicsShareAPI dbGetRecordName(DBENTRY *pdbentry) +char * dbGetRecordName(DBENTRY *pdbentry) { dbRecordType *pdbRecordType = pdbentry->precordType; dbRecordNode *precnode = pdbentry->precnode; @@ -1720,7 +1720,7 @@ char * epicsShareAPI dbGetRecordName(DBENTRY *pdbentry) return precnode->recordname; } -long epicsShareAPI dbRenameRecord(DBENTRY *pdbentry,const char *newName) +long dbRenameRecord(DBENTRY *pdbentry,const char *newName) { dbBase *pdbbase = pdbentry->pdbbase; dbRecordType *precordType = pdbentry->precordType; @@ -1766,7 +1766,7 @@ long epicsShareAPI dbRenameRecord(DBENTRY *pdbentry,const char *newName) return(dbFindRecord(pdbentry,newName)); } -long epicsShareAPI dbVisibleRecord(DBENTRY *pdbentry) +long dbVisibleRecord(DBENTRY *pdbentry) { dbRecordNode *precnode = pdbentry->precnode; @@ -1775,7 +1775,7 @@ long epicsShareAPI dbVisibleRecord(DBENTRY *pdbentry) return 0; } -long epicsShareAPI dbInvisibleRecord(DBENTRY *pdbentry) +long dbInvisibleRecord(DBENTRY *pdbentry) { dbRecordNode *precnode = pdbentry->precnode; @@ -1784,7 +1784,7 @@ long epicsShareAPI dbInvisibleRecord(DBENTRY *pdbentry) return 0; } -int epicsShareAPI dbIsVisibleRecord(DBENTRY *pdbentry) +int dbIsVisibleRecord(DBENTRY *pdbentry) { dbRecordNode *precnode = pdbentry->precnode; @@ -1792,7 +1792,7 @@ int epicsShareAPI dbIsVisibleRecord(DBENTRY *pdbentry) return precnode->flags & DBRN_FLAGS_VISIBLE ? 1 : 0; } -long epicsShareAPI dbCreateAlias(DBENTRY *pdbentry, const char *alias) +long dbCreateAlias(DBENTRY *pdbentry, const char *alias) { dbRecordType *precordType = pdbentry->precordType; dbRecordNode *precnode = pdbentry->precnode; @@ -1834,7 +1834,7 @@ long epicsShareAPI dbCreateAlias(DBENTRY *pdbentry, const char *alias) return 0; } -int epicsShareAPI dbIsAlias(DBENTRY *pdbentry) +int dbIsAlias(DBENTRY *pdbentry) { dbRecordNode *precnode = pdbentry->precnode; @@ -1842,7 +1842,7 @@ int epicsShareAPI dbIsAlias(DBENTRY *pdbentry) return precnode->flags & DBRN_FLAGS_ISALIAS ? 1 : 0; } -long epicsShareAPI dbCopyRecord(DBENTRY *pdbentry,const char *newRecordName,int overWriteOK) +long dbCopyRecord(DBENTRY *pdbentry,const char *newRecordName,int overWriteOK) { dbRecordType *precordType = pdbentry->precordType; dbFldDes *pdbFldDes; @@ -1896,7 +1896,7 @@ long epicsShareAPI dbCopyRecord(DBENTRY *pdbentry,const char *newRecordName,int return(dbFindRecord(pdbentry,newRecordName)); } -long epicsShareAPI dbFindFieldPart(DBENTRY *pdbentry,const char **ppname) +long dbFindFieldPart(DBENTRY *pdbentry,const char **ppname) { dbRecordType *precordType = pdbentry->precordType; dbRecordNode *precnode = pdbentry->precnode; @@ -1962,7 +1962,7 @@ long epicsShareAPI dbFindFieldPart(DBENTRY *pdbentry,const char **ppname) return S_dbLib_fieldNotFound; } -long epicsShareAPI dbFindField(DBENTRY *pdbentry,const char *pname) +long dbFindField(DBENTRY *pdbentry,const char *pname) { long status = dbFindFieldPart(pdbentry, &pname); int ch; @@ -1976,10 +1976,10 @@ long epicsShareAPI dbFindField(DBENTRY *pdbentry,const char *pname) return S_dbLib_recNotFound; } -int epicsShareAPI dbFoundField(DBENTRY *pdbentry) +int dbFoundField(DBENTRY *pdbentry) { return((pdbentry->pfield) ? TRUE : FALSE); } -char * epicsShareAPI dbGetString(DBENTRY *pdbentry) +char * dbGetString(DBENTRY *pdbentry) { dbFldDes *pflddes = pdbentry->pflddes; void *pfield = pdbentry->pfield; @@ -2165,7 +2165,7 @@ static void cvtDecimalOrHexToShort(char *from,short *value) } } -long epicsShareAPI dbPutString(DBENTRY *pdbentry,const char *pstring) +long dbPutString(DBENTRY *pdbentry,const char *pstring) { dbFldDes *pflddes = pdbentry->pflddes; void *pfield = pdbentry->pfield; @@ -2561,7 +2561,7 @@ done: return(status); } -char * epicsShareAPI dbVerify(DBENTRY *pdbentry,const char *pstring) +char * dbVerify(DBENTRY *pdbentry,const char *pstring) { dbFldDes *pflddes = pdbentry->pflddes; char *message; @@ -2714,7 +2714,7 @@ char * epicsShareAPI dbVerify(DBENTRY *pdbentry,const char *pstring) return (message); } -char *epicsShareAPI dbGetRange(DBENTRY *pdbentry) +char *dbGetRange(DBENTRY *pdbentry) { dbFldDes *pflddes = pdbentry->pflddes; char *message; @@ -2744,7 +2744,7 @@ char *epicsShareAPI dbGetRange(DBENTRY *pdbentry) return (message); } -long epicsShareAPI dbFirstInfo(DBENTRY *pdbentry) +long dbFirstInfo(DBENTRY *pdbentry) { dbRecordNode *precnode = pdbentry->precnode; @@ -2755,7 +2755,7 @@ long epicsShareAPI dbFirstInfo(DBENTRY *pdbentry) return (pdbentry->pinfonode ? 0 : S_dbLib_infoNotFound); } -long epicsShareAPI dbNextInfo(DBENTRY *pdbentry) +long dbNextInfo(DBENTRY *pdbentry) { dbRecordNode *precnode = pdbentry->precnode; dbInfoNode *pinfo; @@ -2769,7 +2769,7 @@ long epicsShareAPI dbNextInfo(DBENTRY *pdbentry) return (pinfo ? 0 : S_dbLib_infoNotFound); } -long epicsShareAPI dbFindInfo(DBENTRY *pdbentry,const char *name) +long dbFindInfo(DBENTRY *pdbentry,const char *name) { dbRecordNode *precnode = pdbentry->precnode; dbInfoNode *pinfo; @@ -2788,7 +2788,7 @@ long epicsShareAPI dbFindInfo(DBENTRY *pdbentry,const char *name) return (S_dbLib_infoNotFound); } -long epicsShareAPI dbDeleteInfo(DBENTRY *pdbentry) +long dbDeleteInfo(DBENTRY *pdbentry) { dbRecordNode *precnode = pdbentry->precnode; dbInfoNode *pinfo = pdbentry->pinfonode; @@ -2803,21 +2803,21 @@ long epicsShareAPI dbDeleteInfo(DBENTRY *pdbentry) return (0); } -const char * epicsShareAPI dbGetInfoName(DBENTRY *pdbentry) +const char * dbGetInfoName(DBENTRY *pdbentry) { dbInfoNode *pinfo = pdbentry->pinfonode; if (!pinfo) return (NULL); return (pinfo->name); } -const char * epicsShareAPI dbGetInfoString(DBENTRY *pdbentry) +const char * dbGetInfoString(DBENTRY *pdbentry) { dbInfoNode *pinfo = pdbentry->pinfonode; if (!pinfo) return (NULL); return (pinfo->string); } -long epicsShareAPI dbPutInfoString(DBENTRY *pdbentry,const char *string) +long dbPutInfoString(DBENTRY *pdbentry,const char *string) { dbInfoNode *pinfo = pdbentry->pinfonode; char *newstring; @@ -2829,7 +2829,7 @@ long epicsShareAPI dbPutInfoString(DBENTRY *pdbentry,const char *string) return (0); } -long epicsShareAPI dbPutInfoPointer(DBENTRY *pdbentry, void *pointer) +long dbPutInfoPointer(DBENTRY *pdbentry, void *pointer) { dbInfoNode *pinfo = pdbentry->pinfonode; if (!pinfo) return (S_dbLib_infoNotFound); @@ -2837,20 +2837,20 @@ long epicsShareAPI dbPutInfoPointer(DBENTRY *pdbentry, void *pointer) return (0); } -void * epicsShareAPI dbGetInfoPointer(DBENTRY *pdbentry) +void * dbGetInfoPointer(DBENTRY *pdbentry) { dbInfoNode *pinfo = pdbentry->pinfonode; if (!pinfo) return (NULL); return (pinfo->pointer); } -const char * epicsShareAPI dbGetInfo(DBENTRY *pdbentry,const char *name) +const char * dbGetInfo(DBENTRY *pdbentry,const char *name) { if (dbFindInfo(pdbentry, name)) return NULL; return dbGetInfoString(pdbentry); } -long epicsShareAPI dbPutInfo(DBENTRY *pdbentry,const char *name,const char *string) +long dbPutInfo(DBENTRY *pdbentry,const char *name,const char *string) { dbInfoNode *pinfo; dbRecordNode *precnode = pdbentry->precnode; @@ -2881,7 +2881,7 @@ long epicsShareAPI dbPutInfo(DBENTRY *pdbentry,const char *name,const char *stri return (0); } -brkTable * epicsShareAPI dbFindBrkTable(dbBase *pdbbase,const char *name) +brkTable * dbFindBrkTable(dbBase *pdbbase,const char *name) { GPHENTRY *pgph; @@ -2890,7 +2890,7 @@ brkTable * epicsShareAPI dbFindBrkTable(dbBase *pdbbase,const char *name) return((brkTable *)pgph->userPvt); } -dbMenu * epicsShareAPI dbFindMenu(dbBase *pdbbase,const char *name) +dbMenu * dbFindMenu(dbBase *pdbbase,const char *name) { GPHENTRY *pgph; @@ -2899,7 +2899,7 @@ dbMenu * epicsShareAPI dbFindMenu(dbBase *pdbbase,const char *name) return((dbMenu *)pgph->userPvt); } -char ** epicsShareAPI dbGetMenuChoices(DBENTRY *pdbentry) +char ** dbGetMenuChoices(DBENTRY *pdbentry) { dbFldDes *pflddes = pdbentry->pflddes; @@ -2923,7 +2923,7 @@ char ** epicsShareAPI dbGetMenuChoices(DBENTRY *pdbentry) } } -int epicsShareAPI dbGetNMenuChoices(DBENTRY *pdbentry) +int dbGetNMenuChoices(DBENTRY *pdbentry) { dbFldDes *pflddes = pdbentry->pflddes; @@ -2948,7 +2948,7 @@ int epicsShareAPI dbGetNMenuChoices(DBENTRY *pdbentry) return (-1); } -char * epicsShareAPI dbGetMenuStringFromIndex(DBENTRY *pdbentry, int index) +char * dbGetMenuStringFromIndex(DBENTRY *pdbentry, int index) { dbFldDes *pflddes = pdbentry->pflddes; @@ -2975,7 +2975,7 @@ char * epicsShareAPI dbGetMenuStringFromIndex(DBENTRY *pdbentry, int index) return (NULL); } -int epicsShareAPI dbGetMenuIndexFromString(DBENTRY *pdbentry, const char *choice) +int dbGetMenuIndexFromString(DBENTRY *pdbentry, const char *choice) { dbFldDes *pflddes = pdbentry->pflddes; int ind; @@ -3011,13 +3011,13 @@ int epicsShareAPI dbGetMenuIndexFromString(DBENTRY *pdbentry, const char *choice return (-1); } -drvSup * epicsShareAPI dbFindDriver(dbBase *pdbbase, const char *name) { +drvSup * dbFindDriver(dbBase *pdbbase, const char *name) { GPHENTRY *pgph = gphFind(pdbbase->pgpHash,name,&pdbbase->drvList); if (!pgph) return NULL; return (drvSup *) pgph->userPvt; } -int epicsShareAPI dbAllocForm(DBENTRY *psave) +int dbAllocForm(DBENTRY *psave) { DBENTRY dbEntry; DBENTRY *pdbentry= &dbEntry; @@ -3091,7 +3091,7 @@ done: return(nlines); } -long epicsShareAPI dbFreeForm(DBENTRY *pdbentry) +long dbFreeForm(DBENTRY *pdbentry) { if(pdbentry->formpvt) { free(pdbentry->formpvt); @@ -3100,7 +3100,7 @@ long epicsShareAPI dbFreeForm(DBENTRY *pdbentry) return(0); } -char ** epicsShareAPI dbGetFormPrompt(DBENTRY *pdbentry) +char ** dbGetFormPrompt(DBENTRY *pdbentry) { struct form *pform = pdbentry->formpvt; @@ -3108,7 +3108,7 @@ char ** epicsShareAPI dbGetFormPrompt(DBENTRY *pdbentry) return(pform->prompt); } -char ** epicsShareAPI dbGetFormValue(DBENTRY *pdbentry) +char ** dbGetFormValue(DBENTRY *pdbentry) { struct form *pform = pdbentry->formpvt; DBLINK *plink; @@ -3278,7 +3278,7 @@ char ** epicsShareAPI dbGetFormValue(DBENTRY *pdbentry) return(pform->value); } -long epicsShareAPI dbPutForm(DBENTRY *pdbentry,char **value) +long dbPutForm(DBENTRY *pdbentry,char **value) { struct form *pform = pdbentry->formpvt; DBLINK *plink; @@ -3633,7 +3633,7 @@ long epicsShareAPI dbPutForm(DBENTRY *pdbentry,char **value) return(status); } -char ** epicsShareAPI dbVerifyForm(DBENTRY *pdbentry,char **value) +char ** dbVerifyForm(DBENTRY *pdbentry,char **value) { struct form *pform = pdbentry->formpvt; DBLINK *plink; @@ -3659,7 +3659,7 @@ char ** epicsShareAPI dbVerifyForm(DBENTRY *pdbentry,char **value) return(NULL); } -char * epicsShareAPI dbGetRelatedField(DBENTRY *psave) +char * dbGetRelatedField(DBENTRY *psave) { DBENTRY dbEntry; DBENTRY *pdbentry= &dbEntry; @@ -3678,7 +3678,7 @@ char * epicsShareAPI dbGetRelatedField(DBENTRY *psave) return(rtnval); } -int epicsShareAPI dbGetNLinks(DBENTRY *pdbentry) +int dbGetNLinks(DBENTRY *pdbentry) { dbRecordType *precordType = pdbentry->precordType; @@ -3686,7 +3686,7 @@ int epicsShareAPI dbGetNLinks(DBENTRY *pdbentry) return((int)precordType->no_links); } -long epicsShareAPI dbGetLinkField(DBENTRY *pdbentry,int index) +long dbGetLinkField(DBENTRY *pdbentry,int index) { dbRecordType *precordType = pdbentry->precordType; dbFldDes *pflddes; @@ -3699,7 +3699,7 @@ long epicsShareAPI dbGetLinkField(DBENTRY *pdbentry,int index) return(0); } -int epicsShareAPI dbGetLinkType(DBENTRY *pdbentry) +int dbGetLinkType(DBENTRY *pdbentry) { dbFldDes *pflddes; DBLINK *plink; @@ -3730,7 +3730,7 @@ int epicsShareAPI dbGetLinkType(DBENTRY *pdbentry) return(-1); } -long epicsShareAPI dbCvtLinkToConstant(DBENTRY *pdbentry) +long dbCvtLinkToConstant(DBENTRY *pdbentry) { dbFldDes *pflddes; DBLINK *plink; @@ -3764,7 +3764,7 @@ long epicsShareAPI dbCvtLinkToConstant(DBENTRY *pdbentry) return(S_dbLib_badLink); } -long epicsShareAPI dbCvtLinkToPvlink(DBENTRY *pdbentry) +long dbCvtLinkToPvlink(DBENTRY *pdbentry) { dbFldDes *pflddes; DBLINK *plink; @@ -3794,7 +3794,7 @@ long epicsShareAPI dbCvtLinkToPvlink(DBENTRY *pdbentry) return(S_dbLib_badLink); } -void epicsShareAPI dbDumpPath(DBBASE *pdbbase) +void dbDumpPath(DBBASE *pdbbase) { ELLLIST *ppathList; dbPathNode *pdbPathNode; @@ -3817,7 +3817,7 @@ void epicsShareAPI dbDumpPath(DBBASE *pdbbase) return; } -void epicsShareAPI dbDumpRecord( +void dbDumpRecord( dbBase *pdbbase,const char *precordTypename,int level) { if(!pdbbase) { @@ -3827,7 +3827,7 @@ void epicsShareAPI dbDumpRecord( dbWriteRecordFP(pdbbase,stdout,precordTypename,level); } -void epicsShareAPI dbDumpMenu(dbBase *pdbbase,const char *menuName) +void dbDumpMenu(dbBase *pdbbase,const char *menuName) { if(!pdbbase) { fprintf(stderr,"pdbbase not specified\n"); @@ -3836,7 +3836,7 @@ void epicsShareAPI dbDumpMenu(dbBase *pdbbase,const char *menuName) dbWriteMenuFP(pdbbase,stdout,menuName); } -void epicsShareAPI dbDumpRecordType(DBBASE *pdbbase,const char *recordTypeName) +void dbDumpRecordType(DBBASE *pdbbase,const char *recordTypeName) { dbRecordType *pdbRecordType; dbFldDes *pdbFldDes; @@ -3878,7 +3878,7 @@ void epicsShareAPI dbDumpRecordType(DBBASE *pdbbase,const char *recordTypeName) } } -void epicsShareAPI dbDumpField( +void dbDumpField( DBBASE *pdbbase,const char *recordTypeName,const char *fname) { dbRecordType *pdbRecordType; @@ -3970,7 +3970,7 @@ void epicsShareAPI dbDumpField( } } -void epicsShareAPI dbDumpDevice(DBBASE *pdbbase,const char *recordTypeName) +void dbDumpDevice(DBBASE *pdbbase,const char *recordTypeName) { dbRecordType *pdbRecordType; devSup *pdevSup; @@ -4005,7 +4005,7 @@ void epicsShareAPI dbDumpDevice(DBBASE *pdbbase,const char *recordTypeName) } } -void epicsShareAPI dbDumpDriver(DBBASE *pdbbase) +void dbDumpDriver(DBBASE *pdbbase) { if(!pdbbase) { fprintf(stderr,"pdbbase not specified\n"); @@ -4014,7 +4014,7 @@ void epicsShareAPI dbDumpDriver(DBBASE *pdbbase) dbWriteDriverFP(pdbbase,stdout); } -void epicsShareAPI dbDumpRegistrar(DBBASE *pdbbase) +void dbDumpRegistrar(DBBASE *pdbbase) { if(!pdbbase) { fprintf(stderr,"pdbbase not specified\n"); @@ -4023,7 +4023,7 @@ void epicsShareAPI dbDumpRegistrar(DBBASE *pdbbase) dbWriteRegistrarFP(pdbbase,stdout); } -void epicsShareAPI dbDumpFunction(DBBASE *pdbbase) +void dbDumpFunction(DBBASE *pdbbase) { if(!pdbbase) { fprintf(stderr,"pdbbase not specified\n"); @@ -4032,7 +4032,7 @@ void epicsShareAPI dbDumpFunction(DBBASE *pdbbase) dbWriteFunctionFP(pdbbase,stdout); } -void epicsShareAPI dbDumpVariable(DBBASE *pdbbase) +void dbDumpVariable(DBBASE *pdbbase) { if(!pdbbase) { fprintf(stderr,"pdbbase not specified\n"); @@ -4041,7 +4041,7 @@ void epicsShareAPI dbDumpVariable(DBBASE *pdbbase) dbWriteVariableFP(pdbbase,stdout); } -void epicsShareAPI dbDumpBreaktable(DBBASE *pdbbase,const char *name) +void dbDumpBreaktable(DBBASE *pdbbase,const char *name) { brkTable *pbrkTable; brkInt *pbrkInt; @@ -4068,7 +4068,7 @@ void epicsShareAPI dbDumpBreaktable(DBBASE *pdbbase,const char *name) static char *bus[VXI_IO+1] = {"","","VME","CAMAC","AB", "GPIB","BITBUS","","","","","","INST","BBGPIB","VXI"}; -void epicsShareAPI dbReportDeviceConfig(dbBase *pdbbase,FILE *report) +void dbReportDeviceConfig(dbBase *pdbbase,FILE *report) { DBENTRY dbentry; DBENTRY *pdbentry=&dbentry; diff --git a/src/ioc/dbStatic/dbStaticLib.h b/src/ioc/dbStatic/dbStaticLib.h index a6347252b..0dbc184f8 100644 --- a/src/ioc/dbStatic/dbStaticLib.h +++ b/src/ioc/dbStatic/dbStaticLib.h @@ -63,189 +63,189 @@ typedef struct{ #define dbDumpFldDes dbDumpField /* Static database access routines*/ -epicsShareFunc DBBASE * epicsShareAPI dbAllocBase(void); -epicsShareFunc void epicsShareAPI dbFreeBase(DBBASE *pdbbase); -epicsShareFunc DBENTRY * epicsShareAPI dbAllocEntry(DBBASE *pdbbase); -epicsShareFunc void epicsShareAPI dbFreeEntry(DBENTRY *pdbentry); -epicsShareFunc void epicsShareAPI dbInitEntry(DBBASE *pdbbase, +epicsShareFunc DBBASE * dbAllocBase(void); +epicsShareFunc void dbFreeBase(DBBASE *pdbbase); +epicsShareFunc DBENTRY * dbAllocEntry(DBBASE *pdbbase); +epicsShareFunc void dbFreeEntry(DBENTRY *pdbentry); +epicsShareFunc void dbInitEntry(DBBASE *pdbbase, DBENTRY *pdbentry); -epicsShareFunc void epicsShareAPI dbFinishEntry(DBENTRY *pdbentry); -epicsShareFunc DBENTRY * epicsShareAPI dbCopyEntry(DBENTRY *pdbentry); -epicsShareFunc void epicsShareAPI dbCopyEntryContents(DBENTRY *pfrom, +epicsShareFunc void dbFinishEntry(DBENTRY *pdbentry); +epicsShareFunc DBENTRY * dbCopyEntry(DBENTRY *pdbentry); +epicsShareFunc void dbCopyEntryContents(DBENTRY *pfrom, DBENTRY *pto); epicsShareExtern int dbBptNotMonotonic; -epicsShareFunc long epicsShareAPI dbReadDatabase(DBBASE **ppdbbase, +epicsShareFunc long dbReadDatabase(DBBASE **ppdbbase, const char *filename, const char *path, const char *substitutions); -epicsShareFunc long epicsShareAPI dbReadDatabaseFP(DBBASE **ppdbbase, +epicsShareFunc long dbReadDatabaseFP(DBBASE **ppdbbase, FILE *fp, const char *path, const char *substitutions); -epicsShareFunc long epicsShareAPI dbPath(DBBASE *pdbbase, const char *path); -epicsShareFunc long epicsShareAPI dbAddPath(DBBASE *pdbbase, const char *path); -epicsShareFunc long epicsShareAPI dbWriteRecord(DBBASE *ppdbbase, +epicsShareFunc long dbPath(DBBASE *pdbbase, const char *path); +epicsShareFunc long dbAddPath(DBBASE *pdbbase, const char *path); +epicsShareFunc long dbWriteRecord(DBBASE *ppdbbase, const char *filename, const char *precordTypename, int level); -epicsShareFunc long epicsShareAPI dbWriteRecordFP(DBBASE *ppdbbase, +epicsShareFunc long dbWriteRecordFP(DBBASE *ppdbbase, FILE *fp, const char *precordTypename, int level); -epicsShareFunc long epicsShareAPI dbWriteMenu(DBBASE *pdbbase, +epicsShareFunc long dbWriteMenu(DBBASE *pdbbase, const char *filename, const char *menuName); -epicsShareFunc long epicsShareAPI dbWriteMenuFP(DBBASE *pdbbase, +epicsShareFunc long dbWriteMenuFP(DBBASE *pdbbase, FILE *fp, const char *menuName); -epicsShareFunc long epicsShareAPI dbWriteRecordType(DBBASE *pdbbase, +epicsShareFunc long dbWriteRecordType(DBBASE *pdbbase, const char *filename, const char *recordTypeName); -epicsShareFunc long epicsShareAPI dbWriteRecordTypeFP(DBBASE *pdbbase, +epicsShareFunc long dbWriteRecordTypeFP(DBBASE *pdbbase, FILE *fp, const char *recordTypeName); -epicsShareFunc long epicsShareAPI dbWriteDevice(DBBASE *pdbbase, +epicsShareFunc long dbWriteDevice(DBBASE *pdbbase, const char *filename); -epicsShareFunc long epicsShareAPI dbWriteDeviceFP(DBBASE *pdbbase, FILE *fp); -epicsShareFunc long epicsShareAPI dbWriteDriver(DBBASE *pdbbase, +epicsShareFunc long dbWriteDeviceFP(DBBASE *pdbbase, FILE *fp); +epicsShareFunc long dbWriteDriver(DBBASE *pdbbase, const char *filename); -epicsShareFunc long epicsShareAPI dbWriteDriverFP(DBBASE *pdbbase, FILE *fp); -epicsShareFunc long epicsShareAPI dbWriteRegistrarFP(DBBASE *pdbbase, FILE *fp); -epicsShareFunc long epicsShareAPI dbWriteFunctionFP(DBBASE *pdbbase, FILE *fp); -epicsShareFunc long epicsShareAPI dbWriteVariableFP(DBBASE *pdbbase, FILE *fp); -epicsShareFunc long epicsShareAPI dbWriteBreaktable(DBBASE *pdbbase, +epicsShareFunc long dbWriteDriverFP(DBBASE *pdbbase, FILE *fp); +epicsShareFunc long dbWriteRegistrarFP(DBBASE *pdbbase, FILE *fp); +epicsShareFunc long dbWriteFunctionFP(DBBASE *pdbbase, FILE *fp); +epicsShareFunc long dbWriteVariableFP(DBBASE *pdbbase, FILE *fp); +epicsShareFunc long dbWriteBreaktable(DBBASE *pdbbase, const char *filename); -epicsShareFunc long epicsShareAPI dbWriteBreaktableFP(DBBASE *pdbbase, +epicsShareFunc long dbWriteBreaktableFP(DBBASE *pdbbase, FILE *fp); -epicsShareFunc long epicsShareAPI dbFindRecordType(DBENTRY *pdbentry, +epicsShareFunc long dbFindRecordType(DBENTRY *pdbentry, const char *recordTypename); -epicsShareFunc long epicsShareAPI dbFirstRecordType(DBENTRY *pdbentry); -epicsShareFunc long epicsShareAPI dbNextRecordType(DBENTRY *pdbentry); -epicsShareFunc char * epicsShareAPI dbGetRecordTypeName(DBENTRY *pdbentry); -epicsShareFunc int epicsShareAPI dbGetNRecordTypes(DBENTRY *pdbentry); -epicsShareFunc long epicsShareAPI dbPutRecordAttribute(DBENTRY *pdbentry, +epicsShareFunc long dbFirstRecordType(DBENTRY *pdbentry); +epicsShareFunc long dbNextRecordType(DBENTRY *pdbentry); +epicsShareFunc char * dbGetRecordTypeName(DBENTRY *pdbentry); +epicsShareFunc int dbGetNRecordTypes(DBENTRY *pdbentry); +epicsShareFunc long dbPutRecordAttribute(DBENTRY *pdbentry, const char *name, const char*value); -epicsShareFunc long epicsShareAPI dbGetRecordAttribute(DBENTRY *pdbentry, +epicsShareFunc long dbGetRecordAttribute(DBENTRY *pdbentry, const char *name); -epicsShareFunc long epicsShareAPI dbGetAttributePart(DBENTRY *pdbentry, +epicsShareFunc long dbGetAttributePart(DBENTRY *pdbentry, const char **ppname); -epicsShareFunc long epicsShareAPI dbFirstField(DBENTRY *pdbentry, int dctonly); -epicsShareFunc long epicsShareAPI dbNextField(DBENTRY *pdbentry, int dctonly); -epicsShareFunc int epicsShareAPI dbGetFieldType(DBENTRY *pdbentry); -epicsShareFunc int epicsShareAPI dbGetNFields(DBENTRY *pdbentry, int dctonly); -epicsShareFunc char * epicsShareAPI dbGetFieldName(DBENTRY *pdbentry); -epicsShareFunc char * epicsShareAPI dbGetDefault(DBENTRY *pdbentry); -epicsShareFunc char * epicsShareAPI dbGetPrompt(DBENTRY *pdbentry); -epicsShareFunc int epicsShareAPI dbGetPromptGroup(DBENTRY *pdbentry); +epicsShareFunc long dbFirstField(DBENTRY *pdbentry, int dctonly); +epicsShareFunc long dbNextField(DBENTRY *pdbentry, int dctonly); +epicsShareFunc int dbGetFieldType(DBENTRY *pdbentry); +epicsShareFunc int dbGetNFields(DBENTRY *pdbentry, int dctonly); +epicsShareFunc char * dbGetFieldName(DBENTRY *pdbentry); +epicsShareFunc char * dbGetDefault(DBENTRY *pdbentry); +epicsShareFunc char * dbGetPrompt(DBENTRY *pdbentry); +epicsShareFunc int dbGetPromptGroup(DBENTRY *pdbentry); -epicsShareFunc long epicsShareAPI dbCreateRecord(DBENTRY *pdbentry, +epicsShareFunc long dbCreateRecord(DBENTRY *pdbentry, const char *pname); -epicsShareFunc long epicsShareAPI dbDeleteRecord(DBENTRY *pdbentry); -epicsShareFunc long epicsShareAPI dbFreeRecords(DBBASE *pdbbase); -epicsShareFunc long epicsShareAPI dbFindRecordPart(DBENTRY *pdbentry, +epicsShareFunc long dbDeleteRecord(DBENTRY *pdbentry); +epicsShareFunc long dbFreeRecords(DBBASE *pdbbase); +epicsShareFunc long dbFindRecordPart(DBENTRY *pdbentry, const char **ppname); -epicsShareFunc long epicsShareAPI dbFindRecord(DBENTRY *pdbentry, +epicsShareFunc long dbFindRecord(DBENTRY *pdbentry, const char *pname); -epicsShareFunc long epicsShareAPI dbFirstRecord(DBENTRY *pdbentry); -epicsShareFunc long epicsShareAPI dbNextRecord(DBENTRY *pdbentry); -epicsShareFunc int epicsShareAPI dbGetNRecords(DBENTRY *pdbentry); -epicsShareFunc int epicsShareAPI dbGetNAliases(DBENTRY *pdbentry); -epicsShareFunc char * epicsShareAPI dbGetRecordName(DBENTRY *pdbentry); -epicsShareFunc long epicsShareAPI dbRenameRecord(DBENTRY *pdbentry, +epicsShareFunc long dbFirstRecord(DBENTRY *pdbentry); +epicsShareFunc long dbNextRecord(DBENTRY *pdbentry); +epicsShareFunc int dbGetNRecords(DBENTRY *pdbentry); +epicsShareFunc int dbGetNAliases(DBENTRY *pdbentry); +epicsShareFunc char * dbGetRecordName(DBENTRY *pdbentry); +epicsShareFunc long dbRenameRecord(DBENTRY *pdbentry, const char *newName); -epicsShareFunc long epicsShareAPI dbCopyRecord(DBENTRY *pdbentry, +epicsShareFunc long dbCopyRecord(DBENTRY *pdbentry, const char *newRecordName, int overWriteOK); -epicsShareFunc long epicsShareAPI dbVisibleRecord(DBENTRY *pdbentry); -epicsShareFunc long epicsShareAPI dbInvisibleRecord(DBENTRY *pdbentry); -epicsShareFunc int epicsShareAPI dbIsVisibleRecord(DBENTRY *pdbentry); +epicsShareFunc long dbVisibleRecord(DBENTRY *pdbentry); +epicsShareFunc long dbInvisibleRecord(DBENTRY *pdbentry); +epicsShareFunc int dbIsVisibleRecord(DBENTRY *pdbentry); -epicsShareFunc long epicsShareAPI dbCreateAlias(DBENTRY *pdbentry, +epicsShareFunc long dbCreateAlias(DBENTRY *pdbentry, const char *paliasName); -epicsShareFunc int epicsShareAPI dbIsAlias(DBENTRY *pdbentry); -epicsShareFunc long epicsShareAPI dbDeleteAliases(DBENTRY *pdbentry); +epicsShareFunc int dbIsAlias(DBENTRY *pdbentry); +epicsShareFunc long dbDeleteAliases(DBENTRY *pdbentry); -epicsShareFunc long epicsShareAPI dbFindFieldPart(DBENTRY *pdbentry, +epicsShareFunc long dbFindFieldPart(DBENTRY *pdbentry, const char **ppname); -epicsShareFunc long epicsShareAPI dbFindField(DBENTRY *pdbentry, +epicsShareFunc long dbFindField(DBENTRY *pdbentry, const char *pfieldName); -epicsShareFunc int epicsShareAPI dbFoundField(DBENTRY *pdbentry); -epicsShareFunc char * epicsShareAPI dbGetString(DBENTRY *pdbentry); -epicsShareFunc long epicsShareAPI dbPutString(DBENTRY *pdbentry, +epicsShareFunc int dbFoundField(DBENTRY *pdbentry); +epicsShareFunc char * dbGetString(DBENTRY *pdbentry); +epicsShareFunc long dbPutString(DBENTRY *pdbentry, const char *pstring); -epicsShareFunc char * epicsShareAPI dbVerify(DBENTRY *pdbentry, +epicsShareFunc char * dbVerify(DBENTRY *pdbentry, const char *pstring); -epicsShareFunc char * epicsShareAPI dbGetRange(DBENTRY *pdbentry); -epicsShareFunc int epicsShareAPI dbIsDefaultValue(DBENTRY *pdbentry); +epicsShareFunc char * dbGetRange(DBENTRY *pdbentry); +epicsShareFunc int dbIsDefaultValue(DBENTRY *pdbentry); -epicsShareFunc long epicsShareAPI dbFirstInfo(DBENTRY *pdbentry); -epicsShareFunc long epicsShareAPI dbNextInfo(DBENTRY *pdbentry); -epicsShareFunc long epicsShareAPI dbFindInfo(DBENTRY *pdbentry, +epicsShareFunc long dbFirstInfo(DBENTRY *pdbentry); +epicsShareFunc long dbNextInfo(DBENTRY *pdbentry); +epicsShareFunc long dbFindInfo(DBENTRY *pdbentry, const char *name); -epicsShareFunc long epicsShareAPI dbDeleteInfo(DBENTRY *pdbentry); -epicsShareFunc const char * epicsShareAPI dbGetInfoName(DBENTRY *pdbentry); -epicsShareFunc const char * epicsShareAPI dbGetInfoString(DBENTRY *pdbentry); -epicsShareFunc long epicsShareAPI dbPutInfoString(DBENTRY *pdbentry, +epicsShareFunc long dbDeleteInfo(DBENTRY *pdbentry); +epicsShareFunc const char * dbGetInfoName(DBENTRY *pdbentry); +epicsShareFunc const char * dbGetInfoString(DBENTRY *pdbentry); +epicsShareFunc long dbPutInfoString(DBENTRY *pdbentry, const char *string); -epicsShareFunc long epicsShareAPI dbPutInfoPointer(DBENTRY *pdbentry, +epicsShareFunc long dbPutInfoPointer(DBENTRY *pdbentry, void *pointer); -epicsShareFunc void * epicsShareAPI dbGetInfoPointer(DBENTRY *pdbentry); -epicsShareFunc const char * epicsShareAPI dbGetInfo(DBENTRY *pdbentry, +epicsShareFunc void * dbGetInfoPointer(DBENTRY *pdbentry); +epicsShareFunc const char * dbGetInfo(DBENTRY *pdbentry, const char *name); -epicsShareFunc long epicsShareAPI dbPutInfo(DBENTRY *pdbentry, +epicsShareFunc long dbPutInfo(DBENTRY *pdbentry, const char *name, const char *string); -epicsShareFunc brkTable * epicsShareAPI dbFindBrkTable(DBBASE *pdbbase, +epicsShareFunc brkTable * dbFindBrkTable(DBBASE *pdbbase, const char *name); -epicsShareFunc dbMenu * epicsShareAPI dbFindMenu(DBBASE *pdbbase, +epicsShareFunc dbMenu * dbFindMenu(DBBASE *pdbbase, const char *name); -epicsShareFunc char ** epicsShareAPI dbGetMenuChoices(DBENTRY *pdbentry); -epicsShareFunc int epicsShareAPI dbGetMenuIndex(DBENTRY *pdbentry); -epicsShareFunc long epicsShareAPI dbPutMenuIndex(DBENTRY *pdbentry, int index); -epicsShareFunc int epicsShareAPI dbGetNMenuChoices(DBENTRY *pdbentry); -epicsShareFunc char * epicsShareAPI dbGetMenuStringFromIndex(DBENTRY *pdbentry, +epicsShareFunc char ** dbGetMenuChoices(DBENTRY *pdbentry); +epicsShareFunc int dbGetMenuIndex(DBENTRY *pdbentry); +epicsShareFunc long dbPutMenuIndex(DBENTRY *pdbentry, int index); +epicsShareFunc int dbGetNMenuChoices(DBENTRY *pdbentry); +epicsShareFunc char * dbGetMenuStringFromIndex(DBENTRY *pdbentry, int index); -epicsShareFunc int epicsShareAPI dbGetMenuIndexFromString(DBENTRY *pdbentry, +epicsShareFunc int dbGetMenuIndexFromString(DBENTRY *pdbentry, const char *choice); -epicsShareFunc drvSup * epicsShareAPI dbFindDriver(dbBase *pdbbase, +epicsShareFunc drvSup * dbFindDriver(dbBase *pdbbase, const char *name); -epicsShareFunc int epicsShareAPI dbAllocForm(DBENTRY *pdbentry); -epicsShareFunc long epicsShareAPI dbFreeForm(DBENTRY *pdbentry); -epicsShareFunc char ** epicsShareAPI dbGetFormPrompt(DBENTRY *pdbentry); -epicsShareFunc char ** epicsShareAPI dbGetFormValue(DBENTRY *pdbentry); -epicsShareFunc long epicsShareAPI dbPutForm(DBENTRY *pdbentry, char **value); -epicsShareFunc char ** epicsShareAPI dbVerifyForm(DBENTRY *pdbentry, +epicsShareFunc int dbAllocForm(DBENTRY *pdbentry); +epicsShareFunc long dbFreeForm(DBENTRY *pdbentry); +epicsShareFunc char ** dbGetFormPrompt(DBENTRY *pdbentry); +epicsShareFunc char ** dbGetFormValue(DBENTRY *pdbentry); +epicsShareFunc long dbPutForm(DBENTRY *pdbentry, char **value); +epicsShareFunc char ** dbVerifyForm(DBENTRY *pdbentry, char **value); -epicsShareFunc char * epicsShareAPI dbGetRelatedField(DBENTRY *pdbentry); +epicsShareFunc char * dbGetRelatedField(DBENTRY *pdbentry); -epicsShareFunc int epicsShareAPI dbGetNLinks(DBENTRY *pdbentry); -epicsShareFunc long epicsShareAPI dbGetLinkField(DBENTRY *pdbentry, int index); -epicsShareFunc int epicsShareAPI dbGetLinkType(DBENTRY *pdbentry); -epicsShareFunc long epicsShareAPI dbCvtLinkToConstant(DBENTRY *pdbentry); -epicsShareFunc long epicsShareAPI dbCvtLinkToPvlink(DBENTRY *pdbentry); +epicsShareFunc int dbGetNLinks(DBENTRY *pdbentry); +epicsShareFunc long dbGetLinkField(DBENTRY *pdbentry, int index); +epicsShareFunc int dbGetLinkType(DBENTRY *pdbentry); +epicsShareFunc long dbCvtLinkToConstant(DBENTRY *pdbentry); +epicsShareFunc long dbCvtLinkToPvlink(DBENTRY *pdbentry); /* Dump routines */ -epicsShareFunc void epicsShareAPI dbDumpPath(DBBASE *pdbbase); -epicsShareFunc void epicsShareAPI dbDumpRecord(DBBASE *pdbbase, +epicsShareFunc void dbDumpPath(DBBASE *pdbbase); +epicsShareFunc void dbDumpRecord(DBBASE *pdbbase, const char *precordTypename, int level); -epicsShareFunc void epicsShareAPI dbDumpMenu(DBBASE *pdbbase, +epicsShareFunc void dbDumpMenu(DBBASE *pdbbase, const char *menuName); -epicsShareFunc void epicsShareAPI dbDumpRecordType(DBBASE *pdbbase, +epicsShareFunc void dbDumpRecordType(DBBASE *pdbbase, const char *recordTypeName); -epicsShareFunc void epicsShareAPI dbDumpField(DBBASE *pdbbase, +epicsShareFunc void dbDumpField(DBBASE *pdbbase, const char *recordTypeName, const char *fname); -epicsShareFunc void epicsShareAPI dbDumpDevice(DBBASE *pdbbase, +epicsShareFunc void dbDumpDevice(DBBASE *pdbbase, const char *recordTypeName); -epicsShareFunc void epicsShareAPI dbDumpDriver(DBBASE *pdbbase); -epicsShareFunc void epicsShareAPI dbDumpRegistrar(DBBASE *pdbbase); -epicsShareFunc void epicsShareAPI dbDumpFunction(DBBASE *pdbbase); -epicsShareFunc void epicsShareAPI dbDumpVariable(DBBASE *pdbbase); -epicsShareFunc void epicsShareAPI dbDumpBreaktable(DBBASE *pdbbase, +epicsShareFunc void dbDumpDriver(DBBASE *pdbbase); +epicsShareFunc void dbDumpRegistrar(DBBASE *pdbbase); +epicsShareFunc void dbDumpFunction(DBBASE *pdbbase); +epicsShareFunc void dbDumpVariable(DBBASE *pdbbase); +epicsShareFunc void dbDumpBreaktable(DBBASE *pdbbase, const char *name); -epicsShareFunc void epicsShareAPI dbPvdDump(DBBASE *pdbbase, int verbose); -epicsShareFunc void epicsShareAPI dbReportDeviceConfig(DBBASE *pdbbase, +epicsShareFunc void dbPvdDump(DBBASE *pdbbase, int verbose); +epicsShareFunc void dbReportDeviceConfig(DBBASE *pdbbase, FILE *report); /* Misc useful routines*/ #define dbCalloc(nobj,size) callocMustSucceed(nobj,size,"dbCalloc") #define dbMalloc(size) mallocMustSucceed(size,"dbMalloc") -epicsShareFunc void epicsShareAPI dbCatString(char **string, int *stringLength, +epicsShareFunc void dbCatString(char **string, int *stringLength, char *pnew, char *separator); extern int dbStaticDebug; diff --git a/src/ioc/dbStatic/dbStaticNoRun.c b/src/ioc/dbStatic/dbStaticNoRun.c index 33e3e452f..8bd56b255 100644 --- a/src/ioc/dbStatic/dbStaticNoRun.c +++ b/src/ioc/dbStatic/dbStaticNoRun.c @@ -179,7 +179,7 @@ char *dbRecordName(DBENTRY *pdbentry) int dbIsMacroOk(DBENTRY *pdbentry) { return(TRUE);} -epicsShareFunc int epicsShareAPI dbIsDefaultValue(DBENTRY *pdbentry) +epicsShareFunc int dbIsDefaultValue(DBENTRY *pdbentry) { dbFldDes *pflddes = pdbentry->pflddes; void *pfield = pdbentry->pfield; @@ -306,7 +306,7 @@ long dbPutStringNum(DBENTRY *pdbentry,const char *pstring) return(0); } -epicsShareFunc int epicsShareAPI dbGetMenuIndex(DBENTRY *pdbentry) +epicsShareFunc int dbGetMenuIndex(DBENTRY *pdbentry) { dbFldDes *pflddes = pdbentry->pflddes; int nChoices,choice; @@ -325,7 +325,7 @@ epicsShareFunc int epicsShareAPI dbGetMenuIndex(DBENTRY *pdbentry) return(-1); } -epicsShareFunc long epicsShareAPI dbPutMenuIndex(DBENTRY *pdbentry,int index) +epicsShareFunc long dbPutMenuIndex(DBENTRY *pdbentry,int index) { int nChoices; char **menuChoices; diff --git a/src/ioc/dbStatic/dbStaticRun.c b/src/ioc/dbStatic/dbStaticRun.c index c15b698a4..9b3febc83 100644 --- a/src/ioc/dbStatic/dbStaticRun.c +++ b/src/ioc/dbStatic/dbStaticRun.c @@ -329,7 +329,7 @@ char *dbRecordName(DBENTRY *pdbentry) int dbIsMacroOk(DBENTRY *pdbentry) { return(FALSE); } -epicsShareFunc int epicsShareAPI dbIsDefaultValue(DBENTRY *pdbentry) +epicsShareFunc int dbIsDefaultValue(DBENTRY *pdbentry) { dbFldDes *pflddes = pdbentry->pflddes; void *pfield = pdbentry->pfield; @@ -646,7 +646,7 @@ long dbPutStringNum(DBENTRY *pdbentry,const char *pstring) return(status); } -epicsShareFunc int epicsShareAPI dbGetMenuIndex(DBENTRY *pdbentry) +epicsShareFunc int dbGetMenuIndex(DBENTRY *pdbentry) { dbFldDes *pflddes = pdbentry->pflddes; void *pfield = pdbentry->pfield; @@ -663,7 +663,7 @@ epicsShareFunc int epicsShareAPI dbGetMenuIndex(DBENTRY *pdbentry) return(-1); } -epicsShareFunc long epicsShareAPI dbPutMenuIndex(DBENTRY *pdbentry,int index) +epicsShareFunc long dbPutMenuIndex(DBENTRY *pdbentry,int index) { dbFldDes *pflddes = pdbentry->pflddes; unsigned short *pfield = pdbentry->pfield; diff --git a/src/ioc/dbtemplate/dbLoadTemplate.h b/src/ioc/dbtemplate/dbLoadTemplate.h index 0de0235bb..a6ca60617 100644 --- a/src/ioc/dbtemplate/dbLoadTemplate.h +++ b/src/ioc/dbtemplate/dbLoadTemplate.h @@ -12,7 +12,7 @@ #define INCdbLoadTemplateh #include "shareLib.h" -epicsShareFunc int epicsShareAPI dbLoadTemplate( +epicsShareFunc int dbLoadTemplate( const char *sub_file, const char *cmd_collect); #endif /*INCdbLoadTemplateh*/ diff --git a/src/ioc/dbtemplate/dbLoadTemplate.y b/src/ioc/dbtemplate/dbLoadTemplate.y index 85be9e4e3..e8604fc91 100644 --- a/src/ioc/dbtemplate/dbLoadTemplate.y +++ b/src/ioc/dbtemplate/dbLoadTemplate.y @@ -308,7 +308,7 @@ static int yyerror(char* str) static int is_not_inited = 1; -int epicsShareAPI dbLoadTemplate(const char *sub_file, const char *cmd_collect) +int dbLoadTemplate(const char *sub_file, const char *cmd_collect) { FILE *fp; int i; diff --git a/src/ioc/dbtemplate/dbtoolsIocRegister.c b/src/ioc/dbtemplate/dbtoolsIocRegister.c index 3ff446872..201a32398 100644 --- a/src/ioc/dbtemplate/dbtoolsIocRegister.c +++ b/src/ioc/dbtemplate/dbtoolsIocRegister.c @@ -26,7 +26,7 @@ static void dbLoadTemplateCallFunc(const iocshArgBuf *args) } -void epicsShareAPI dbtoolsIocRegister(void) +void dbtoolsIocRegister(void) { iocshRegister(&dbLoadTemplateFuncDef, dbLoadTemplateCallFunc); } diff --git a/src/ioc/dbtemplate/dbtoolsIocRegister.h b/src/ioc/dbtemplate/dbtoolsIocRegister.h index 880f42d0f..ef35b2dfa 100644 --- a/src/ioc/dbtemplate/dbtoolsIocRegister.h +++ b/src/ioc/dbtemplate/dbtoolsIocRegister.h @@ -14,7 +14,7 @@ extern "C" { #endif -epicsShareFunc void epicsShareAPI dbtoolsIocRegister(void); +epicsShareFunc void dbtoolsIocRegister(void); #ifdef __cplusplus } diff --git a/src/ioc/misc/epicsRelease.c b/src/ioc/misc/epicsRelease.c index 03197d7a8..8623e86be 100644 --- a/src/ioc/misc/epicsRelease.c +++ b/src/ioc/misc/epicsRelease.c @@ -20,7 +20,7 @@ static const char id[] = "@(#) " EPICS_VERSION_STRING ", Misc. Utilities Library" __DATE__; -epicsShareFunc int epicsShareAPI coreRelease(void) +epicsShareFunc int coreRelease(void) { printf ( "############################################################################\n" ); printf ( "## %s\n", epicsReleaseVersion ); diff --git a/src/ioc/misc/epicsRelease.h b/src/ioc/misc/epicsRelease.h index eae6c7e17..298a1403b 100644 --- a/src/ioc/misc/epicsRelease.h +++ b/src/ioc/misc/epicsRelease.h @@ -17,7 +17,7 @@ extern "C" { #endif #include "shareLib.h" -epicsShareFunc int epicsShareAPI coreRelease(void); +epicsShareFunc int coreRelease(void); #ifdef __cplusplus } diff --git a/src/ioc/misc/iocshRegisterCommon.c b/src/ioc/misc/iocshRegisterCommon.c index 3e027eb6c..381bc3892 100644 --- a/src/ioc/misc/iocshRegisterCommon.c +++ b/src/ioc/misc/iocshRegisterCommon.c @@ -21,7 +21,7 @@ #include "miscIocRegister.h" #include "iocshRegisterCommon.h" -void epicsShareAPI iocshRegisterCommon(void) +void iocshRegisterCommon(void) { iocshPpdbbase = &pdbbase; diff --git a/src/ioc/misc/iocshRegisterCommon.h b/src/ioc/misc/iocshRegisterCommon.h index 6327d7c68..62a5d7c1b 100644 --- a/src/ioc/misc/iocshRegisterCommon.h +++ b/src/ioc/misc/iocshRegisterCommon.h @@ -19,7 +19,7 @@ extern "C" { #endif /* register many useful commands */ -epicsShareFunc void epicsShareAPI iocshRegisterCommon(void); +epicsShareFunc void iocshRegisterCommon(void); #ifdef __cplusplus } diff --git a/src/ioc/misc/miscIocRegister.c b/src/ioc/misc/miscIocRegister.c index 0d482f7cf..dfddbab45 100644 --- a/src/ioc/misc/miscIocRegister.c +++ b/src/ioc/misc/miscIocRegister.c @@ -54,7 +54,7 @@ static void coreReleaseCallFunc(const iocshArgBuf *args) } -void epicsShareAPI miscIocRegister(void) +void miscIocRegister(void) { iocshRegister(&iocInitFuncDef,iocInitCallFunc); iocshRegister(&iocBuildFuncDef,iocBuildCallFunc); diff --git a/src/ioc/misc/miscIocRegister.h b/src/ioc/misc/miscIocRegister.h index 28f67796e..78a54d620 100644 --- a/src/ioc/misc/miscIocRegister.h +++ b/src/ioc/misc/miscIocRegister.h @@ -16,7 +16,7 @@ extern "C" { #endif -epicsShareFunc void epicsShareAPI miscIocRegister(void); +epicsShareFunc void miscIocRegister(void); #ifdef __cplusplus } diff --git a/src/ioc/registry/registryCommon.c b/src/ioc/registry/registryCommon.c index 00055dc85..9d3609f0c 100644 --- a/src/ioc/registry/registryCommon.c +++ b/src/ioc/registry/registryCommon.c @@ -21,7 +21,7 @@ #include "registryCommon.h" -void epicsShareAPI registerRecordTypes(DBBASE *pbase, int nRecordTypes, +void registerRecordTypes(DBBASE *pbase, int nRecordTypes, const char * const *recordTypeNames, const recordTypeLocation *rtl) { int i; @@ -48,7 +48,7 @@ void epicsShareAPI registerRecordTypes(DBBASE *pbase, int nRecordTypes, } } -void epicsShareAPI registerDevices(DBBASE *pbase, int nDevices, +void registerDevices(DBBASE *pbase, int nDevices, const char * const *deviceSupportNames, const dset * const *devsl) { int i; @@ -62,7 +62,7 @@ void epicsShareAPI registerDevices(DBBASE *pbase, int nDevices, } } -void epicsShareAPI registerDrivers(DBBASE *pbase, int nDrivers, +void registerDrivers(DBBASE *pbase, int nDrivers, const char * const * driverSupportNames, struct drvet * const *drvsl) { int i; diff --git a/src/ioc/registry/registryCommon.h b/src/ioc/registry/registryCommon.h index c18e5be14..8148ecdad 100644 --- a/src/ioc/registry/registryCommon.h +++ b/src/ioc/registry/registryCommon.h @@ -18,13 +18,13 @@ extern "C" { #endif -epicsShareFunc void epicsShareAPI registerRecordTypes( +epicsShareFunc void registerRecordTypes( DBBASE *pbase, int nRecordTypes, const char * const *recordTypeNames, const recordTypeLocation *rtl); -epicsShareFunc void epicsShareAPI registerDevices( +epicsShareFunc void registerDevices( DBBASE *pbase, int nDevices, const char * const *deviceSupportNames, const dset * const *devsl); -epicsShareFunc void epicsShareAPI registerDrivers( +epicsShareFunc void registerDrivers( DBBASE *pbase, int nDrivers, const char * const *driverSupportNames, struct drvet * const *drvsl); diff --git a/src/ioc/registry/registryDeviceSupport.c b/src/ioc/registry/registryDeviceSupport.c index 32bb8fc0e..4310c923d 100644 --- a/src/ioc/registry/registryDeviceSupport.c +++ b/src/ioc/registry/registryDeviceSupport.c @@ -17,13 +17,13 @@ static void *registryID = "device support"; -epicsShareFunc int epicsShareAPI registryDeviceSupportAdd( +epicsShareFunc int registryDeviceSupportAdd( const char *name, const struct dset *pdset) { return registryAdd(registryID, name, (void *)pdset); } -epicsShareFunc struct dset * epicsShareAPI registryDeviceSupportFind( +epicsShareFunc struct dset * registryDeviceSupportFind( const char *name) { return registryFind(registryID, name); diff --git a/src/ioc/registry/registryDeviceSupport.h b/src/ioc/registry/registryDeviceSupport.h index 96420205b..52a269863 100644 --- a/src/ioc/registry/registryDeviceSupport.h +++ b/src/ioc/registry/registryDeviceSupport.h @@ -17,9 +17,9 @@ extern "C" { #endif -epicsShareFunc int epicsShareAPI registryDeviceSupportAdd( +epicsShareFunc int registryDeviceSupportAdd( const char *name, const struct dset *pdset); -epicsShareFunc struct dset * epicsShareAPI registryDeviceSupportFind( +epicsShareFunc struct dset * registryDeviceSupportFind( const char *name); #ifdef __cplusplus diff --git a/src/ioc/registry/registryDriverSupport.c b/src/ioc/registry/registryDriverSupport.c index 55e7dc1fb..8393bc414 100644 --- a/src/ioc/registry/registryDriverSupport.c +++ b/src/ioc/registry/registryDriverSupport.c @@ -17,13 +17,13 @@ static void *registryID = "driver support"; -epicsShareFunc int epicsShareAPI registryDriverSupportAdd( +epicsShareFunc int registryDriverSupportAdd( const char *name, struct drvet *pdrvet) { return registryAdd(registryID, name, pdrvet); } -epicsShareFunc struct drvet * epicsShareAPI registryDriverSupportFind( +epicsShareFunc struct drvet * registryDriverSupportFind( const char *name) { return registryFind(registryID, name); diff --git a/src/ioc/registry/registryDriverSupport.h b/src/ioc/registry/registryDriverSupport.h index 20ae363fa..79be29295 100644 --- a/src/ioc/registry/registryDriverSupport.h +++ b/src/ioc/registry/registryDriverSupport.h @@ -17,9 +17,9 @@ extern "C" { #endif -epicsShareFunc int epicsShareAPI registryDriverSupportAdd( +epicsShareFunc int registryDriverSupportAdd( const char *name, struct drvet *pdrvet); -epicsShareFunc struct drvet * epicsShareAPI registryDriverSupportFind( +epicsShareFunc struct drvet * registryDriverSupportFind( const char *name); #ifdef __cplusplus diff --git a/src/ioc/registry/registryFunction.c b/src/ioc/registry/registryFunction.c index 4d06ef2b6..194f078c1 100644 --- a/src/ioc/registry/registryFunction.c +++ b/src/ioc/registry/registryFunction.c @@ -19,13 +19,13 @@ static void * const registryID = "function"; -epicsShareFunc int epicsShareAPI registryFunctionAdd( +epicsShareFunc int registryFunctionAdd( const char *name, REGISTRYFUNCTION func) { return registryAdd(registryID, name, func); } -epicsShareFunc REGISTRYFUNCTION epicsShareAPI registryFunctionFind( +epicsShareFunc REGISTRYFUNCTION registryFunctionFind( const char *name) { REGISTRYFUNCTION func = registryFind(registryID, name); @@ -37,7 +37,7 @@ epicsShareFunc REGISTRYFUNCTION epicsShareAPI registryFunctionFind( return func; } -epicsShareFunc int epicsShareAPI registryFunctionRefAdd( +epicsShareFunc int registryFunctionRefAdd( registryFunctionRef ref[], int nfunctions) { int i; diff --git a/src/ioc/registry/registryFunction.h b/src/ioc/registry/registryFunction.h index 7d3392c55..e20513771 100644 --- a/src/ioc/registry/registryFunction.h +++ b/src/ioc/registry/registryFunction.h @@ -24,11 +24,11 @@ typedef struct registryFunctionRef { } registryFunctionRef; -epicsShareFunc int epicsShareAPI registryFunctionAdd( +epicsShareFunc int registryFunctionAdd( const char *name, REGISTRYFUNCTION func); -epicsShareFunc REGISTRYFUNCTION epicsShareAPI registryFunctionFind( +epicsShareFunc REGISTRYFUNCTION registryFunctionFind( const char *name); -epicsShareFunc int epicsShareAPI registryFunctionRefAdd( +epicsShareFunc int registryFunctionRefAdd( registryFunctionRef ref[], int nfunctions); #ifdef __cplusplus diff --git a/src/ioc/registry/registryIocRegister.c b/src/ioc/registry/registryIocRegister.c index cedc10607..7046c69ec 100644 --- a/src/ioc/registry/registryIocRegister.c +++ b/src/ioc/registry/registryIocRegister.c @@ -47,7 +47,7 @@ static void registryFunctionFindCallFunc(const iocshArgBuf *args) { printf("%p\n", (void*) registryFunctionFind(args[0].sval)); } -void epicsShareAPI registryIocRegister(void) +void registryIocRegister(void) { iocshRegister(®istryRecordTypeFindFuncDef,registryRecordTypeFindCallFunc); iocshRegister(®istryDeviceSupportFindFuncDef,registryDeviceSupportFindCallFunc); diff --git a/src/ioc/registry/registryIocRegister.h b/src/ioc/registry/registryIocRegister.h index 2f9fdd3c3..ca02ce0e3 100644 --- a/src/ioc/registry/registryIocRegister.h +++ b/src/ioc/registry/registryIocRegister.h @@ -16,7 +16,7 @@ extern "C" { #endif -epicsShareFunc void epicsShareAPI registryIocRegister(void); +epicsShareFunc void registryIocRegister(void); #ifdef __cplusplus } diff --git a/src/ioc/registry/registryRecordType.c b/src/ioc/registry/registryRecordType.c index 9234765d7..eced6f0f6 100644 --- a/src/ioc/registry/registryRecordType.c +++ b/src/ioc/registry/registryRecordType.c @@ -17,13 +17,13 @@ static void * const registryID = "record type"; -epicsShareFunc int epicsShareAPI registryRecordTypeAdd( +epicsShareFunc int registryRecordTypeAdd( const char *name, const recordTypeLocation *prtl) { return registryAdd(registryID, name, (void *)prtl); } -epicsShareFunc recordTypeLocation * epicsShareAPI registryRecordTypeFind( +epicsShareFunc recordTypeLocation * registryRecordTypeFind( const char *name) { return registryFind(registryID, name); diff --git a/src/ioc/registry/registryRecordType.h b/src/ioc/registry/registryRecordType.h index b833d69f1..1d4c80cdd 100644 --- a/src/ioc/registry/registryRecordType.h +++ b/src/ioc/registry/registryRecordType.h @@ -28,9 +28,9 @@ typedef struct recordTypeLocation { computeSizeOffset sizeOffset; }recordTypeLocation; -epicsShareFunc int epicsShareAPI registryRecordTypeAdd( +epicsShareFunc int registryRecordTypeAdd( const char *name, const recordTypeLocation *prtl); -epicsShareFunc recordTypeLocation * epicsShareAPI registryRecordTypeFind( +epicsShareFunc recordTypeLocation * registryRecordTypeFind( const char *name); int registerRecordDeviceDriver(struct dbBase *pdbbase); diff --git a/src/ioc/rsrv/camsgtask.c b/src/ioc/rsrv/camsgtask.c index a5133caf6..be63fa884 100644 --- a/src/ioc/rsrv/camsgtask.c +++ b/src/ioc/rsrv/camsgtask.c @@ -165,7 +165,7 @@ void camsgtask ( void *pParm ) } -void epicsShareAPI casHostNameInitiatingCurrentThread ( char * pBuf, unsigned bufSize ) +void casHostNameInitiatingCurrentThread ( char * pBuf, unsigned bufSize ) { if ( bufSize ) { const char * pHostName = ""; @@ -181,7 +181,7 @@ void epicsShareAPI casHostNameInitiatingCurrentThread ( char * pBuf, unsigned bu } } -void epicsShareAPI casUserNameInitiatingCurrentThread ( char * pBuf, unsigned bufSize ) +void casUserNameInitiatingCurrentThread ( char * pBuf, unsigned bufSize ) { if ( bufSize ) { const char * pUserName = ""; diff --git a/src/ioc/rsrv/caservertask.c b/src/ioc/rsrv/caservertask.c index 7c82afe81..5184a7e30 100644 --- a/src/ioc/rsrv/caservertask.c +++ b/src/ioc/rsrv/caservertask.c @@ -449,7 +449,7 @@ static void log_one_client (struct client *client, unsigned level) /* * casr() */ -void epicsShareAPI casr (unsigned level) +void casr (unsigned level) { size_t bytes_reserved; struct client *client; diff --git a/src/ioc/rsrv/rsrv.h b/src/ioc/rsrv/rsrv.h index 4f08bbab7..4eae9bf5a 100644 --- a/src/ioc/rsrv/rsrv.h +++ b/src/ioc/rsrv/rsrv.h @@ -25,10 +25,10 @@ epicsShareFunc int rsrv_init(void); epicsShareFunc int rsrv_run(void); epicsShareFunc int rsrv_pause(void); -epicsShareFunc void epicsShareAPI casr (unsigned level); -epicsShareFunc void epicsShareAPI casHostNameInitiatingCurrentThread ( +epicsShareFunc void casr (unsigned level); +epicsShareFunc void casHostNameInitiatingCurrentThread ( char * pBuf, unsigned bufSize ); -epicsShareFunc void epicsShareAPI casUserNameInitiatingCurrentThread ( +epicsShareFunc void casUserNameInitiatingCurrentThread ( char * pBuf, unsigned bufSize ); epicsShareFunc void casStatsFetch ( unsigned *pChanCount, unsigned *pConnCount ); diff --git a/src/ioc/rsrv/rsrvIocRegister.c b/src/ioc/rsrv/rsrvIocRegister.c index a713a0bd7..51af07810 100644 --- a/src/ioc/rsrv/rsrvIocRegister.c +++ b/src/ioc/rsrv/rsrvIocRegister.c @@ -22,7 +22,7 @@ static void casrCallFunc(const iocshArgBuf *args) } -void epicsShareAPI rsrvIocRegister(void) +void rsrvIocRegister(void) { iocshRegister(&casrFuncDef,casrCallFunc); } diff --git a/src/ioc/rsrv/rsrvIocRegister.h b/src/ioc/rsrv/rsrvIocRegister.h index 5f83a03d3..f4c7e31f1 100644 --- a/src/ioc/rsrv/rsrvIocRegister.h +++ b/src/ioc/rsrv/rsrvIocRegister.h @@ -16,7 +16,7 @@ extern "C" { #endif -epicsShareFunc void epicsShareAPI rsrvIocRegister(void); +epicsShareFunc void rsrvIocRegister(void); #ifdef __cplusplus }