Skip to content

Fix numerous build errors when building with -std=c23 #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JJL772 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix numerous build errors when building with -std=c23 #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 26 additions & 22 deletions calcApp/src/aCalcoutRecord.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,21 +66,21 @@
/* Create RSET - Record Support Entry Table*/
#define report NULL
#define initialize NULL
static long init_record();
static long process();
static long special();
static long init_record(dbCommon *precord, int pas);
static long process(dbCommon *precord);
static long special(DBADDR *paddr, int after);
#define get_value NULL
static long cvt_dbaddr();
static long get_array_info();
static long put_array_info();
static long get_units();
static long get_precision();
static long cvt_dbaddr(dbAddr *paddr);
static long get_array_info(struct dbAddr *paddr, long*, long*);
static long put_array_info(struct dbAddr *paddr, long);
static long get_units(dbAddr *paddr, char *units);
static long get_precision(const dbAddr *paddr, long *pprec);
#define get_enum_str NULL
#define get_enum_strs NULL
#define put_enum_str NULL
static long get_graphic_double();
static long get_control_double();
static long get_alarm_double();
static long get_graphic_double(dbAddr *paddr, struct dbr_grDouble *pgd);
static long get_control_double(dbAddr *paddr, struct dbr_ctrlDouble *pcd);
static long get_alarm_double(dbAddr *paddr, struct dbr_alDouble *pad);

rset acalcoutRSET={
RSETNUMBER,
Expand Down Expand Up @@ -138,19 +138,21 @@ typedef struct rpvtStruct {
short outlink_field_type;
} rpvtStruct;

static void checkAlarms();
static void monitor();
static int fetch_values();
static void execOutput();
static void checkLinks();
static void checkLinksCallback();
static void checkAlarms(acalcoutRecord *pcalc);
static void monitor(acalcoutRecord *pcalc);
static int fetch_values(acalcoutRecord *pcalc);
static void execOutput(acalcoutRecord *pcalc);
static void checkLinks(acalcoutRecord *pcalc);
static void checkLinksCallback(CALLBACK *callback);
static long writeValue(acalcoutRecord *pcalc);
static void call_aCalcPerform(acalcoutRecord *pcalc);
static long doCalc(acalcoutRecord *pcalc);
static void acalcPerformTask(void *parm);
volatile int aCalcoutRecordDebug = 0;
epicsExportAddress(int, aCalcoutRecordDebug);

typedef long(*typed_devsupfun_t)(void*);
Copy link
Member

@anjohnson anjohnson Oct 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change isn't the best solution for converting dset functions. I guess it works for these Record.c files where it generates the least number of code changes, but there could be some record types where it doesn't since the common DSET report(), init() and get_ioint_info() methods have different parameters. These records are also still using the old approach to DSET definition.


#define MAX_FIELDS 12
#define ARRAY_MAX_FIELDS 12

Expand All @@ -166,14 +168,15 @@ static long acalcGetNumElements( acalcoutRecord *pcalc )
}


static long init_record(acalcoutRecord *pcalc, int pass)
static long init_record(dbCommon *precord, int pass)
{
DBLINK *plink;
int i;
double *pvalue;
unsigned short *plinkValid;
short error_number;
acalcoutDSET *pacalcoutDSET;
acalcoutRecord *pcalc = (acalcoutRecord*)precord;

dbAddr Addr;
dbAddr *pAddr = &Addr;
Expand Down Expand Up @@ -268,7 +271,7 @@ static long init_record(acalcoutRecord *pcalc, int pass)
}

if (pacalcoutDSET->init_record ) {
return (*pacalcoutDSET->init_record)(pcalc);
return ((typed_devsupfun_t)pacalcoutDSET->init_record)(pcalc);
}
return(0);
}
Expand Down Expand Up @@ -357,8 +360,9 @@ static long afterCalc(acalcoutRecord *pcalc) {
return(SYNC);
}

static long process(acalcoutRecord *pcalc)
static long process(dbCommon *precord)
{
acalcoutRecord *pcalc = (acalcoutRecord*)precord;
rpvtStruct *prpvt = (rpvtStruct *)pcalc->rpvt;
long i;
double *pnew, *pprev;
Expand Down Expand Up @@ -744,7 +748,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)
{
acalcoutRecord *pcalc=(acalcoutRecord *)paddr->precord;
int fieldIndex = dbGetFieldIndex(paddr);
Expand Down Expand Up @@ -1219,7 +1223,7 @@ static long writeValue(acalcoutRecord *pcalc)
}
if (aCalcoutRecordDebug >= 10)
printf("acalcoutRecord(%s):writeValue:calling device support\n", pcalc->name);
return pacalcoutDSET->write(pcalc);
return ((typed_devsupfun_t)pacalcoutDSET->write)(pcalc);
}

/************************************************************/
Expand Down
2 changes: 1 addition & 1 deletion calcApp/src/devaCalcoutSoft.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ struct {
NULL,
NULL,
NULL,
write_acalcout
(DEVSUPFUN)write_acalcout
};
epicsExportAddress(dset,devaCalcoutSoft);

Expand Down
2 changes: 1 addition & 1 deletion calcApp/src/devsCalcoutSoft.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ struct {
NULL,
NULL,
NULL,
write_scalcout
(DEVSUPFUN)write_scalcout
};
epicsExportAddress(dset,devsCalcoutSoft);

Expand Down
45 changes: 25 additions & 20 deletions calcApp/src/sCalcoutRecord.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,21 +94,21 @@
/* Create RSET - Record Support Entry Table*/
#define report NULL
#define initialize NULL
static long init_record();
static long process();
static long special();
static long init_record(dbCommon *precord, int pass);
static long process(dbCommon *precord);
static long special(DBADDR *paddr, int after);
#define get_value NULL
static long cvt_dbaddr();
static long cvt_dbaddr(dbAddr *paddr);
#define get_array_info NULL
#define put_array_info NULL
static long get_units();
static long get_precision();
static long get_units(dbAddr *paddr, char *units);
static long get_precision(const dbAddr *paddr, long *prec);
#define get_enum_str NULL
#define get_enum_strs NULL
#define put_enum_str NULL
static long get_graphic_double();
static long get_control_double();
static long get_alarm_double();
static long get_graphic_double(dbAddr *paddr, struct dbr_grDouble *pgd);
static long get_control_double(dbAddr *paddr, struct dbr_ctrlDouble *pcd);
static long get_alarm_double(dbAddr *paddr, struct dbr_alDouble *pad);

rset scalcoutRSET={
RSETNUMBER,
Expand Down Expand Up @@ -175,14 +175,16 @@ typedef struct rpvtStruct {
short outlink_field_type;
} rpvtStruct;

static void checkAlarms();
static void monitor();
static int fetch_values();
static void execOutput();
static void checkLinks();
static void checkLinksCallback();
static void checkAlarms(scalcoutRecord *pcalc);
static void monitor(scalcoutRecord *pcalc);
static int fetch_values(scalcoutRecord *pcalc);
static void execOutput(scalcoutRecord *pcalc);
static void checkLinks(scalcoutRecord *pcalc);
static void checkLinksCallback(CALLBACK *pcallback);
static long writeValue(scalcoutRecord *pcalc);

typedef long(*typed_devsupfun_t)(void*);

volatile int sCalcoutRecordDebug = 0;
epicsExportAddress(int, sCalcoutRecordDebug);

Expand All @@ -198,7 +200,7 @@ epicsExportAddress(int, sCalcoutRecordDebug);
static char sFldnames[MAX_FIELDS][3] =
{"AA","BB","CC","DD","EE","FF","GG","HH","II","JJ","KK","LL"};

static long init_record(scalcoutRecord *pcalc, int pass)
static long init_record(dbCommon *precord, int pass)
{
DBLINK *plink;
int i;
Expand All @@ -207,6 +209,7 @@ static long init_record(scalcoutRecord *pcalc, int pass)
short error_number;
char *s, **ps;
scalcoutDSET *pscalcoutDSET;
scalcoutRecord* pcalc = (scalcoutRecord*)precord;

dbAddr Addr;
dbAddr *pAddr = &Addr;
Expand Down Expand Up @@ -311,13 +314,14 @@ static long init_record(scalcoutRecord *pcalc, int pass)
}

if (pscalcoutDSET->init_record ) {
return (*pscalcoutDSET->init_record)(pcalc);
return ((typed_devsupfun_t)pscalcoutDSET->init_record)(pcalc);
}
return(0);
}

static long process(scalcoutRecord *pcalc)
static long process(dbCommon *precord)
{
scalcoutRecord *pcalc = (scalcoutRecord*)precord;
rpvtStruct *prpvt = (rpvtStruct *)pcalc->rpvt;
short doOutput = 0;
long stat;
Expand Down Expand Up @@ -604,7 +608,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)
{
scalcoutRecord *pcalc=(scalcoutRecord *)paddr->precord;
int fieldIndex = dbGetFieldIndex(paddr);
Expand Down Expand Up @@ -1071,5 +1075,6 @@ static long writeValue(scalcoutRecord *pcalc)
pcalc->pact = TRUE;
return(-1);
}
return pscalcoutDSET->write(pcalc);

return ((typed_devsupfun_t)pscalcoutDSET->write)(pcalc);
}
2 changes: 1 addition & 1 deletion calcApp/src/swaitRecord.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ WAIT_IO_EVENT devSWaitIoEvent = {
NULL,
NULL,
NULL,
get_ioint_info,
(DEVSUPFUN)get_ioint_info,
NULL
};
epicsExportAddress(dset, devSWaitIoEvent);
Expand Down
18 changes: 9 additions & 9 deletions calcApp/src/transformRecord.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,15 +144,15 @@ epicsExportAddress(int, transformRecordDebug);
/* Create RSET - Record Support Entry Table*/
#define report NULL
#define initialize NULL
static long init_record();
static long process();
static long special();
static long init_record(dbCommon *precord, int pass);
static long process(dbCommon *precord);
static long special(DBADDR* paddr, int after);
#define get_value NULL
#define cvt_dbaddr NULL
#define get_array_info NULL
#define put_array_info NULL
#define get_units NULL
static long get_precision();
static long get_precision(const DBADDR *addr, long *pprec);
#define get_enum_str NULL
#define get_enum_strs NULL
#define put_enum_str NULL
Expand Down Expand Up @@ -182,8 +182,8 @@ rset transformRSET = {
};
epicsExportAddress(rset, transformRSET);

static void checkAlarms();
static void monitor();
static void checkAlarms(transformRecord *precord);
static void monitor(transformRecord *precord);

/* To provide feedback to the user as to the connection status of the
* links (.IxV and .OxV), the following algorithm has been implemented ...
Expand All @@ -197,8 +197,8 @@ static void monitor();
* (This code stolen from Ned Arnold's calcAo record.)
*/

static void checkLinksCallback();
static void checkLinks();
static void checkLinksCallback(CALLBACK *pcallback);
static void checkLinks(struct transformRecord *precord);
#define NO_CA_LINKS 0
#define CA_LINKS_ALL_OK 1
#define CA_LINKS_NOT_OK 2
Expand Down Expand Up @@ -625,7 +625,7 @@ process(dbCommon *pcommon)


static long
special(const DBADDR *paddr, int after)
special(DBADDR *paddr, int after)
{
int i;
transformRecord *ptran = (transformRecord *) (paddr->precord);
Expand Down