Merge f1adcc3 into cb15717

epics-base · Apr 3, 2024 · 59a9d3c · 59a9d3c
2 parents cb15717 + f1adcc3
commit 59a9d3c
Show file tree

Hide file tree

Showing 27 changed files with 1,066 additions and 827 deletions.
diff --git a/modules/ca/src/client/Makefile b/modules/ca/src/client/Makefile
@@ -118,7 +118,6 @@ EXPAND_VARS = INSTALL_BIN=$(FINAL_LOCATION)/bin/$(T_A)
 SRC_DIRS += $(CURDIR)/test
 PROD_HOST += ca_test
 ca_test_SRCS = ca_test_main.c ca_test.c
-ca_test_LIBS  = ca Com
 ca_test_SYS_LIBS_WIN32 = ws2_32 advapi32 user32
 
 OBJS_vxWorks += ca_test

diff --git a/modules/database/src/ioc/as/Makefile b/modules/database/src/ioc/as/Makefile
@@ -23,4 +23,4 @@ dbCore_SRCS += asIocRegister.c
 
 PROD_HOST += ascheck
 ascheck_SRCS = ascheck.c
-ascheck_LIBS = dbCore ca Com
+ascheck_LIBS = dbCore ca
diff --git a/modules/database/src/ioc/db/dbAccess.c b/modules/database/src/ioc/db/dbAccess.c
@@ -112,7 +112,7 @@ void dbSpcAsRegisterCallback(SPC_ASCALLBACK func)
 
 long dbPutSpecial(DBADDR *paddr,int pass)
 {
-    long int    (*pspecial)()=NULL;
+    long int    (*pspecial)(struct dbAddr *, int)=NULL;
     rset        *prset;
     dbCommon    *precord = paddr->precord;
     long        status=0;

diff --git a/modules/database/src/ioc/db/dbConvertFast.h b/modules/database/src/ioc/db/dbConvertFast.h
@@ -19,8 +19,11 @@
 extern "C" {
 #endif
 
-DBCORE_API extern long (*dbFastGetConvertRoutine[DBF_DEVICE+1][DBR_ENUM+1])();
-DBCORE_API extern long (*dbFastPutConvertRoutine[DBR_ENUM+1][DBF_DEVICE+1])();
+struct dbAddr;
+typedef long (*FASTCONVERTFUNC)(const void *from, void *to, const struct dbAddr *paddr);
+
+DBCORE_API extern FASTCONVERTFUNC dbFastGetConvertRoutine[DBF_DEVICE+1][DBR_ENUM+1];
+DBCORE_API extern FASTCONVERTFUNC dbFastPutConvertRoutine[DBR_ENUM+1][DBF_DEVICE+1];
 
 #ifdef __cplusplus
 }

diff --git a/modules/database/src/ioc/db/dbConvertJSON.c b/modules/database/src/ioc/db/dbConvertJSON.c
@@ -19,8 +19,6 @@
 #include "dbConvertFast.h"
 #include "dbConvertJSON.h"
 
-typedef long (*FASTCONVERT)();
-
 typedef struct parseContext {
     int depth;
     short dbrType;
@@ -42,7 +40,7 @@ static int dbcj_boolean(void *ctx, int val) {
 static int dbcj_integer(void *ctx, long long num) {
     parseContext *parser = (parseContext *) ctx;
     epicsInt64 val64 = num;
-    FASTCONVERT conv = dbFastPutConvertRoutine[DBF_INT64][parser->dbrType];
+    FASTCONVERTFUNC conv = dbFastPutConvertRoutine[DBF_INT64][parser->dbrType];
 
     if (parser->elems > 0) {
         conv(&val64, parser->pdest, NULL);
@@ -54,7 +52,7 @@ static int dbcj_integer(void *ctx, long long num) {
 
 static int dbcj_double(void *ctx, double num) {
     parseContext *parser = (parseContext *) ctx;
-    FASTCONVERT conv = dbFastPutConvertRoutine[DBF_DOUBLE][parser->dbrType];
+    FASTCONVERTFUNC conv = dbFastPutConvertRoutine[DBF_DOUBLE][parser->dbrType];
 
     if (parser->elems > 0) {
         conv(&num, parser->pdest, NULL);

diff --git a/modules/database/src/ioc/db/dbEvent.c b/modules/database/src/ioc/db/dbEvent.c
@@ -98,8 +98,8 @@ struct event_user {
     unsigned char       extra_labor;    /* if set call extra labor func */
     unsigned char       flowCtrlMode;   /* replace existing monitor */
     unsigned char       extraLaborBusy;
-    void                (*init_func)();
-    epicsThreadId       init_func_arg;
+    void                (*init_func)(void *);
+    void                *init_func_arg;
 };
 
 typedef struct {