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

remove needless pointer casts

Browse Source
This commit is contained in:
zimoch
2025-11-24 15:25:09 +01:00
committed by mdavidsaver
parent 85347172c6
commit 6d85a36397
111 changed files with 369 additions and 369 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/database/src/std/dev/asSubRecordFunctions.c
+1 -1
View File
@@ -58,7 +58,7 @@ long asSubInit(subRecord *precord,void *process)
pcallback = (ASDBCALLBACK *)callocMustSucceed(
1,sizeof(ASDBCALLBACK),"asSubInit");
precord->dpvt = (void *)pcallback;
precord->dpvt = pcallback;
callbackSetCallback(myCallback,&pcallback->callback);
callbackSetUser(precord,&pcallback->callback);
return(0);
modules/database/src/std/dev/devAiSoftCallback.c
+3 -3
View File
@@ -87,7 +87,7 @@ static long add_record(dbCommon *pcommon)
if (plink->type != PV_LINK) {
long status = S_db_badField;
recGblRecordError(status, (void *)prec,
recGblRecordError(status, prec,
"devAiSoftCallback (add_record) Illegal INP field");
return status;
}
@@ -96,7 +96,7 @@ static long add_record(dbCommon *pcommon)
if (!chan) {
long status = S_db_notFound;
recGblRecordError(status, (void *)prec,
recGblRecordError(status, prec,
"devAiSoftCallback (add_record) link target not found");
return status;
}
@@ -105,7 +105,7 @@ static long add_record(dbCommon *pcommon)
if (!pdevPvt) {
long status = S_db_noMemory;
recGblRecordError(status, (void *)prec,
recGblRecordError(status, prec,
"devAiSoftCallback (add_record) out of memory, calloc() failed");
return status;
}
modules/database/src/std/dev/devBiDbState.c
+1 -1
View File
@@ -27,7 +27,7 @@ static long add_record (struct dbCommon *pdbc)
biRecord *prec = (biRecord *) pdbc;
if (INST_IO != prec->inp.type) {
recGblRecordError(S_db_badField, (void *) prec, DEVSUPNAME ": Illegal INP field");
recGblRecordError(S_db_badField, prec, DEVSUPNAME ": Illegal INP field");
return(S_db_badField);
}
modules/database/src/std/dev/devBiSoftCallback.c
+3 -3
View File
@@ -85,7 +85,7 @@ static long add_record(dbCommon *pcommon)
if (plink->type != PV_LINK) {
long status = S_db_badField;
recGblRecordError(status, (void *)prec,
recGblRecordError(status, prec,
"devBiSoftCallback (add_record) Illegal INP field");
return status;
}
@@ -94,7 +94,7 @@ static long add_record(dbCommon *pcommon)
if (!chan) {
long status = S_db_notFound;
recGblRecordError(status, (void *)prec,
recGblRecordError(status, prec,
"devBiSoftCallback (add_record) link target not found");
return status;
}
@@ -103,7 +103,7 @@ static long add_record(dbCommon *pcommon)
if (!pdevPvt) {
long status = S_db_noMemory;
recGblRecordError(status, (void *)prec,
recGblRecordError(status, prec,
"devBiSoftCallback (add_record) out of memory, calloc() failed");
return status;
}
modules/database/src/std/dev/devBoDbState.c
+1 -1
View File
@@ -26,7 +26,7 @@ static long add_record (struct dbCommon *pdbc)
boRecord *prec = (boRecord *) pdbc;
if (INST_IO != prec->out.type) {
recGblRecordError(S_db_badField, (void *) prec, DEVSUPNAME ": Illegal OUT field");
recGblRecordError(S_db_badField, prec, DEVSUPNAME ": Illegal OUT field");
return(S_db_badField);
}
modules/database/src/std/dev/devGeneralTime.c
+8 -8
View File
@@ -57,7 +57,7 @@ static long init_ai(dbCommon *pcommon)
int i;
if (prec->inp.type != INST_IO) {
recGblRecordError(S_db_badField, (void *)prec,
recGblRecordError(S_db_badField, prec,
"devAiGeneralTime::init_ai: Illegal INP field");
prec->pact = TRUE;
return S_db_badField;
@@ -71,7 +71,7 @@ static long init_ai(dbCommon *pcommon)
}
}
recGblRecordError(S_db_badField, (void *)prec,
recGblRecordError(S_db_badField, prec,
"devAiGeneralTime::init_ai: Bad parm");
prec->pact = TRUE;
prec->dpvt = NULL;
@@ -119,7 +119,7 @@ static long init_bo(dbCommon *pcommon)
int i;
if (prec->out.type != INST_IO) {
recGblRecordError(S_db_badField, (void *)prec,
recGblRecordError(S_db_badField, prec,
"devAiGeneralTime::init_ai: Illegal INP field");
prec->pact = TRUE;
return S_db_badField;
@@ -134,7 +134,7 @@ static long init_bo(dbCommon *pcommon)
}
}
recGblRecordError(S_db_badField, (void *)prec,
recGblRecordError(S_db_badField, prec,
"devBoGeneralTime::init_bo: Bad parm");
prec->pact = TRUE;
prec->dpvt = NULL;
@@ -178,7 +178,7 @@ static long init_li(dbCommon *pcommon)
int i;
if (prec->inp.type != INST_IO) {
recGblRecordError(S_db_badField, (void *)prec,
recGblRecordError(S_db_badField, prec,
"devLiGeneralTime::init_li: Illegal INP field");
prec->pact = TRUE;
return S_db_badField;
@@ -192,7 +192,7 @@ static long init_li(dbCommon *pcommon)
}
}
recGblRecordError(S_db_badField, (void *)prec,
recGblRecordError(S_db_badField, prec,
"devLiGeneralTime::init_li: Bad parm");
prec->pact = TRUE;
prec->dpvt = NULL;
@@ -247,7 +247,7 @@ static long init_si(dbCommon *pcommon)
int i;
if (prec->inp.type != INST_IO) {
recGblRecordError(S_db_badField, (void *)prec,
recGblRecordError(S_db_badField, prec,
"devSiGeneralTime::init_si: Illegal INP field");
prec->pact = TRUE;
return S_db_badField;
@@ -261,7 +261,7 @@ static long init_si(dbCommon *pcommon)
}
}
recGblRecordError(S_db_badField, (void *)prec,
recGblRecordError(S_db_badField, prec,
"devSiGeneralTime::init_si: Bad parm");
prec->pact = TRUE;
prec->dpvt = NULL;
modules/database/src/std/dev/devI64inSoftCallback.c
+3 -3
View File
@@ -85,7 +85,7 @@ static long add_record(dbCommon *pcommon)
if (plink->type != PV_LINK) {
long status = S_db_badField;
recGblRecordError(status, (void *)prec,
recGblRecordError(status, prec,
"devI64inSoftCallback (add_record) Illegal INP field");
return status;
}
@@ -94,7 +94,7 @@ static long add_record(dbCommon *pcommon)
if (!chan) {
long status = S_db_notFound;
recGblRecordError(status, (void *)prec,
recGblRecordError(status, prec,
"devI64inSoftCallback (init_record) linked record not found");
return status;
}
@@ -103,7 +103,7 @@ static long add_record(dbCommon *pcommon)
if (!pdevPvt) {
long status = S_db_noMemory;
recGblRecordError(status, (void *)prec,
recGblRecordError(status, prec,
"devI64inSoftCallback (add_record) out of memory, calloc() failed");
return status;
}
modules/database/src/std/dev/devLiSoftCallback.c
+3 -3
View File
@@ -85,7 +85,7 @@ static long add_record(dbCommon *pcommon)
if (plink->type != PV_LINK) {
long status = S_db_badField;
recGblRecordError(status, (void *)prec,
recGblRecordError(status, prec,
"devLiSoftCallback (add_record) Illegal INP field");
return status;
}
@@ -94,7 +94,7 @@ static long add_record(dbCommon *pcommon)
if (!chan) {
long status = S_db_notFound;
recGblRecordError(status, (void *)prec,
recGblRecordError(status, prec,
"devLiSoftCallback (init_record) linked record not found");
return status;
}
@@ -103,7 +103,7 @@ static long add_record(dbCommon *pcommon)
if (!pdevPvt) {
long status = S_db_noMemory;
recGblRecordError(status, (void *)prec,
recGblRecordError(status, prec,
"devLiSoftCallback (add_record) out of memory, calloc() failed");
return status;
}
modules/database/src/std/dev/devMbbiDirectSoftCallback.c
+3 -3
View File
@@ -85,7 +85,7 @@ static long add_record(dbCommon *pcommon)
if (plink->type != PV_LINK) {
long status = S_db_badField;
recGblRecordError(status, (void *)prec,
recGblRecordError(status, prec,
"devMbbiDirectSoftCallback (add_record) Illegal INP field");
return status;
}
@@ -94,7 +94,7 @@ static long add_record(dbCommon *pcommon)
if (!chan) {
long status = S_db_notFound;
recGblRecordError(status,(void *)prec,
recGblRecordError(status, prec,
"devMbbiDirectSoftCallback (add_record) linked record not found");
return status;
}
@@ -103,7 +103,7 @@ static long add_record(dbCommon *pcommon)
if (!pdevPvt) {
long status = S_db_noMemory;
recGblRecordError(status, (void *)prec,
recGblRecordError(status, prec,
"devMbbiDirectSoftCallback (add_record) out of memory, calloc() failed");
return status;
}
modules/database/src/std/dev/devMbbiSoftCallback.c
+3 -3
View File
@@ -85,7 +85,7 @@ static long add_record(dbCommon *pcommon)
if (plink->type != PV_LINK) {
long status = S_db_badField;
recGblRecordError(status, (void *)prec,
recGblRecordError(status, prec,
"devMbbiSoftCallback (add_record) Illegal INP field");
return status;
}
@@ -94,7 +94,7 @@ static long add_record(dbCommon *pcommon)
if (!chan) {
long status = S_db_notFound;
recGblRecordError(status, (void *)prec,
recGblRecordError(status, prec,
"devMbbiSoftCallback (add_record) linked record not found");
return status;
}
@@ -103,7 +103,7 @@ static long add_record(dbCommon *pcommon)
if (!pdevPvt) {
long status = S_db_noMemory;
recGblRecordError(status, (void *)prec,
recGblRecordError(status, prec,
"devMbbiSoftCallback (add_record) out of memory, calloc() failed");
return status;
}
modules/database/src/std/dev/devSiSoftCallback.c
+3 -3
View File
@@ -87,7 +87,7 @@ static long add_record(dbCommon *pcommon)
if (plink->type != PV_LINK) {
long status = S_db_badField;
recGblRecordError(status, (void *)prec,
recGblRecordError(status, prec,
"devSiSoftCallback (add_record) Illegal INP field");
return status;
}
@@ -96,7 +96,7 @@ static long add_record(dbCommon *pcommon)
if (!pdevPvt) {
long status = S_db_noMemory;
recGblRecordError(status, (void *)prec,
recGblRecordError(status, prec,
"devSiSoftCallback (add_record) out of memory, calloc() failed");
return status;
}
@@ -106,7 +106,7 @@ static long add_record(dbCommon *pcommon)
if (!chan) {
long status = S_db_notFound;
recGblRecordError(status, (void *)prec,
recGblRecordError(status, prec,
"devSiSoftCallback (add_record) linked record not found");
free(pdevPvt);
return status;
modules/database/src/std/filters/arr.c
+1 -1
View File
@@ -48,7 +48,7 @@ static void * allocPvt(void)
my->start = 0;
my->incr = 1;
my->end = -1;
return (void *) my;
return my;
}
static void freePvt(void *pvt)
modules/database/src/std/filters/dbnd.c
+2 -2
View File
@@ -77,9 +77,9 @@ static db_field_log* filter(void* pvt, dbChannel *chan, db_field_log *pfl) {
localAddr.field_type = pfl->field_type;
localAddr.field_size = pfl->field_size;
localAddr.no_elements = pfl->no_elements;
localAddr.pfield = (char *) &pfl->u.v.field;
localAddr.pfield = &pfl->u.v.field;
status = dbFastGetConvertRoutine[pfl->field_type][DBR_DOUBLE]
(localAddr.pfield, (void*) &val, &localAddr);
(localAddr.pfield, &val, &localAddr);
if (!status) {
send = pfl->mask & ~(DBE_VALUE|DBE_LOG);
recGblCheckDeadband(&my->last, val, my->hyst, &send, pfl->mask & (DBE_VALUE|DBE_LOG));
modules/database/src/std/filters/decimate.c
+1 -1
View File
@@ -38,7 +38,7 @@ chfPluginArgDef opts[] = {
static void * allocPvt(void)
{
myStruct *my = (myStruct*) freeListCalloc(myStructFreeList);
return (void *) my;
return my;
}
static void freePvt(void *pvt)
modules/database/src/std/filters/sync.c
+1 -1
View File
@@ -70,7 +70,7 @@ chfPluginArgDef opts[] = {
static void * allocPvt(void)
{
myStruct *my = (myStruct*) freeListCalloc(myStructFreeList);
return (void *) my;
return my;
}
static void freePvt(void *pvt)
modules/database/src/std/rec/aSubRecord.c
+1 -1
View File
@@ -563,7 +563,7 @@ static long special(DBADDR *paddr, int after)
pfunc = (GENFUNCPTR)registryFunctionFind(prec->snam);
if (!pfunc) {
status = S_db_BadSub;
recGblRecordError(status, (void *)prec, prec->snam);
recGblRecordError(status, prec, prec->snam);
}
}
modules/database/src/std/rec/aiRecord.c
+4 -4
View File
@@ -104,12 +104,12 @@ static long init_record(struct dbCommon *pcommon, int pass)
recGblInitConstantLink(&prec->siol, DBF_DOUBLE, &prec->sval);
if(!(pdset = (aidset *)(prec->dset))) {
recGblRecordError(S_dev_noDSET,(void *)prec,"ai: init_record");
recGblRecordError(S_dev_noDSET, prec, "ai: init_record");
return(S_dev_noDSET);
}
/* must have read_ai function defined */
if ((pdset->common.number < 6) || (pdset->read_ai == NULL)) {
recGblRecordError(S_dev_missingSup,(void *)prec,"ai: init_record");
recGblRecordError(S_dev_missingSup, prec, "ai: init_record");
return(S_dev_missingSup);
}
prec->init = TRUE;
@@ -143,7 +143,7 @@ static long process(struct dbCommon *pcommon)
if( (pdset==NULL) || (pdset->read_ai==NULL) ) {
prec->pact=TRUE;
recGblRecordError(S_dev_missingSup,(void *)prec,"read_ai");
recGblRecordError(S_dev_missingSup, prec, "read_ai");
return(S_dev_missingSup);
}
timeLast = prec->time;
@@ -431,7 +431,7 @@ static void convert(aiRecord *prec)
break;
default: /* must use breakpoint table */
if (cvtRawToEngBpt(&val,prec->linr,prec->init,(void *)&prec->pbrk,&prec->lbrk)!=0) {
if (cvtRawToEngBpt(&val, prec->linr, prec->init, &prec->pbrk, &prec->lbrk)!=0) {
recGblSetSevrMsg(prec,SOFT_ALARM,MAJOR_ALARM, "BPT Error");
}
}
modules/database/src/std/rec/aoRecord.c
+7 -7
View File
@@ -105,7 +105,7 @@ static long init_record(struct dbCommon *pcommon, int pass)
recGblInitSimm(pcommon, &prec->sscn, &prec->oldsimm, &prec->simm, &prec->siml);
if(!(pdset = (aodset *)(prec->dset))) {
recGblRecordError(S_dev_noDSET,(void *)prec,"ao: init_record");
recGblRecordError(S_dev_noDSET, prec, "ao: init_record");
return(S_dev_noDSET);
}
/* get the initial value if dol is a constant*/
@@ -114,7 +114,7 @@ static long init_record(struct dbCommon *pcommon, int pass)
/* must have write_ao function defined */
if ((pdset->common.number < 6) || (pdset->write_ao ==NULL)) {
recGblRecordError(S_dev_missingSup,(void *)prec,"ao: init_record");
recGblRecordError(S_dev_missingSup, prec, "ao: init_record");
return(S_dev_missingSup);
}
prec->init = TRUE;
@@ -141,7 +141,7 @@ static long init_record(struct dbCommon *pcommon, int pass)
value = value*prec->eslo + prec->eoff;
}else{
if(cvtRawToEngBpt(&value,prec->linr,prec->init,
(void *)&prec->pbrk,&prec->lbrk)!=0) break;
&prec->pbrk, &prec->lbrk)!=0) break;
}
prec->val = value;
prec->udf = isnan(value);
@@ -149,7 +149,7 @@ static long init_record(struct dbCommon *pcommon, int pass)
case(2): /* no convert */
break;
default:
recGblRecordError(S_dev_badInitRet,(void *)prec,"ao: init_record");
recGblRecordError(S_dev_badInitRet, prec, "ao: init_record");
return(S_dev_badInitRet);
}
}
@@ -172,7 +172,7 @@ static long process(struct dbCommon *pcommon)
if ((pdset==NULL) || (pdset->write_ao==NULL)) {
prec->pact=TRUE;
recGblRecordError(S_dev_missingSup,(void *)prec,"write_ao");
recGblRecordError(S_dev_missingSup, prec, "write_ao");
return(S_dev_missingSup);
}
@@ -214,7 +214,7 @@ static long process(struct dbCommon *pcommon)
break;
default :
status=-1;
recGblRecordError(S_db_badField,(void *)prec,
recGblRecordError(S_db_badField, prec,
"ao:process Illegal IVOA field");
}
}
@@ -493,7 +493,7 @@ static void convert(aoRecord *prec, double value)
break;
default:
if (cvtEngToRawBpt(&value, prec->linr, prec->init,
(void *)&prec->pbrk, &prec->lbrk) != 0) {
&prec->pbrk, &prec->lbrk) != 0) {
recGblSetSevr(prec, SOFT_ALARM, MAJOR_ALARM);
return;
}
modules/database/src/std/rec/biRecord.c
+3 -3
View File
@@ -96,12 +96,12 @@ static long init_record(struct dbCommon *pcommon, int pass)
recGblInitConstantLink(&prec->siol, DBF_USHORT, &prec->sval);
if(!(pdset = (bidset *)(prec->dset))) {
recGblRecordError(S_dev_noDSET,(void *)prec,"bi: init_record");
recGblRecordError(S_dev_noDSET, prec, "bi: init_record");
return(S_dev_noDSET);
}
/* must have read_bi function defined */
if( (pdset->common.number < 5) || (pdset->read_bi == NULL) ) {
recGblRecordError(S_dev_missingSup,(void *)prec,"bi: init_record");
recGblRecordError(S_dev_missingSup, prec, "bi: init_record");
return(S_dev_missingSup);
}
if( pdset->common.init_record ) {
@@ -122,7 +122,7 @@ static long process(struct dbCommon *pcommon)
if( (pdset==NULL) || (pdset->read_bi==NULL) ) {
prec->pact=TRUE;
recGblRecordError(S_dev_missingSup,(void *)prec,"read_bi");
recGblRecordError(S_dev_missingSup, prec, "read_bi");
return(S_dev_missingSup);
}
modules/database/src/std/rec/boRecord.c
+2 -2
View File
@@ -185,7 +185,7 @@ static long process(struct dbCommon *pcommon)
if( (pdset==NULL) || (pdset->write_bo==NULL) ) {
prec->pact=TRUE;
recGblRecordError(S_dev_missingSup,(void *)prec,"write_bo");
recGblRecordError(S_dev_missingSup, prec, "write_bo");
return(S_dev_missingSup);
}
if (!prec->pact) {
@@ -240,7 +240,7 @@ static long process(struct dbCommon *pcommon)
break;
default :
status=-1;
recGblRecordError(S_db_badField,(void *)prec,
recGblRecordError(S_db_badField, prec,
"bo:process Illegal IVOA field");
}
}
modules/database/src/std/rec/calcRecord.c
+2 -2
View File
@@ -103,7 +103,7 @@ static long init_record(struct dbCommon *pcommon, int pass)
recGblInitConstantLink(plink, DBF_DOUBLE, pvalue);
}
if (postfix(prec->calc, prec->rpcl, &error_number)) {
recGblRecordError(S_db_badField, (void *)prec,
recGblRecordError(S_db_badField, prec,
"calc: init_record: Illegal CALC field");
errlogPrintf("%s.CALC: %s in expression \"%s\"\n",
prec->name, calcErrorStr(error_number), prec->calc);
@@ -144,7 +144,7 @@ static long special(DBADDR *paddr, int after)
if (!after) return 0;
if (paddr->special == SPC_CALC) {
if (postfix(prec->calc, prec->rpcl, &error_number)) {
recGblRecordError(S_db_badField, (void *)prec,
recGblRecordError(S_db_badField, prec,
"calc: Illegal CALC field");
errlogPrintf("%s.CALC: %s in expression \"%s\"\n",
prec->name, calcErrorStr(error_number), prec->calc);
modules/database/src/std/rec/calcoutRecord.c
+7 -7
View File
@@ -142,13 +142,13 @@ static long init_record(struct dbCommon *pcommon, int pass)
}
if (!(pcalcoutDSET = (calcoutdset *)prec->dset)) {
recGblRecordError(S_dev_noDSET, (void *)prec, "calcout:init_record");
recGblRecordError(S_dev_noDSET, prec, "calcout:init_record");
return S_dev_noDSET;
}
/* must have write defined */
if ((pcalcoutDSET->common.number < 5) || (pcalcoutDSET->write ==NULL)) {
recGblRecordError(S_dev_missingSup, (void *)prec, "calcout:init_record");
recGblRecordError(S_dev_missingSup, prec, "calcout:init_record");
return S_dev_missingSup;
}
@@ -190,7 +190,7 @@ static long init_record(struct dbCommon *pcommon, int pass)
prec->clcv = postfix(prec->calc, prec->rpcl, &error_number);
if (prec->clcv){
recGblRecordError(S_db_badField, (void *)prec,
recGblRecordError(S_db_badField, prec,
"calcout: init_record: Illegal CALC field");
errlogPrintf("%s.CALC: %s in expression \"%s\"\n",
prec->name, calcErrorStr(error_number), prec->calc);
@@ -198,7 +198,7 @@ static long init_record(struct dbCommon *pcommon, int pass)
prec->oclv = postfix(prec->ocal, prec->orpc, &error_number);
if (prec->dopt == calcoutDOPT_Use_OVAL && prec->oclv){
recGblRecordError(S_db_badField, (void *)prec,
recGblRecordError(S_db_badField, prec,
"calcout: init_record: Illegal OCAL field");
errlogPrintf("%s.OCAL: %s in expression \"%s\"\n",
prec->name, calcErrorStr(error_number), prec->ocal);
@@ -325,7 +325,7 @@ static long special(DBADDR *paddr, int after)
case(calcoutRecordCALC):
prec->clcv = postfix(prec->calc, prec->rpcl, &error_number);
if (prec->clcv){
recGblRecordError(S_db_badField, (void *)prec,
recGblRecordError(S_db_badField, prec,
"calcout: special(): Illegal CALC field");
errlogPrintf("%s.CALC: %s in expression \"%s\"\n",
prec->name, calcErrorStr(error_number), prec->calc);
@@ -336,7 +336,7 @@ static long special(DBADDR *paddr, int after)
case(calcoutRecordOCAL):
prec->oclv = postfix(prec->ocal, prec->orpc, &error_number);
if (prec->dopt == calcoutDOPT_Use_OVAL && prec->oclv){
recGblRecordError(S_db_badField, (void *)prec,
recGblRecordError(S_db_badField, prec,
"calcout: special(): Illegal OCAL field");
errlogPrintf("%s.OCAL: %s in expression \"%s\"\n",
prec->name, calcErrorStr(error_number), prec->ocal);
@@ -650,7 +650,7 @@ static void execOutput(calcoutRecord *prec)
if (prec->epvt) postEvent(prec->epvt);
break;
default:
recGblRecordError(S_db_badField, (void *)prec,
recGblRecordError(S_db_badField, prec,
"calcout:process Illegal IVOA field");
}
}
modules/database/src/std/rec/compressRecord.c
+1 -1
View File
@@ -107,7 +107,7 @@ static void monitor(compressRecord *prec)
db_post_events(prec, &prec->nuse, monitor_mask);
prec->ouse = prec->nuse;
}
db_post_events(prec, (void*)&prec->val, monitor_mask);
db_post_events(prec, &prec->val, monitor_mask);
}
static void put_value(compressRecord *prec, double *psource, int n)
modules/database/src/std/rec/dfanoutRecord.c
+1 -1
View File
@@ -140,7 +140,7 @@ static long process(struct dbCommon *pcommon)
break;
default :
status=-1;
recGblRecordError(S_db_badField,(void *)prec,
recGblRecordError(S_db_badField, prec,
"dfanout:process Illegal IVOA field");
}
}
modules/database/src/std/rec/histogramRecord.c
+2 -2
View File
@@ -111,7 +111,7 @@ static void wdogCallback(epicsCallback *arg)
if (prec->mcnt > 0){
dbScanLock((struct dbCommon *)prec);
recGblGetTimeStamp(prec);
db_post_events(prec, (void*)&prec->val, DBE_VALUE | DBE_LOG);
db_post_events(prec, &prec->val, DBE_VALUE | DBE_LOG);
prec->mcnt = 0;
dbScanUnlock((struct dbCommon *)prec);
}
@@ -291,7 +291,7 @@ static void monitor(histogramRecord *prec)
}
/* send out monitors connected to the value field */
if (monitor_mask)
db_post_events(prec, (void*)&prec->val, monitor_mask);
db_post_events(prec, &prec->val, monitor_mask);
return;
}
modules/database/src/std/rec/int64inRecord.c
+3 -3
View File
@@ -102,12 +102,12 @@ static long init_record(dbCommon *pcommon, int pass)
recGblInitConstantLink(&prec->siol, DBF_INT64, &prec->sval);
if(!(pdset = (int64indset *)(prec->dset))) {
recGblRecordError(S_dev_noDSET,(void *)prec,"int64in: init_record");
recGblRecordError(S_dev_noDSET, prec, "int64in: init_record");
return(S_dev_noDSET);
}
/* must have read_int64in function defined */
if ((pdset->common.number < 5) || (pdset->read_int64in == NULL)) {
recGblRecordError(S_dev_missingSup,(void *)prec,"int64in: init_record");
recGblRecordError(S_dev_missingSup, prec, "int64in: init_record");
return(S_dev_missingSup);
}
if (pdset->common.init_record) {
@@ -129,7 +129,7 @@ static long process(dbCommon *pcommon)
if( (pdset==NULL) || (pdset->read_int64in==NULL) ) {
prec->pact=TRUE;
recGblRecordError(S_dev_missingSup,(void *)prec,"read_int64in");
recGblRecordError(S_dev_missingSup, prec, "read_int64in");
return(S_dev_missingSup);
}
timeLast = prec->time;
modules/database/src/std/rec/int64outRecord.c
+4 -4
View File
@@ -98,12 +98,12 @@ static long init_record(dbCommon *pcommon, int pass)
recGblInitSimm(pcommon, &prec->sscn, &prec->oldsimm, &prec->simm, &prec->siml);
if(!(pdset = (int64outdset *)(prec->dset))) {
recGblRecordError(S_dev_noDSET,(void *)prec,"int64out: init_record");
recGblRecordError(S_dev_noDSET, prec, "int64out: init_record");
return(S_dev_noDSET);
}
/* must have write_int64out functions defined */
if ((pdset->common.number < 5) || (pdset->write_int64out == NULL)) {
recGblRecordError(S_dev_missingSup,(void *)prec,"int64out: init_record");
recGblRecordError(S_dev_missingSup, prec, "int64out: init_record");
return(S_dev_missingSup);
}
if (prec->dol.type == CONSTANT) {
@@ -129,7 +129,7 @@ static long process(dbCommon *pcommon)
if( (pdset==NULL) || (pdset->write_int64out==NULL) ) {
prec->pact=TRUE;
recGblRecordError(S_dev_missingSup,(void *)prec,"write_int64out");
recGblRecordError(S_dev_missingSup, prec, "write_int64out");
return(S_dev_missingSup);
}
if (!prec->pact) {
@@ -170,7 +170,7 @@ static long process(dbCommon *pcommon)
break;
default :
status=-1;
recGblRecordError(S_db_badField,(void *)prec,
recGblRecordError(S_db_badField, prec,
"int64out:process Illegal IVOA field");
}
}
modules/database/src/std/rec/longinRecord.c
+1 -1
View File
@@ -133,7 +133,7 @@ static long process(struct dbCommon *pcommon)
if( (pdset==NULL) || (pdset->read_longin==NULL) ) {
prec->pact=TRUE;
recGblRecordError(S_dev_missingSup,(void *)prec,"read_longin");
recGblRecordError(S_dev_missingSup, prec, "read_longin");
return(S_dev_missingSup);
}
timeLast = prec->time;
modules/database/src/std/rec/longoutRecord.c
+2 -2
View File
@@ -139,7 +139,7 @@ static long process(struct dbCommon *pcommon)
if( (pdset==NULL) || (pdset->write_longout==NULL) ) {
prec->pact=TRUE;
recGblRecordError(S_dev_missingSup,(void *)prec,"write_longout");
recGblRecordError(S_dev_missingSup, prec, "write_longout");
return(S_dev_missingSup);
}
if (!prec->pact) {
@@ -179,7 +179,7 @@ static long process(struct dbCommon *pcommon)
break;
default :
status=-1;
recGblRecordError(S_db_badField,(void *)prec,
recGblRecordError(S_db_badField, prec,
"longout:process Illegal IVOA field");
}
}
modules/database/src/std/rec/selRecord.c
+3 -3
View File
@@ -150,14 +150,14 @@ static long get_precision(const DBADDR *paddr, long *precision)
int i;
*precision = prec->prec;
if(paddr->pfield==(void *)&prec->val){
if(paddr->pfield==&prec->val){
return(0);
}
pvalue = &prec->a;
plvalue = &prec->la;
for(i=0; i<SEL_MAX; i++, pvalue++, plvalue++) {
if(paddr->pfield==(void *)&pvalue
|| paddr->pfield==(void *)&plvalue){
if(paddr->pfield==&pvalue
|| paddr->pfield==&plvalue){
return(0);
}
}
modules/database/src/std/rec/stringinRecord.c
+1 -1
View File
@@ -129,7 +129,7 @@ static long process(struct dbCommon *pcommon)
if( (pdset==NULL) || (pdset->read_stringin==NULL) ) {
prec->pact=TRUE;
recGblRecordError(S_dev_missingSup,(void *)prec,"read_stringin");
recGblRecordError(S_dev_missingSup, prec, "read_stringin");
return(S_dev_missingSup);
}
modules/database/src/std/rec/stringoutRecord.c
+2 -2
View File
@@ -132,7 +132,7 @@ static long process(struct dbCommon *pcommon)
if( (pdset==NULL) || (pdset->write_stringout==NULL) ) {
prec->pact=TRUE;
recGblRecordError(S_dev_missingSup,(void *)prec,"write_stringout");
recGblRecordError(S_dev_missingSup, prec, "write_stringout");
return(S_dev_missingSup);
}
if (!prec->pact &&
@@ -168,7 +168,7 @@ static long process(struct dbCommon *pcommon)
break;
default :
status=-1;
recGblRecordError(S_db_badField,(void *)prec,
recGblRecordError(S_db_badField, prec,
"stringout:process Illegal IVOA field");
}
}
modules/database/src/std/rec/subArrayRecord.c
+4 -4
View File
@@ -107,13 +107,13 @@ static long init_record(struct dbCommon *pcommon, int pass)
/* must have dset defined */
if (!(pdset = (sadset *)(prec->dset))) {
recGblRecordError(S_dev_noDSET,(void *)prec,"sa: init_record");
recGblRecordError(S_dev_noDSET, prec, "sa: init_record");
return S_dev_noDSET;
}
/* must have read_sa function defined */
if ( (pdset->common.number < 5) || (pdset->read_sa == NULL) ) {
recGblRecordError(S_dev_missingSup,(void *)prec,"sa: init_record");
recGblRecordError(S_dev_missingSup, prec, "sa: init_record");
return S_dev_missingSup;
}
@@ -132,7 +132,7 @@ static long process(struct dbCommon *pcommon)
if ((pdset==NULL) || (pdset->read_sa==NULL)) {
prec->pact=TRUE;
recGblRecordError(S_dev_missingSup, (void *)prec, "read_sa");
recGblRecordError(S_dev_missingSup, prec, "read_sa");
return S_dev_missingSup;
}
@@ -293,7 +293,7 @@ static void monitor(subArrayRecord *prec)
monitor_mask = recGblResetAlarms(prec);
monitor_mask |= (DBE_LOG|DBE_VALUE);
db_post_events(prec, (void*)&prec->val, monitor_mask);
db_post_events(prec, &prec->val, monitor_mask);
return;
}
modules/database/src/std/rec/subRecord.dbd.pod
+1 -1
View File
@@ -377,7 +377,7 @@ processing.
{
struct callback *pcallback;
pcallback = (struct callback *)(calloc(1,sizeof(struct callback)));
psub->dpvt = (void *)pcallback;
psub->dpvt = pcallback;
callbackSetCallback(myCallback,pcallback);
pcallback->precord = (struct dbCommon *)psub;
pcallback->wd_id = wdCreate();
modules/database/src/std/rec/waveformRecord.c
+4 -4
View File
@@ -105,12 +105,12 @@ static long init_record(struct dbCommon *pcommon, int pass)
/* must have dset defined */
if (!(pdset = (wfdset *)(prec->dset))) {
recGblRecordError(S_dev_noDSET,(void *)prec,"wf: init_record");
recGblRecordError(S_dev_noDSET, prec, "wf: init_record");
return S_dev_noDSET;
}
/* must have read_wf function defined */
if ((pdset->common.number < 5) || (pdset->read_wf == NULL)) {
recGblRecordError(S_dev_missingSup,(void *)prec,"wf: init_record");
recGblRecordError(S_dev_missingSup, prec, "wf: init_record");
return S_dev_missingSup;
}
if (!pdset->common.init_record)
@@ -129,7 +129,7 @@ static long process(struct dbCommon *pcommon)
if ((pdset==NULL) || (pdset->read_wf==NULL)) {
prec->pact=TRUE;
recGblRecordError(S_dev_missingSup, (void *)prec, "read_wf");
recGblRecordError(S_dev_missingSup, prec, "read_wf");
return S_dev_missingSup;
}
@@ -303,7 +303,7 @@ static void monitor(waveformRecord *prec)
/* Calculate hash if we are interested in OnChange events. */
if ((prec->mpst == waveformPOST_OnChange) ||
(prec->apst == waveformPOST_OnChange)) {
hash = epicsMemHash((char *)prec->bptr,
hash = epicsMemHash(prec->bptr,
prec->nord * dbValueSize(prec->ftvl), 0);
/* Only post OnChange values if the hash is different. */