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

More ANSI C conversion

Browse Source
This commit is contained in:
Andrew Johnson
2009-04-27 18:31:50 +00:00
parent 312c0f1203
commit 03c82fa651
6 changed files with 6 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ca/cadef.h
+1 -120
View File
@@ -28,20 +28,8 @@
* done in two ifdef steps so that we will remain compatible with
* traditional C
*/
#ifdef __cplusplus
# define CAC_ANSI_FUNC_PROTO
#endif
#ifdef __STDC__
# ifndef CAC_ANSI_FUNC_PROTO
# define CAC_ANSI_FUNC_PROTO
# endif
#endif
#ifndef CA_DONT_INCLUDE_STDARGH
# ifdef CAC_ANSI_FUNC_PROTO
# include <stdarg.h>
# endif
# include <stdarg.h>
#endif
#ifdef epicsExportSharedSymbols
@@ -77,11 +65,7 @@ struct connection_handler_args {
long op; /* one of CA_OP_CONN_UP or CA_OP_CONN_DOWN */
};
#ifdef CAC_ANSI_FUNC_PROTO
typedef void caCh (struct connection_handler_args args);
#else /*CAC_ANSI_FUNC_PROTO*/
typedef void caCh ();
#endif /*CAC_ANSI_FUNC_PROTO*/
typedef struct ca_access_rights {
unsigned read_access:1;
@@ -94,11 +78,7 @@ struct access_rights_handler_args {
caar ar; /* new access rights state */
};
#ifdef CAC_ANSI_FUNC_PROTO
typedef void caArh (struct access_rights_handler_args args);
#else /*CAC_ANSI_FUNC_PROTO*/
typedef void caArh ();
#endif /*CAC_ANSI_FUNC_PROTO*/
/* The conversion routine to call for each type */
#define VALID_TYPE(TYPE) (((unsigned short)TYPE)<=LAST_BUFFER_TYPE)
@@ -120,17 +100,11 @@ typedef struct event_handler_args {
READONLY void *dbr; /* a pointer to the item returned */
int status; /* ECA_XXX status of the requested op from the server */
} evargs;
#ifdef CAC_ANSI_FUNC_PROTO
typedef void caEventCallBackFunc (struct event_handler_args);
#else /*CAC_ANSI_FUNC_PROTO*/
typedef void caEventCallBackFunc ();
#endif /*CAC_ANSI_FUNC_PROTO*/
epicsShareFunc void epicsShareAPI ca_test_event
(
#ifdef CAC_ANSI_FUNC_PROTO
struct event_handler_args
#endif /*CAC_ANSI_FUNC_PROTO*/
);
/* arguments passed to user exception handlers */
@@ -182,7 +156,6 @@ typedef unsigned CA_SYNC_GID;
__LINE__); \
}
#ifdef CAC_ANSI_FUNC_PROTO
#define TYPENOTCONN (-1) /* the channel's native type when disconnected */
epicsShareFunc short epicsShareAPI ca_field_type (chid chan);
@@ -919,98 +892,6 @@ epicsShareFunc int epicsShareAPI ca_add_masked_array_event
epicsShareFunc int epicsShareAPI ca_modify_user_name ( const char *pUserName );
epicsShareFunc int epicsShareAPI ca_modify_host_name ( const char *pHostName );
#else /* CAC_ANSI_FUNC_PROTO */
epicsShareFunc short epicsShareAPI ca_field_type ();
epicsShareFunc unsigned long epicsShareAPI ca_element_count ();
epicsShareFunc char * epicsShareAPI ca_name ();
epicsShareFunc enum channel_state epicsShareAPI ca_state ();
epicsShareFunc void epicsShareAPI ca_set_puser ();
epicsShareFunc void epicsShareAPI ca_get_puser ();
epicsShareFunc unsigned epicsShareAPI ca_read_access ();
epicsShareFunc unsigned epicsShareAPI ca_write_access ();
epicsShareFunc int epicsShareAPI ca_task_initialize ();
epicsShareFunc int epicsShareAPI ca_task_exit ();
epicsShareFunc int epicsShareAPI ca_search_and_connect ();
epicsShareFunc int epicsShareAPI ca_build_and_connect ();
epicsShareFunc int epicsShareAPI ca_change_connection_event ();
epicsShareFunc int epicsShareAPI ca_replace_access_rights_event ();
epicsShareFunc int epicsShareAPI ca_add_exception_event ();
epicsShareFunc int epicsShareAPI ca_clear_channel ();
epicsShareFunc int epicsShareAPI ca_array_put ();
epicsShareFunc int epicsShareAPI ca_array_put_callback ();
epicsShareFunc int epicsShareAPI ca_array_get ();
epicsShareFunc int epicsShareAPI ca_array_get_callback ();
epicsShareFunc int epicsShareAPI ca_add_masked_array_event ();
epicsShareFunc int epicsShareAPI ca_clear_event ();
epicsShareFunc int epicsShareAPI ca_create_subscription ();
epicsShareFunc int epicsShareAPI ca_clear_subscription ();
epicsShareFunc int epicsShareAPI ca_pend ();
epicsShareFunc int epicsShareAPI ca_test_io ();
epicsShareFunc int epicsShareAPI ca_flush_io ();
epicsShareFunc void epicsShareAPI ca_signal ();
epicsShareFunc void epicsShareAPI ca_signal_with_file_and_lineno ();
epicsShareFunc void epicsShareAPI ca_signal_formated ();
epicsShareFunc char * epicsShareAPI ca_host_name ();
typedef void CAFDHANDLER ();
epicsShareFunc int epicsShareAPI ca_add_fd_registration();
epicsShareFunc int epicsShareAPI ca_replace_printf_handler ();
epicsShareFunc int epicsShareAPI ca_sg_create();
epicsShareFunc int epicsShareAPI ca_sg_delete();
epicsShareFunc int epicsShareAPI ca_sg_block();
epicsShareFunc int epicsShareAPI ca_sg_test();
epicsShareFunc int epicsShareAPI ca_sg_reset();
epicsShareFunc int epicsShareAPI ca_sg_array_get();
epicsShareFunc int epicsShareAPI ca_sg_array_put();
epicsShareFunc int epicsShareAPI ca_sg_stat();
epicsShareFunc int epicsShareAPI ca_modify_user_name();
epicsShareFunc int epicsShareAPI ca_modify_host_name();
epicsShareFunc int epicsShareAPI ca_v42_ok();
epicsShareFunc char * epicsShareAPI ca_version();
epicsShareFunc int epicsShareAPI ca_import();
epicsShareFunc int epicsShareAPI ca_import_cancel();
epicsShareFunc int epicsShareAPI ca_channel_status ();
epicsShareFunc int epicsShareAPI ca_client_status ();
#define ca_build_channel(NAME,XXXXX,CHIDPTR,YYYYY)\
ca_build_and_connect(NAME, XXXXX, 1, CHIDPTR, YYYYY, 0, 0)
#define ca_array_build(NAME,XXXXX, ZZZZZZ, CHIDPTR,YYYYY)\
ca_build_and_connect(NAME, XXXXX, ZZZZZZ, CHIDPTR, YYYYY, 0, 0)
#define ca_search(pChanName, pChanID)\
ca_search_and_connect(pChanName, pChanID, 0, 0)
#define ca_bput(chan, pValue) \
ca_array_put(DBR_STRING, 1, chan, (READONLY dbr_string_t *) (pValue))
#define ca_rput(chan,pValue) \
ca_array_put(DBR_FLOAT, 1, chan, (READONLY dbr_float_t *) pValue)
#define ca_put(type, chan, pValue) ca_array_put(type, 1, chan, pValue)
#define ca_bget(chan, pValue) \
ca_array_get(DBR_STRING, 1, chan, (dbr_string_t *)(pValue))
#define ca_rget(chan, pValue) \
ca_array_get(DBR_FLOAT, 1, chan, (dbr_float_t *)(pValue))
#define ca_get(type, chan, pValue) ca_array_get(type, 1, chan, pValue)
#define ca_bget_callback(chan, pFunc, pArg)\
ca_array_get_callback(DBR_STRING, 1, chan, pFunc, pArg)
#define ca_rget_callback(chan, pFunc, pArg)\
ca_array_get_callback(DBR_FLOAT, 1, chan, pFunc, pArg)
#define ca_get_callback(type, chan, pFunc, pArg)\
ca_array_get_callback(type, 1, chan, pFunc, pArg)
#define ca_put_callback(type, chan, pValue, pFunc, pArg) \
ca_array_put_callback(type, 1u, chan, pValue, pFunc, pArg)
#define ca_add_event(type,chan,pFunc,pArg,pEventID)\
ca_add_array_event(type,1,chan,pFunc,pArg,0.0,0.0,0.0,pEventID)
#define ca_add_delta_event(TYPE,CHID,ENTRY,ARG,DELTA,EVID)\
ca_add_array_event(TYPE,1,CHID,ENTRY,ARG,DELTA,DELTA,0.0,EVID)
#define ca_add_general_event(TYPE,CHID,ENTRY,ARG,P_DELTA,N_DELTA,TO,EVID)\
ca_add_array_event(TYPE,1,CHID,ENTRY,ARG,P_DELTA,N_DELTA,TO,EVID)
#define ca_add_array_event(TYPE,COUNT,CHID,ENTRY,ARG,P_DELTA,N_DELTA,TO,EVID)\
ca_add_masked_array_event(TYPE,COUNT,CHID,ENTRY,ARG,P_DELTA,N_DELTA,TO,EVID, DBE_VALUE | DBE_ALARM)
int ca_pend_event ();
#define ca_poll() ca_pend_event(1e-12)
int ca_pend_io ();
#define ca_sg_get(gid, type, chan, pValue) \
ca_sg_array_get(gid, type, 1u, chan, pValue)
#define ca_sg_put(gid, type, chan, pValue) \
ca_sg_array_put(gid, type, 1u, chan, pValue)
#endif /* CAC_ANSI_FUNC_PROTO */
#ifdef __cplusplus
}
#endif
src/ca/caerr.h
-11
View File
@@ -145,22 +145,11 @@
#define ECA_CONNSEQTMO DEFMSG(CA_K_WARNING, 59)
#define ECA_UNRESPTMO DEFMSG(CA_K_WARNING, 60)
#ifdef __STDC__
#define CAERR_USE_FUNC_PROTO
#endif
#ifdef __cplusplus
#ifndef CAERR_USE_FUNC_PROTO
#define CAERR_USE_FUNC_PROTO
#endif
extern "C" {
#endif
#ifdef CAERR_USE_FUNC_PROTO
epicsShareFunc READONLY char * epicsShareAPI ca_message(long ca_status);
#else /* CAERR_USE_FUNC_PROTO */
READONLY char *ca_message();
#endif
epicsShareExtern READONLY char * ca_message_text [];
src/dev/testDev/devHistogramTestAsyn.c
+4 -6
View File
@@ -32,8 +32,8 @@
#include "epicsExport.h"
/* Create the dset for devHistogramTestAsyn */
static long init_record();
static long read_histogram();
static long init_record(struct histogramRecord *phistogram);
static long read_histogram(struct histogramRecord *phistogram);
struct {
long number;
DEVSUPFUN report;
@@ -53,8 +53,7 @@ struct {
};
epicsExportAddress(dset,devHistogramTestAsyn);
static long init_record(prec)
struct histogramRecord *prec;
static long init_record(struct histogramRecord *prec)
{
CALLBACK *pcallback;
@@ -75,8 +74,7 @@ static long init_record(prec)
return(0);
}
static long read_histogram(prec)
struct histogramRecord *prec;
static long read_histogram(struct histogramRecord *prec)
{
CALLBACK *pcallback=(CALLBACK *)(prec->dpvt);
src/libCom/error/errMdef.h
+1 -25
View File
@@ -19,20 +19,9 @@
#ifdef __cplusplus
extern "C" {
#define errMDefUseProtoANSI
#endif
#ifdef __STDC__
#ifndef errMDefUseProtoANSI
#define errMDefUseProtoANSI
#endif
#endif
#ifdef errMDefUseProtoANSI
# include <stdarg.h>
#else
# include <varargs.h>
#endif
#include <stdarg.h>
#include "ellLib.h"
#include "shareLib.h"
@@ -68,7 +57,6 @@ extern "C" {
#define M_bucket (525 <<16) /*Bucket Hash*/
#define M_gddFuncTbl (526 <<16) /*gdd jump table*/
#ifdef errMDefUseProtoANSI
epicsShareFunc void epicsShareAPI errSymLookup(long status, char *pBuf, unsigned bufLength);
epicsShareFunc void epicsShareAPI errSymTest(unsigned short modnum, unsigned short begErrNum, unsigned short endErrNum);
epicsShareFunc void epicsShareAPI errSymTestPrint(long errNum);
@@ -79,18 +67,6 @@ epicsShareFunc void epicsShareAPI tstErrSymFind(void);
epicsShareFunc int epicsShareAPI errSymFind(long status, char *pBuf); /* depricated */
#else /* errMDefUseProtoANSI */
epicsShareFunc void epicsShareAPI errSymTest();
epicsShareFunc void epicsShareAPI errSymTestPrint();
epicsShareFunc int epicsShareAPI errSymBld();
epicsShareFunc int epicsShareAPI errSymbolAdd();
epicsShareFunc void epicsShareAPI errSymDump();
epicsShareFunc void epicsShareAPI tstErrSymFind();
epicsShareFunc void epicsShareAPI errSymFind();/* depricated */
#endif /* errMDefUseProtoANSI */
#ifdef __cplusplus
}
#endif
src/libCom/fdmgr/fdmgr.h
-20
View File
@@ -62,8 +62,6 @@ typedef void (*pCallBackFDMgr)(void *);
typedef unsigned fdmgrAlarmId;
#define NEW_FDMGR_ALARMID
#if defined(__STDC__) || defined(__cplusplus)
/*
*
* Initialize a file descriptor manager session
@@ -165,24 +163,6 @@ void *param
epicsShareFunc int epicsShareAPI fdmgr_delete(fdctx *pfdctx);
#else
epicsShareFunc fdctx * epicsShareAPI fdmgr_init();
epicsShareFunc fdmgrAlarmId epicsShareAPI fdmgr_add_timeout();
epicsShareFunc int epicsShareAPI fdmgr_clear_timeout();
epicsShareFunc int epicsShareAPI fdmgr_add_callback();
epicsShareFunc int epicsShareAPI fdmgr_clear_callback();
epicsShareFunc int epicsShareAPI fdmgr_pend_event();
epicsShareFunc int epicsShareAPI fdmgr_delete();
/*
* obsolete interface
*/
epicsShareFunc int epicsShareAPI fdmgr_clear_fd();
epicsShareFunc int epicsShareAPI fdmgr_add_fd();
#endif
#ifdef __cplusplus
}
#endif
src/libCom/osi/epicsAssert.h
-8
View File
@@ -34,18 +34,10 @@ extern "C" {
# define assert(ignore) ((void) 0)
#else /* NDEBUG */
#if defined(__STDC__) || defined(__cplusplus)
epicsShareFunc extern void epicsShareAPI
epicsAssert (const char *pFile, const unsigned line,
const char *pExp, const char *pAuthorName);
#else /*__STDC__ or __cplusplus*/
epicsShareFunc extern void epicsShareAPI epicsAssert ();
#endif /*__STDC__ or __cplusplus*/
#if (defined(__STDC__) || defined(__cplusplus)) && !defined(VAXC)
#define assert(exp) \