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

Fix issues related to const array initialization

Browse Source
This commit is contained in:
Andrew Johnson
2016-08-12 23:21:26 -05:00
parent bb58598eba
commit d3a9ba7701
7 changed files with 38 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/std/dev/devAaiSoft.c
View File

@@ -22,6 +22,7 @@
#include "alarm.h"
#include "dbDefs.h"
#include "dbAccess.h"
#include "dbConstLink.h"
#include "recGbl.h"
#include "devSup.h"
#include "cantProceed.h"
@@ -52,11 +53,24 @@ epicsExportAddress(dset,devAaiSoft);
static long init_record(aaiRecord *prec)
{
long nRequest = prec->nelm;
if (prec->inp.type == CONSTANT) {
dbLoadLinkArray(&prec->inp, prec->ftvl, prec->bptr, &nRequest);
prec->nord = (nRequest > 0) ? nRequest : 0;
long nRequest = prec->nelm;
long status;
/* Allocate a buffer, record support hasn't done that yet */
if (!prec->bptr) {
prec->bptr = callocMustSucceed(nRequest, dbValueSize(prec->ftvl),
"devAaiSoft: buffer calloc failed");
}
/* This is pass 0 so link hasn't been initialized either */
dbConstInitLink(&prec->inp);
status = dbLoadLinkArray(&prec->inp, prec->ftvl, prec->bptr, &nRequest);
if (!status && nRequest > 0) {
prec->nord = nRequest;
prec->udf = FALSE;
}
}
return 0;
}

5
src/std/dev/devWfSoft.c
View File

@@ -52,7 +52,10 @@ static long init_record(waveformRecord *prec)
long nelm = prec->nelm;
long status = dbLoadLinkArray(&prec->inp, prec->ftvl, prec->bptr, &nelm);
prec->nord = !status && (nelm > 0) ? nelm : 0;
if (!status && nelm > 0) {
prec->nord = nelm;
prec->udf = FALSE;
}
return status;
}