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

changed error parm in recGblRecordError calls

Browse Source
This commit is contained in:
Janet B. Anderson
1992-09-16 16:27:17 +00:00
parent 51cf4d76b2
commit 9287cb11bc
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/db/recGbl.c
View File

@@ -35,6 +35,7 @@
* .05 07-21-92 jba Added recGblGetAlarmDouble
* .06 08-07-92 jba Added recGblGetLinkValue, recGblPutLinkValue
* .07 08-07-92 jba Added RTN_SUCCESS check for status
* .08 09-15-92 jba changed error parm in recGblRecordError calls
*/
#include <vxWorks.h>
@@ -52,6 +53,7 @@
#include <dbAccess.h>
#include <devSup.h>
#include <dbCommon.h>
#include <sdrHeader.h>
extern struct dbBase *pdbBase;
@@ -303,7 +305,6 @@ long recGblGetLinkValue(
switch (plink->type){
case(CONSTANT):
*pnRequest=0;
break;
case(DB_LINK):
status=dbGetLink(&(plink->value.db_link),
@@ -435,17 +436,18 @@ double *prangeValue;
struct dbCommon *precord;
int i,n;
struct fldDes *pfldDes;
long status;
*prangeValue=0;
precord=(struct dbCommon *)(paddr->precord);
recType=paddr->record_type;
if(!(precTypDes=GET_PRECTYPDES(pdbBase->precDes,recType))){
recGblRecordError(1,(void *)precord,"getVarRangeValue");
recGblRecordError(S_sdr_noSdrType,(void *)precord,"getVarRangeValue(GET_PRECTYPDES)");
return;
}
if(!(pfldDes=GET_PFLDDES(precTypDes,fldnum))){
recGblRecordError(2,(void *)precord,"getVarRangeValue");
recGblRecordError(S_sdr_noSdrType,(void *)precord,"getVarRangeValue(GET_PFLDDES)");
return;
}
/* get &dbAddr for range VAR field */
@@ -456,16 +458,16 @@ double *prangeValue;
strcat(name,".");
strncat(name,pfldDes->fldname,FLDNAME_SZ);
strcat(name,"\0");
if (dbNameToAddr(name,&dbAddr)){
recGblRecordError(3,(void *)precord,"getVarRangeValue");
if (status=dbNameToAddr(name,&dbAddr)){
recGblRecordError(status,(void *)precord,"getVarRangeValue(dbNameToAddr)");
return;
}
/* get value of range VAR field */
options = 0;
nRequest = 1;
if(dbGetField(&dbAddr,DBR_DOUBLE,prangeValue,&options,&nRequest,pfl)){
recGblRecordError(4,(void *)precord,"getvarRangeValue");
if(status=dbGetField(&dbAddr,DBR_DOUBLE,prangeValue,&options,&nRequest,pfl)){
recGblRecordError(status,(void *)precord,"getVarRangeValue(dbGetField)");
return;
}
return;