Skip to content

Fix compile errors in C23 mode #222

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 compile errors in C23 mode #222

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
2 changes: 1 addition & 1 deletion asyn/asynRecord/asynRecord.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ typedef struct asynRecordDset {
} asynRecordDset;

asynRecordDset asynRecordDevice = {
5,0,0,0,getIoIntInfo,0};
5,0,0,0,(DEVSUPFUN)getIoIntInfo,0};
epicsExportAddress(dset, asynRecordDevice);


Expand Down
6 changes: 3 additions & 3 deletions asyn/devEpics/devAsynFloat64.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,11 +126,11 @@ typedef struct analogDset { /* analog dset */
} analogDset;

analogDset asynAiFloat64 = {
6, 0, 0, initAi, getIoIntInfo, processAi, 0};
6, 0, 0, (DEVSUPFUN)initAi, (DEVSUPFUN)getIoIntInfo, (DEVSUPFUN)processAi, 0};
analogDset asynAoFloat64 = {
6, 0, 0, initAo, getIoIntInfo, processAo, 0};
6, 0, 0, (DEVSUPFUN)initAo, (DEVSUPFUN)getIoIntInfo, (DEVSUPFUN)processAo, 0};
analogDset asynAiFloat64Average = {
6, 0, 0, initAiAverage, getIoIntInfo, processAiAverage, 0};
6, 0, 0, (DEVSUPFUN)initAiAverage, (DEVSUPFUN)getIoIntInfo, (DEVSUPFUN)processAiAverage, 0};

epicsExportAddress(dset, asynAiFloat64);
epicsExportAddress(dset, asynAoFloat64);
Expand Down
18 changes: 9 additions & 9 deletions asyn/devEpics/devAsynInt32.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,23 +165,23 @@ typedef struct analogDset { /* analog dset */
} analogDset;

analogDset asynAiInt32 = {
6,0,0,initAi, getIoIntInfo, processAi, convertAi };
6,0,0,(DEVSUPFUN)initAi, (DEVSUPFUN)getIoIntInfo, (DEVSUPFUN)processAi, (DEVSUPFUN)convertAi };
analogDset asynAiInt32Average = {
6,0,0,initAiAverage,getIoIntInfo, processAiAverage , convertAi };
6,0,0,(DEVSUPFUN)initAiAverage,(DEVSUPFUN)getIoIntInfo, (DEVSUPFUN)processAiAverage, (DEVSUPFUN)convertAi };
analogDset asynAoInt32 = {
6,0,0,initAo, getIoIntInfo, processAo , convertAo };
6,0,0,(DEVSUPFUN)initAo, (DEVSUPFUN)getIoIntInfo, (DEVSUPFUN)processAo, (DEVSUPFUN)convertAo };
analogDset asynLiInt32 = {
5,0,0,initLi, getIoIntInfo, processLi };
5,0,0,(DEVSUPFUN)initLi, (DEVSUPFUN)getIoIntInfo, (DEVSUPFUN)processLi };
analogDset asynLoInt32 = {
5,0,0,initLo, getIoIntInfo, processLo };
5,0,0,(DEVSUPFUN)initLo, (DEVSUPFUN)getIoIntInfo, (DEVSUPFUN)processLo };
analogDset asynBiInt32 = {
5,0,0,initBi, getIoIntInfo, processBi };
5,0,0,(DEVSUPFUN)initBi, (DEVSUPFUN)getIoIntInfo, (DEVSUPFUN)processBi };
analogDset asynBoInt32 = {
5,0,0,initBo, getIoIntInfo, processBo };
5,0,0,(DEVSUPFUN)initBo, (DEVSUPFUN)getIoIntInfo, (DEVSUPFUN)processBo };
analogDset asynMbbiInt32 = {
5,0,0,initMbbi, getIoIntInfo, processMbbi };
5,0,0,(DEVSUPFUN)initMbbi, (DEVSUPFUN)getIoIntInfo, (DEVSUPFUN)processMbbi };
analogDset asynMbboInt32 = {
5,0,0,initMbbo, getIoIntInfo, processMbbo };
5,0,0,(DEVSUPFUN)initMbbo, (DEVSUPFUN)getIoIntInfo, (DEVSUPFUN)processMbbo };

epicsExportAddress(dset, asynAiInt32);
epicsExportAddress(dset, asynAiInt32Average);
Expand Down
14 changes: 7 additions & 7 deletions asyn/devEpics/devAsynInt64.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,9 +140,9 @@ static long processLLi(int64inRecord *pr);
static long processLLo(int64outRecord *pr);

analogDset asynInt64In = {
5,0,0,initLLi, getIoIntInfo, processLLi };
5,0,0,(DEVSUPFUN)initLLi, (DEVSUPFUN)getIoIntInfo, (DEVSUPFUN)processLLi };
analogDset asynInt64Out = {
5,0,0,initLLo, getIoIntInfo, processLLo };
5,0,0,(DEVSUPFUN)initLLo, (DEVSUPFUN)getIoIntInfo, (DEVSUPFUN)processLLo };
epicsExportAddress(dset, asynInt64In);
epicsExportAddress(dset, asynInt64Out);
#endif
Expand All @@ -161,15 +161,15 @@ static long processLo(longoutRecord *pr);


analogDset asynAiInt64 = {
6,0,0,initAi, getIoIntInfo, processAi, convertAi };
6,0,0,(DEVSUPFUN)initAi, (DEVSUPFUN)getIoIntInfo, (DEVSUPFUN)processAi, (DEVSUPFUN)convertAi };
analogDset asynAiInt64Average = {
6,0,0,initAiAverage,getIoIntInfo, processAiAverage , convertAi };
6,0,0,(DEVSUPFUN)initAiAverage,(DEVSUPFUN)getIoIntInfo, (DEVSUPFUN)processAiAverage , (DEVSUPFUN)convertAi };
analogDset asynAoInt64 = {
6,0,0,initAo, getIoIntInfo, processAo , convertAo };
6,0,0,(DEVSUPFUN)initAo, (DEVSUPFUN)getIoIntInfo, (DEVSUPFUN)processAo , (DEVSUPFUN)convertAo };
analogDset asynLiInt64 = {
5,0,0,initLi, getIoIntInfo, processLi };
5,0,0,(DEVSUPFUN)initLi, (DEVSUPFUN)getIoIntInfo, (DEVSUPFUN)processLi };
analogDset asynLoInt64 = {
5,0,0,initLo, getIoIntInfo, processLo };
5,0,0,(DEVSUPFUN)initLo, (DEVSUPFUN)getIoIntInfo, (DEVSUPFUN)processLo };
epicsExportAddress(dset, asynAiInt64);
epicsExportAddress(dset, asynAiInt64Average);
epicsExportAddress(dset, asynAoInt64);
Expand Down
30 changes: 15 additions & 15 deletions asyn/devEpics/devAsynOctet.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,38 +193,38 @@ typedef struct commonDset {
} commonDset;

commonDset asynSiOctetCmdResponse = {
5, 0, 0, initSiCmdResponse, 0, processCommon};
5, 0, 0, (DEVSUPFUN)initSiCmdResponse, 0, (DEVSUPFUN)processCommon};
commonDset asynSiOctetWriteRead = {
5, 0, 0, initSiWriteRead, 0, processCommon};
5, 0, 0, (DEVSUPFUN)initSiWriteRead, 0, (DEVSUPFUN)processCommon};
commonDset asynSiOctetRead = {
5, 0, 0, initSiRead, getIoIntInfo, processCommon};
5, 0, 0, (DEVSUPFUN)initSiRead, (DEVSUPFUN)getIoIntInfo, (DEVSUPFUN)processCommon};
commonDset asynSoOctetWrite = {
5, 0, 0, initSoWrite, 0, processCommon};
5, 0, 0, (DEVSUPFUN)initSoWrite, 0, (DEVSUPFUN)processCommon};
commonDset asynWfOctetCmdResponse = {
5, 0, 0, initWfCmdResponse, 0, processCommon};
5, 0, 0, (DEVSUPFUN)initWfCmdResponse, 0, (DEVSUPFUN)processCommon};
commonDset asynWfOctetWriteRead = {
5, 0, 0, initWfWriteRead, 0, processCommon};
5, 0, 0, (DEVSUPFUN)initWfWriteRead, 0, (DEVSUPFUN)processCommon};
commonDset asynWfOctetRead = {
5, 0, 0, initWfRead, getIoIntInfo, processCommon};
5, 0, 0, (DEVSUPFUN)initWfRead, (DEVSUPFUN)getIoIntInfo, (DEVSUPFUN)processCommon};
commonDset asynWfOctetWrite = {
5, 0, 0, initWfWrite, 0, processCommon};
5, 0, 0, (DEVSUPFUN)initWfWrite, 0, (DEVSUPFUN)processCommon};
commonDset asynWfOctetWriteBinary = {
5, 0, 0, initWfWriteBinary, 0, processCommon};
5, 0, 0, (DEVSUPFUN)initWfWriteBinary, 0, (DEVSUPFUN)processCommon};
#ifdef HAVE_LSREC
commonDset asynLsiOctetCmdResponse = {
5, 0, 0, initLsiCmdResponse, 0, processCommon};
5, 0, 0, (DEVSUPFUN)initLsiCmdResponse, 0, (DEVSUPFUN)processCommon};
commonDset asynLsiOctetWriteRead = {
5, 0, 0, initLsiWriteRead, 0, processCommon};
5, 0, 0, (DEVSUPFUN)initLsiWriteRead, 0, (DEVSUPFUN)processCommon};
commonDset asynLsiOctetRead = {
5, 0, 0, initLsiRead, getIoIntInfo, processCommon};
5, 0, 0, (DEVSUPFUN)initLsiRead, (DEVSUPFUN)getIoIntInfo, (DEVSUPFUN)processCommon};
commonDset asynLsoOctetWrite = {
5, 0, 0, initLsoWrite, 0, processCommon};
5, 0, 0, (DEVSUPFUN)initLsoWrite, 0, (DEVSUPFUN)processCommon};
commonDset asynPfOctetWrite = {
5, 0, 0, initPfWrite, 0, processCommon};
5, 0, 0, (DEVSUPFUN)initPfWrite, 0, (DEVSUPFUN)processCommon};
#endif /* HAVE_LSREC */
#ifdef HAVE_CALCMOD
commonDset asynScalcoutOctetWrite = {
5, 0, 0, initScalcoutWrite, 0, processCommon};
5, 0, 0, (DEVSUPFUN)initScalcoutWrite, 0, (DEVSUPFUN)processCommon};
#endif /* HAVE_CALCMOD */

epicsExportAddress(dset, asynSiOctetCmdResponse);
Expand Down
16 changes: 8 additions & 8 deletions asyn/devEpics/devAsynUInt32Digital.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,21 +151,21 @@ typedef struct analogDset { /* analog dset */
} analogDset;

analogDset asynBiUInt32Digital = {
6,0,0,initBi, getIoIntInfo, processBi};
6,0,0,(DEVSUPFUN)initBi, (DEVSUPFUN)getIoIntInfo, (DEVSUPFUN)processBi};
analogDset asynBoUInt32Digital = {
6,0,0,initBo, getIoIntInfo, processBo};
6,0,0,(DEVSUPFUN)initBo, (DEVSUPFUN)getIoIntInfo, (DEVSUPFUN)processBo};
analogDset asynLiUInt32Digital = {
5,0,0,initLi, getIoIntInfo, processLi};
5,0,0,(DEVSUPFUN)initLi, (DEVSUPFUN)getIoIntInfo, (DEVSUPFUN)processLi};
analogDset asynLoUInt32Digital = {
5,0,0,initLo, getIoIntInfo, processLo};
5,0,0,(DEVSUPFUN)initLo, (DEVSUPFUN)getIoIntInfo, (DEVSUPFUN)processLo};
analogDset asynMbbiUInt32Digital = {
5,0,0,initMbbi, getIoIntInfo, processMbbi};
5,0,0,(DEVSUPFUN)initMbbi, (DEVSUPFUN)getIoIntInfo, (DEVSUPFUN)processMbbi};
analogDset asynMbboUInt32Digital = {
5,0,0,initMbbo, getIoIntInfo, processMbbo};
5,0,0,(DEVSUPFUN)initMbbo, (DEVSUPFUN)getIoIntInfo, (DEVSUPFUN)processMbbo};
analogDset asynMbbiDirectUInt32Digital = {
5,0,0,initMbbiDirect, getIoIntInfo, processMbbiDirect};
5,0,0,(DEVSUPFUN)initMbbiDirect, (DEVSUPFUN)getIoIntInfo, (DEVSUPFUN)processMbbiDirect};
analogDset asynMbboDirectUInt32Digital = {
5,0,0,initMbboDirect, getIoIntInfo, processMbboDirect};
5,0,0,(DEVSUPFUN)initMbboDirect, (DEVSUPFUN)getIoIntInfo, (DEVSUPFUN)processMbboDirect};

epicsExportAddress(dset, asynBiUInt32Digital);
epicsExportAddress(dset, asynBoUInt32Digital);
Expand Down
2 changes: 1 addition & 1 deletion asyn/devEpics/devAsynXXXTimeSeries.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ typedef struct analogDset { /* analog dset */ \
} analogDset; \
\
analogDset DSET = \
{6, 0, 0, initRecord, 0, process, 0}; \
{6, 0, 0, (DEVSUPFUN)initRecord, 0, (DEVSUPFUN)process, 0}; \
\
epicsExportAddress(dset, DSET); \
\
Expand Down
6 changes: 4 additions & 2 deletions asyn/devGpib/devCommonGpib.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@
#include "devSupportGpib.h"
#include "devCommonGpib.h"

typedef long(*special_linconv_t)(void*, int);


/* The following is a generic finish routine for output records */
static void genericFinish(gpibDpvt * pgpibDpvt,int failure)
Expand All @@ -64,7 +66,7 @@ long devGpib_initAi(aiRecord * pai)
pai->pact = TRUE;
return S_db_badField;
}
if(got_special_linconv) (*got_special_linconv)(pai,TRUE);
if(got_special_linconv) ((special_linconv_t)got_special_linconv)(pai,TRUE);
return 0;
}

Expand Down Expand Up @@ -145,7 +147,7 @@ long devGpib_initAo(aoRecord * pao)
pao->pact = TRUE;
return S_db_badField;
}
if(got_special_linconv) (*got_special_linconv)(pao,TRUE);
if(got_special_linconv) ((special_linconv_t)got_special_linconv)(pao,TRUE);
return (got_special_linconv ? 0 : 2);
}

Expand Down
32 changes: 16 additions & 16 deletions asyn/devGpib/devGpib.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ static devGpibParmBlock devSupParms;
static long init_ai(int pass);
static gDset DSET_AI = {
6,
{0, init_ai, devGpib_initAi, 0, devGpib_readAi, 0},
{0, (DEVSUPFUN)init_ai, (DEVSUPFUN)devGpib_initAi, 0, (DEVSUPFUN)devGpib_readAi, 0},
&devSupParms
};
epicsExportAddress(dset,DSET_AI);
Expand All @@ -57,7 +57,7 @@ epicsExportAddress(dset,DSET_AI);
static long dummySpecialLinconvAIRAW(struct aiRecord * pai, int after) { return 0; }
static gDset DSET_AIRAW = {
6,
{0, init_ai, devGpib_initAi, 0, devGpib_readAi, dummySpecialLinconvAIRAW},
{0, (DEVSUPFUN)init_ai, (DEVSUPFUN)devGpib_initAi, 0, (DEVSUPFUN)devGpib_readAi, (DEVSUPFUN)dummySpecialLinconvAIRAW},
&devSupParms
};
epicsExportAddress(dset,DSET_AIRAW);
Expand All @@ -66,7 +66,7 @@ epicsExportAddress(dset,DSET_AIRAW);
#ifdef DSET_AO
static gDset DSET_AO = {
6,
{0, 0, devGpib_initAo, 0, devGpib_writeAo, 0},
{0, 0, (DEVSUPFUN)devGpib_initAo, 0, (DEVSUPFUN)devGpib_writeAo, 0},
&devSupParms
};
epicsExportAddress(dset,DSET_AO);
Expand All @@ -76,7 +76,7 @@ epicsExportAddress(dset,DSET_AO);
static long dummySpecialLinconvAORAW(struct aoRecord * pao, int after) { return 0; }
static gDset DSET_AORAW = {
6,
{0, 0, devGpib_initAo, 0, devGpib_writeAo, dummySpecialLinconvAORAW},
{0, 0, (DEVSUPFUN)devGpib_initAo, 0, (DEVSUPFUN)devGpib_writeAo, (DEVSUPFUN)dummySpecialLinconvAORAW},
&devSupParms
};
epicsExportAddress(dset,DSET_AORAW);
Expand All @@ -85,7 +85,7 @@ epicsExportAddress(dset,DSET_AORAW);
#ifdef DSET_BI
static gDset DSET_BI = {
6,
{0, 0, devGpib_initBi, 0, devGpib_readBi, 0},
{0, 0, (DEVSUPFUN)devGpib_initBi, 0, (DEVSUPFUN)devGpib_readBi, 0},
&devSupParms
};
epicsExportAddress(dset,DSET_BI);
Expand All @@ -94,7 +94,7 @@ epicsExportAddress(dset,DSET_BI);
#ifdef DSET_BO
static gDset DSET_BO = {
6,
{0, 0, devGpib_initBo, 0, devGpib_writeBo,0},
{0, 0, (DEVSUPFUN)devGpib_initBo, 0, (DEVSUPFUN)devGpib_writeBo,0},
&devSupParms
};
epicsExportAddress(dset,DSET_BO);
Expand All @@ -103,7 +103,7 @@ epicsExportAddress(dset,DSET_BO);
#ifdef DSET_EV
static gDset DSET_EV = {
6,
{0, 0, devGpib_initEv, 0, devGpib_readEv, 0},
{0, 0, (DEVSUPFUN)devGpib_initEv, 0, (DEVSUPFUN)devGpib_readEv, 0},
&devSupParms
};
epicsExportAddress(dset,DSET_EV);
Expand All @@ -112,7 +112,7 @@ epicsExportAddress(dset,DSET_EV);
#ifdef DSET_LI
static gDset DSET_LI = {
6,
{0, 0, devGpib_initLi, 0, devGpib_readLi, 0},
{0, 0, (DEVSUPFUN)devGpib_initLi, 0, (DEVSUPFUN)devGpib_readLi, 0},
&devSupParms
};
epicsExportAddress(dset,DSET_LI);
Expand All @@ -121,7 +121,7 @@ epicsExportAddress(dset,DSET_LI);
#ifdef DSET_LO
static gDset DSET_LO = {
6,
{0, 0, devGpib_initLo, 0, devGpib_writeLo,0},
{0, 0, (DEVSUPFUN)devGpib_initLo, 0, (DEVSUPFUN)devGpib_writeLo,0},
&devSupParms
};
epicsExportAddress(dset,DSET_LO);
Expand All @@ -130,7 +130,7 @@ epicsExportAddress(dset,DSET_LO);
#ifdef DSET_MBBI
static gDset DSET_MBBI = {
6,
{0, 0, devGpib_initMbbi, 0, devGpib_readMbbi, 0},
{0, 0, (DEVSUPFUN)devGpib_initMbbi, 0, (DEVSUPFUN)devGpib_readMbbi, 0},
&devSupParms
};
epicsExportAddress(dset,DSET_MBBI);
Expand All @@ -139,7 +139,7 @@ epicsExportAddress(dset,DSET_MBBI);
#ifdef DSET_MBBO
static gDset DSET_MBBO = {
6,
{0, 0, devGpib_initMbbo, 0, devGpib_writeMbbo,0},
{0, 0, (DEVSUPFUN)devGpib_initMbbo, 0, (DEVSUPFUN)devGpib_writeMbbo,0},
&devSupParms
};
epicsExportAddress(dset,DSET_MBBO);
Expand All @@ -148,7 +148,7 @@ epicsExportAddress(dset,DSET_MBBO);
#ifdef DSET_MBBID
static gDset DSET_MBBID = {
6,
{0, 0, devGpib_initMbbiDirect, 0, devGpib_readMbbiDirect,0},
{0, 0, (DEVSUPFUN)devGpib_initMbbiDirect, 0, (DEVSUPFUN)devGpib_readMbbiDirect,0},
&devSupParms
};
epicsExportAddress(dset,DSET_MBBID);
Expand All @@ -157,7 +157,7 @@ epicsExportAddress(dset,DSET_MBBID);
#ifdef DSET_MBBOD
static gDset DSET_MBBOD = {
6,
{0, 0, devGpib_initMbboDirect, 0, devGpib_writeMbboDirect,0},
{0, 0, (DEVSUPFUN)devGpib_initMbboDirect, 0, (DEVSUPFUN)devGpib_writeMbboDirect,0},
&devSupParms
};
epicsExportAddress(dset,DSET_MBBOD);
Expand All @@ -166,7 +166,7 @@ epicsExportAddress(dset,DSET_MBBOD);
#ifdef DSET_SI
static gDset DSET_SI = {
6,
{0, 0, devGpib_initSi, 0, devGpib_readSi, 0},
{0, 0, (DEVSUPFUN)devGpib_initSi, 0, (DEVSUPFUN)devGpib_readSi, 0},
&devSupParms
};
epicsExportAddress(dset,DSET_SI);
Expand All @@ -175,7 +175,7 @@ epicsExportAddress(dset,DSET_SI);
#ifdef DSET_SO
static gDset DSET_SO = {
6,
{0, 0, devGpib_initSo, 0, devGpib_writeSo,0},
{0, 0, (DEVSUPFUN)devGpib_initSo, 0, (DEVSUPFUN)devGpib_writeSo,0},
&devSupParms
};
epicsExportAddress(dset,DSET_SO);
Expand All @@ -184,7 +184,7 @@ epicsExportAddress(dset,DSET_SO);
#ifdef DSET_WF
static gDset DSET_WF = {
6,
{0, 0, devGpib_initWf, 0, devGpib_readWf, 0},
{0, 0, (DEVSUPFUN)devGpib_initWf, 0, (DEVSUPFUN)devGpib_readWf, 0},
&devSupParms
};
epicsExportAddress(dset,DSET_WF);
Expand Down
2 changes: 1 addition & 1 deletion asyn/devGpib/devSupportGpib.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1554,7 +1554,7 @@ static long report(int interest)

static gDset devGpib= {
6,
{report,init,0,0,0,0},
{(DEVSUPFUN)report,(DEVSUPFUN)init,0,0,0,0},
0
};
epicsExportAddress(dset,devGpib);
2 changes: 1 addition & 1 deletion testApp/src/devTestBlock.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ typedef struct commonDset {
} commonDset;

commonDset devTestBlockInp = {
5,0,0,initSiWriteRead, 0 ,processCommon};
5,0,0,(DEVSUPFUN)initSiWriteRead, 0 ,(DEVSUPFUN)processCommon};

epicsExportAddress(dset, devTestBlockInp);

Expand Down