diff --git a/src/ioc/dbStatic/recSup.h b/src/ioc/dbStatic/recSup.h index e2d644142..21d724e36 100644 --- a/src/ioc/dbStatic/recSup.h +++ b/src/ioc/dbStatic/recSup.h @@ -36,13 +36,6 @@ struct dbr_alDouble; struct REC_TYPE; -/* Definition of structure for rset.get_value */ -typedef struct valueDes { - long field_type; - long no_elements; - void * pvalue; -} valueDes; - /* record support entry table */ struct rset { long number; /* number of support routines */ @@ -51,15 +44,15 @@ struct rset { long (*init_record)(struct REC_TYPE *precord, int pass); long (*process)(struct REC_TYPE *precord); long (*special)(struct dbAddr *paddr, int after); - long (*get_value)(struct REC_TYPE *precord, struct valueDes *p); + long (*get_value)(void); /* DEPRECATED set to NULL */ long (*cvt_dbaddr)(struct dbAddr *paddr); long (*get_array_info)(struct dbAddr *paddr, long *no_elements, long *offset); long (*put_array_info)(struct dbAddr *paddr, long nNew); - long (*get_units)(struct dbAddr *paddr, char units[/* 8 */]); - long (*get_precision)(struct dbAddr *paddr, long *precision); - long (*get_enum_str)(struct dbAddr *paddr, char *pbuffer); - long (*get_enum_strs)(struct dbAddr *paddr, struct dbr_enumStrs *p); - long (*put_enum_str)(struct dbAddr *paddr, char *pbuffer); + long (*get_units)(struct dbAddr *paddr, char *units); + long (*get_precision)(const struct dbAddr *paddr, long *precision); + long (*get_enum_str)(const struct dbAddr *paddr, char *pbuffer); + long (*get_enum_strs)(const struct dbAddr *paddr, struct dbr_enumStrs *p); + long (*put_enum_str)(const struct dbAddr *paddr, const char *pbuffer); long (*get_graphic_double)(struct dbAddr *paddr, struct dbr_grDouble *p); long (*get_control_double)(struct dbAddr *paddr, struct dbr_ctrlDouble *p); long (*get_alarm_double)(struct dbAddr *paddr, struct dbr_alDouble *p); diff --git a/src/std/rec/aSubRecord.c b/src/std/rec/aSubRecord.c index dee78628a..4211ea486 100644 --- a/src/std/rec/aSubRecord.c +++ b/src/std/rec/aSubRecord.c @@ -54,7 +54,7 @@ static long cvt_dbaddr(DBADDR *); static long get_array_info(DBADDR *, long *, long *); static long put_array_info(DBADDR *, long ); static long get_units(DBADDR *, char *); -static long get_precision(DBADDR *, long *); +static long get_precision(const DBADDR *, long *); #define get_enum_str NULL #define get_enum_strs NULL #define put_enum_str NULL @@ -356,7 +356,7 @@ static long get_units(DBADDR *paddr, char *units) return 0; } -static long get_precision(DBADDR *paddr, long *pprecision) +static long get_precision(const DBADDR *paddr, long *pprecision) { aSubRecord *prec = (aSubRecord *)paddr->precord; int fieldIndex = dbGetFieldIndex(paddr); diff --git a/src/std/rec/aaiRecord.c b/src/std/rec/aaiRecord.c index 25e478dd8..df1ada7de 100644 --- a/src/std/rec/aaiRecord.c +++ b/src/std/rec/aaiRecord.c @@ -60,7 +60,7 @@ static long cvt_dbaddr(DBADDR *); static long get_array_info(DBADDR *, long *, long *); static long put_array_info(DBADDR *, long); static long get_units(DBADDR *, char *); -static long get_precision(DBADDR *, long *); +static long get_precision(const DBADDR *, long *); #define get_enum_str NULL #define get_enum_strs NULL #define put_enum_str NULL @@ -230,7 +230,7 @@ static long get_units(DBADDR *paddr, char *units) return 0; } -static long get_precision(DBADDR *paddr, long *precision) +static long get_precision(const DBADDR *paddr, long *precision) { aaiRecord *prec = (aaiRecord *)paddr->precord; diff --git a/src/std/rec/aaoRecord.c b/src/std/rec/aaoRecord.c index 3d4e5445f..c9d0e05b1 100644 --- a/src/std/rec/aaoRecord.c +++ b/src/std/rec/aaoRecord.c @@ -60,7 +60,7 @@ static long cvt_dbaddr(DBADDR *); static long get_array_info(DBADDR *, long *, long *); static long put_array_info(DBADDR *, long); static long get_units(DBADDR *, char *); -static long get_precision(DBADDR *, long *); +static long get_precision(const DBADDR *, long *); #define get_enum_str NULL #define get_enum_strs NULL #define put_enum_str NULL @@ -230,7 +230,7 @@ static long get_units(DBADDR *paddr, char *units) return 0; } -static long get_precision(DBADDR *paddr, long *precision) +static long get_precision(const DBADDR *paddr, long *precision) { aaoRecord *prec = (aaoRecord *)paddr->precord; diff --git a/src/std/rec/aiRecord.c b/src/std/rec/aiRecord.c index 8b8d8cbb6..8ec5e0089 100644 --- a/src/std/rec/aiRecord.c +++ b/src/std/rec/aiRecord.c @@ -57,7 +57,7 @@ static long special(DBADDR *, int); #define get_array_info NULL #define put_array_info NULL static long get_units(DBADDR *, char *); -static long get_precision(DBADDR *, long *); +static long get_precision(const DBADDR *, long *); #define get_enum_str NULL #define get_enum_strs NULL #define put_enum_str NULL @@ -237,7 +237,7 @@ static long get_units(DBADDR *paddr, char *units) return(0); } -static long get_precision(DBADDR *paddr, long *precision) +static long get_precision(const DBADDR *paddr, long *precision) { aiRecord *prec=(aiRecord *)paddr->precord; diff --git a/src/std/rec/aoRecord.c b/src/std/rec/aoRecord.c index 545debd41..4dcb4aa23 100644 --- a/src/std/rec/aoRecord.c +++ b/src/std/rec/aoRecord.c @@ -56,7 +56,7 @@ static long special(DBADDR *, int); #define get_array_info NULL #define put_array_info NULL static long get_units(DBADDR *, char *); -static long get_precision(DBADDR *, long *); +static long get_precision(const DBADDR *, long *); #define get_enum_str NULL #define get_enum_strs NULL #define put_enum_str NULL @@ -296,7 +296,7 @@ static long get_units(DBADDR * paddr,char *units) return(0); } -static long get_precision(DBADDR *paddr,long *precision) +static long get_precision(const DBADDR *paddr,long *precision) { aoRecord *prec=(aoRecord *)paddr->precord; diff --git a/src/std/rec/biRecord.c b/src/std/rec/biRecord.c index 4ac3b18f0..3331885ed 100644 --- a/src/std/rec/biRecord.c +++ b/src/std/rec/biRecord.c @@ -52,9 +52,9 @@ static long process(biRecord *); #define put_array_info NULL #define get_units NULL #define get_precision NULL -static long get_enum_str(DBADDR *, char *); -static long get_enum_strs(DBADDR *, struct dbr_enumStrs *); -static long put_enum_str(DBADDR *, char *); +static long get_enum_str(const DBADDR *, char *); +static long get_enum_strs(const DBADDR *, struct dbr_enumStrs *); +static long put_enum_str(const DBADDR *, const char *); #define get_graphic_double NULL #define get_control_double NULL #define get_alarm_double NULL @@ -153,7 +153,7 @@ static long process(biRecord *prec) return(status); } -static long get_enum_str(DBADDR *paddr, char *pstring) +static long get_enum_str(const DBADDR *paddr, char *pstring) { biRecord *prec=(biRecord *)paddr->precord; int index; @@ -175,7 +175,7 @@ static long get_enum_str(DBADDR *paddr, char *pstring) return(0); } -static long get_enum_strs(DBADDR *paddr,struct dbr_enumStrs *pes) +static long get_enum_strs(const DBADDR *paddr,struct dbr_enumStrs *pes) { biRecord *prec=(biRecord *)paddr->precord; @@ -188,7 +188,7 @@ static long get_enum_strs(DBADDR *paddr,struct dbr_enumStrs *pes) return(0); } -static long put_enum_str(DBADDR *paddr, char *pstring) +static long put_enum_str(const DBADDR *paddr, const char *pstring) { biRecord *prec=(biRecord *)paddr->precord; diff --git a/src/std/rec/boRecord.c b/src/std/rec/boRecord.c index 66e233938..329ee77ff 100644 --- a/src/std/rec/boRecord.c +++ b/src/std/rec/boRecord.c @@ -53,10 +53,10 @@ static long process(boRecord *); #define get_array_info NULL #define put_array_info NULL static long get_units(DBADDR *, char *); -static long get_precision(DBADDR *, long *); -static long get_enum_str(DBADDR *, char *); -static long get_enum_strs(DBADDR *, struct dbr_enumStrs *); -static long put_enum_str(DBADDR *, char *); +static long get_precision(const DBADDR *, long *); +static long get_enum_str(const DBADDR *, char *); +static long get_enum_strs(const DBADDR *, struct dbr_enumStrs *); +static long put_enum_str(const DBADDR *, const char *); #define get_graphic_double NULL static long get_control_double(DBADDR *, struct dbr_ctrlDouble *); #define get_alarm_double NULL @@ -283,7 +283,7 @@ static long get_units(DBADDR *paddr, char *units) return(0); } -static long get_precision(DBADDR *paddr, long *precision) +static long get_precision(const DBADDR *paddr, long *precision) { if(dbGetFieldIndex(paddr) == indexof(HIGH)) *precision = boHIGHprecision; @@ -302,7 +302,7 @@ static long get_control_double(DBADDR *paddr,struct dbr_ctrlDouble *pcd) return(0); } -static long get_enum_str(DBADDR *paddr, char *pstring) +static long get_enum_str(const DBADDR *paddr, char *pstring) { boRecord *prec=(boRecord *)paddr->precord; int index; @@ -324,7 +324,7 @@ static long get_enum_str(DBADDR *paddr, char *pstring) return(0); } -static long get_enum_strs(DBADDR *paddr,struct dbr_enumStrs *pes) +static long get_enum_strs(const DBADDR *paddr,struct dbr_enumStrs *pes) { boRecord *prec=(boRecord *)paddr->precord; @@ -337,7 +337,7 @@ static long get_enum_strs(DBADDR *paddr,struct dbr_enumStrs *pes) if(*prec->onam!=0) pes->no_str=2; return(0); } -static long put_enum_str(DBADDR *paddr, char *pstring) +static long put_enum_str(const DBADDR *paddr, const char *pstring) { boRecord *prec=(boRecord *)paddr->precord; diff --git a/src/std/rec/calcRecord.c b/src/std/rec/calcRecord.c index 4e54ce844..f24c6f95a 100644 --- a/src/std/rec/calcRecord.c +++ b/src/std/rec/calcRecord.c @@ -53,7 +53,7 @@ static long special(DBADDR *paddr, int after); #define get_array_info NULL #define put_array_info NULL static long get_units(DBADDR *paddr, char *units); -static long get_precision(DBADDR *paddr, long *precision); +static long get_precision(const DBADDR *paddr, long *precision); #define get_enum_str NULL #define get_enum_strs NULL #define put_enum_str NULL @@ -182,7 +182,7 @@ static long get_units(DBADDR *paddr, char *units) return 0; } -static long get_precision(DBADDR *paddr, long *pprecision) +static long get_precision(const DBADDR *paddr, long *pprecision) { calcRecord *prec = (calcRecord *)paddr->precord; int fieldIndex = dbGetFieldIndex(paddr); diff --git a/src/std/rec/calcoutRecord.c b/src/std/rec/calcoutRecord.c index 240dc312c..f9a8e0e89 100644 --- a/src/std/rec/calcoutRecord.c +++ b/src/std/rec/calcoutRecord.c @@ -56,7 +56,7 @@ static long special(DBADDR *, int); #define get_array_info NULL #define put_array_info NULL static long get_units(DBADDR *, char *); -static long get_precision(DBADDR *, long *); +static long get_precision(const DBADDR *, long *); #define get_enum_str NULL #define get_enum_strs NULL #define put_enum_str NULL @@ -410,7 +410,7 @@ static long get_units(DBADDR *paddr, char *units) return 0; } -static long get_precision(DBADDR *paddr, long *pprecision) +static long get_precision(const DBADDR *paddr, long *pprecision) { calcoutRecord *prec = (calcoutRecord *)paddr->precord; int fieldIndex = dbGetFieldIndex(paddr); diff --git a/src/std/rec/compressRecord.c b/src/std/rec/compressRecord.c index f7f0b0c70..5dc836258 100644 --- a/src/std/rec/compressRecord.c +++ b/src/std/rec/compressRecord.c @@ -51,7 +51,7 @@ static long cvt_dbaddr(DBADDR *); static long get_array_info(DBADDR *, long *, long *); static long put_array_info(DBADDR *, long); static long get_units(DBADDR *, char *); -static long get_precision(DBADDR *, long *); +static long get_precision(const DBADDR *, long *); #define get_enum_str NULL #define get_enum_strs NULL #define put_enum_str NULL @@ -459,7 +459,7 @@ static long get_units(DBADDR *paddr, char *units) return 0; } -static long get_precision(DBADDR *paddr, long *precision) +static long get_precision(const DBADDR *paddr, long *precision) { compressRecord *prec = (compressRecord *) paddr->precord; diff --git a/src/std/rec/dfanoutRecord.c b/src/std/rec/dfanoutRecord.c index a60047776..f24b8491d 100644 --- a/src/std/rec/dfanoutRecord.c +++ b/src/std/rec/dfanoutRecord.c @@ -55,7 +55,7 @@ static long process(dfanoutRecord *); #define get_array_info NULL #define put_array_info NULL static long get_units(DBADDR *, char *); -static long get_precision(DBADDR *, long *); +static long get_precision(const DBADDR *, long *); #define get_enum_str NULL #define get_enum_strs NULL #define put_enum_str NULL @@ -139,7 +139,7 @@ static long get_units(DBADDR *paddr,char *units) return(0); } -static long get_precision(DBADDR *paddr,long *precision) +static long get_precision(const DBADDR *paddr,long *precision) { dfanoutRecord *prec=(dfanoutRecord *)paddr->precord; diff --git a/src/std/rec/histogramRecord.c b/src/std/rec/histogramRecord.c index 3519ec091..f3ad331bc 100644 --- a/src/std/rec/histogramRecord.c +++ b/src/std/rec/histogramRecord.c @@ -56,7 +56,7 @@ static long cvt_dbaddr(DBADDR *); static long get_array_info(DBADDR *, long *, long *); #define put_array_info NULL static long get_units(DBADDR *, char *); -static long get_precision(DBADDR *paddr,long *precision); +static long get_precision(const DBADDR *paddr,long *precision); #define get_enum_str NULL #define get_enum_strs NULL #define put_enum_str NULL @@ -417,7 +417,7 @@ static long get_units(DBADDR *paddr, char *units) return 0; } -static long get_precision(DBADDR *paddr,long *precision) +static long get_precision(const DBADDR *paddr,long *precision) { histogramRecord *prec = (histogramRecord *) paddr->precord; diff --git a/src/std/rec/mbbiRecord.c b/src/std/rec/mbbiRecord.c index a0714911a..40dd8019a 100644 --- a/src/std/rec/mbbiRecord.c +++ b/src/std/rec/mbbiRecord.c @@ -55,9 +55,9 @@ static long special(DBADDR *, int); #define put_array_info NULL #define get_units NULL #define get_precision NULL -static long get_enum_str(DBADDR *, char *); -static long get_enum_strs(DBADDR *, struct dbr_enumStrs *); -static long put_enum_str(DBADDR *, char *); +static long get_enum_str(const DBADDR *, char *); +static long get_enum_strs(const DBADDR *, struct dbr_enumStrs *); +static long put_enum_str(const DBADDR *, const char *); #define get_graphic_double NULL #define get_control_double NULL #define get_alarm_double NULL @@ -238,7 +238,7 @@ static long special(DBADDR *paddr, int after) } } -static long get_enum_str(DBADDR *paddr, char *pstring) +static long get_enum_str(const DBADDR *paddr, char *pstring) { mbbiRecord *prec = (mbbiRecord *) paddr->precord; int index; @@ -260,7 +260,7 @@ static long get_enum_str(DBADDR *paddr, char *pstring) return 0; } -static long get_enum_strs(DBADDR *paddr, struct dbr_enumStrs *pes) +static long get_enum_strs(const DBADDR *paddr, struct dbr_enumStrs *pes) { mbbiRecord *prec = (mbbiRecord *) paddr->precord; char *pstate = prec->zrst; @@ -276,7 +276,7 @@ static long get_enum_strs(DBADDR *paddr, struct dbr_enumStrs *pes) return 0; } -static long put_enum_str(DBADDR *paddr, char *pstring) +static long put_enum_str(const DBADDR *paddr, const char *pstring) { mbbiRecord *prec = (mbbiRecord *) paddr->precord; char *pstate; diff --git a/src/std/rec/mbboRecord.c b/src/std/rec/mbboRecord.c index 586bd5ab0..3b9669e8a 100644 --- a/src/std/rec/mbboRecord.c +++ b/src/std/rec/mbboRecord.c @@ -54,9 +54,9 @@ static long cvt_dbaddr(DBADDR *); #define put_array_info NULL #define get_units NULL #define get_precision NULL -static long get_enum_str(DBADDR *, char *); -static long get_enum_strs(DBADDR *, struct dbr_enumStrs *); -static long put_enum_str(DBADDR *, char *); +static long get_enum_str(const DBADDR *, char *); +static long get_enum_strs(const DBADDR *, struct dbr_enumStrs *); +static long put_enum_str(const DBADDR *, const char *); #define get_graphic_double NULL #define get_control_double NULL #define get_alarm_double NULL @@ -306,7 +306,7 @@ static long cvt_dbaddr(DBADDR *paddr) return 0; } -static long get_enum_str(DBADDR *paddr, char *pstring) +static long get_enum_str(const DBADDR *paddr, char *pstring) { mbboRecord *prec = (mbboRecord *) paddr->precord; epicsEnum16 *pfield = paddr->pfield; @@ -326,7 +326,7 @@ static long get_enum_str(DBADDR *paddr, char *pstring) return 0; } -static long get_enum_strs(DBADDR *paddr, struct dbr_enumStrs *pes) +static long get_enum_strs(const DBADDR *paddr, struct dbr_enumStrs *pes) { mbboRecord *prec = (mbboRecord *) paddr->precord; const char *pstate; @@ -345,7 +345,7 @@ static long get_enum_strs(DBADDR *paddr, struct dbr_enumStrs *pes) return 0; } -static long put_enum_str(DBADDR *paddr,char *pstring) +static long put_enum_str(const DBADDR *paddr, const char *pstring) { mbboRecord *prec = (mbboRecord *) paddr->precord; const char *pstate; diff --git a/src/std/rec/selRecord.c b/src/std/rec/selRecord.c index 240d9928a..da4208360 100644 --- a/src/std/rec/selRecord.c +++ b/src/std/rec/selRecord.c @@ -48,7 +48,7 @@ static long process(selRecord *); #define get_array_info NULL #define put_array_info NULL static long get_units(DBADDR *, char *); -static long get_precision(DBADDR *, long *); +static long get_precision(const DBADDR *, long *); #define get_enum_str NULL #define get_enum_strs NULL #define put_enum_str NULL @@ -145,7 +145,7 @@ static long get_units(DBADDR *paddr, char *units) return(0); } -static long get_precision(DBADDR *paddr, long *precision) +static long get_precision(const DBADDR *paddr, long *precision) { selRecord *prec=(selRecord *)paddr->precord; double *pvalue,*plvalue; diff --git a/src/std/rec/seqRecord.c b/src/std/rec/seqRecord.c index fb67b2dbf..7c42eb7aa 100644 --- a/src/std/rec/seqRecord.c +++ b/src/std/rec/seqRecord.c @@ -46,7 +46,7 @@ static long process(seqRecord *prec); #define get_array_info NULL #define put_array_info NULL static long get_units(DBADDR *, char *); -static long get_precision(dbAddr *paddr, long *); +static long get_precision(const DBADDR *paddr, long *); #define get_enum_str NULL #define get_enum_strs NULL #define put_enum_str NULL @@ -299,7 +299,7 @@ static long get_units(DBADDR *paddr, char *units) return 0; } -static long get_precision(dbAddr *paddr, long *pprecision) +static long get_precision(const DBADDR *paddr, long *pprecision) { seqRecord *prec = (seqRecord *) paddr->precord; int fieldOffset = dbGetFieldIndex(paddr) - indexof(DLY1); diff --git a/src/std/rec/subArrayRecord.c b/src/std/rec/subArrayRecord.c index 2182be9ee..b31789980 100644 --- a/src/std/rec/subArrayRecord.c +++ b/src/std/rec/subArrayRecord.c @@ -54,7 +54,7 @@ static long cvt_dbaddr(DBADDR *paddr); static long get_array_info(DBADDR *paddr, long *no_elements, long *offset); static long put_array_info(DBADDR *paddr, long nNew); static long get_units(DBADDR *paddr, char *units); -static long get_precision(DBADDR *paddr, long *precision); +static long get_precision(const DBADDR *paddr, long *precision); #define get_enum_str NULL #define get_enum_strs NULL #define put_enum_str NULL @@ -218,7 +218,7 @@ static long get_units(DBADDR *paddr, char *units) return 0; } -static long get_precision(DBADDR *paddr, long *precision) +static long get_precision(const DBADDR *paddr, long *precision) { subArrayRecord *prec = (subArrayRecord *) paddr->precord; diff --git a/src/std/rec/subRecord.c b/src/std/rec/subRecord.c index e343af0d6..5a089aedb 100644 --- a/src/std/rec/subRecord.c +++ b/src/std/rec/subRecord.c @@ -52,7 +52,7 @@ static long special(DBADDR *, int); #define get_array_info NULL #define put_array_info NULL static long get_units(DBADDR *, char *); -static long get_precision(DBADDR *, long *); +static long get_precision(const DBADDR *, long *); #define get_enum_str NULL #define get_enum_strs NULL #define put_enum_str NULL @@ -216,7 +216,7 @@ static long get_units(DBADDR *paddr, char *units) return 0; } -static long get_precision(DBADDR *paddr, long *pprecision) +static long get_precision(const DBADDR *paddr, long *pprecision) { subRecord *prec = (subRecord *)paddr->precord; int fieldIndex = dbGetFieldIndex(paddr); diff --git a/src/std/rec/waveformRecord.c b/src/std/rec/waveformRecord.c index c08460037..2b05274e6 100644 --- a/src/std/rec/waveformRecord.c +++ b/src/std/rec/waveformRecord.c @@ -52,7 +52,7 @@ static long cvt_dbaddr(DBADDR *); static long get_array_info(DBADDR *, long *, long *); static long put_array_info(DBADDR *, long); static long get_units(DBADDR *, char *); -static long get_precision(DBADDR *, long *); +static long get_precision(const DBADDR *, long *); #define get_enum_str NULL #define get_enum_strs NULL #define put_enum_str NULL @@ -212,7 +212,7 @@ static long get_units(DBADDR *paddr, char *units) return 0; } -static long get_precision(DBADDR *paddr, long *precision) +static long get_precision(const DBADDR *paddr, long *precision) { waveformRecord *prec = (waveformRecord *) paddr->precord;