backed out certain sun pro compiler warning fixes

This commit is contained in:
Jeff Hill
2000-03-13 17:56:12 +00:00
parent 7c8f9d0530
commit 8c1bd84bf3

View File

@@ -245,82 +245,77 @@ LOCAL void ca_default_exception_handler (struct exception_handler_args args)
}
}
extern "C" {
/*
* default local pv interface entry points that always fail
*/
static pvId pvNameToIdNoop (const char *)
{
return 0;
}
static int pvPutFieldNoop (pvId, int,
const void *, int)
{
return -1;
}
static int pvGetFieldNoop (pvId, int,
void *, int, void *)
{
return -1;
}
static long pvPutNotifyInitiateNoop (pvId,
unsigned, unsigned long, const void *,
void (*)(void *), void *, putNotifyId *)
{
return -1;
}
static void pvPutNotifyDestroyNoop (putNotifyId)
{
}
static const char * pvNameNoop (pvId)
{
return "";
}
static unsigned long pvNoElementsNoop (pvId)
{
return 0u;
}
static short pvTypeNoop (pvId)
{
return -1;
}
static dbEventCtx pvEventQueueInitNoop ()
{
return NULL;
}
static int pvEventQueueStartNoop (dbEventCtx, const char *,
void (*)(void *), void *, int)
{
return -1;
}
static void pvEventQueueCloseNoop (dbEventCtx)
{
}
static dbEventSubscription pvEventQueueAddEventNoop (dbEventCtx, pvId,
void (*)(void *, pvId, int, struct db_field_log *),
void *, unsigned)
{
return NULL;
}
static int pvEventQueuePostSingleEventNoop (dbEventSubscription)
{
return -1;
}
static void pvEventQueueCancelEventNoop (dbEventSubscription)
{
}
static int pvEventQueueAddExtraLaborEventNoop (dbEventCtx,
void (*)(void *), void *)
{
return -1;
}
static int pvEventQueuePostExtraLaborNoop (dbEventCtx)
{
return -1;
}
/*
* default local pv interface entry points that always fail
*/
static pvId pvNameToIdNoop (const char *)
{
return 0;
}
static int pvPutFieldNoop (pvId, int,
const void *, int)
{
return -1;
}
static int pvGetFieldNoop (pvId, int,
void *, int, void *)
{
return -1;
}
static long pvPutNotifyInitiateNoop (pvId,
unsigned, unsigned long, const void *,
void (*)(void *), void *, putNotifyId *)
{
return -1;
}
static void pvPutNotifyDestroyNoop (putNotifyId)
{
}
static const char * pvNameNoop (pvId)
{
return "";
}
static unsigned long pvNoElementsNoop (pvId)
{
return 0u;
}
static short pvTypeNoop (pvId)
{
return -1;
}
static dbEventCtx pvEventQueueInitNoop ()
{
return NULL;
}
static int pvEventQueueStartNoop (dbEventCtx, const char *,
void (*)(void *), void *, int)
{
return -1;
}
static void pvEventQueueCloseNoop (dbEventCtx)
{
}
static dbEventSubscription pvEventQueueAddEventNoop (dbEventCtx, pvId,
void (*)(void *, pvId, int, struct db_field_log *),
void *, unsigned)
{
return NULL;
}
static int pvEventQueuePostSingleEventNoop (dbEventSubscription)
{
return -1;
}
static void pvEventQueueCancelEventNoop (dbEventSubscription)
{
}
static int pvEventQueueAddExtraLaborEventNoop (dbEventCtx,
void (*)(void *), void *)
{
return -1;
}
static int pvEventQueuePostExtraLaborNoop (dbEventCtx)
{
return -1;
}
LOCAL const pvAdapter pvAdapterNOOP =
@@ -346,11 +341,9 @@ LOCAL const pvAdapter pvAdapterNOOP =
/*
* event_import()
*/
extern "C" {
static void event_import (void *pParam)
{
threadPrivateSet (caClientContextId, pParam);
}
static void event_import (void *pParam)
{
threadPrivateSet (caClientContextId, pParam);
}
/*
@@ -2330,7 +2323,7 @@ void cacFlushAllIIU (cac *pcac)
* out so that we will not decrement the pending
* recv count in the future.
*/
LOCAL void noopConnHandler(struct connection_handler_args args)
LOCAL void noopConnHandler (struct connection_handler_args)
{
}
@@ -3308,11 +3301,11 @@ LOCAL void niiuShow (netIIU *piiu, unsigned /* level */)
}
}
epicsShareFunc int epicsShareAPI ca_channel_status (threadId tid)
epicsShareFunc int epicsShareAPI ca_channel_status (threadId /* tid */)
{
tcpiiu *piiu;
cac *pcac;
int caStatus;
tcpiiu *piiu;
cac *pcac;
int caStatus;
caStatus = fetchClientContext (&pcac);
if ( caStatus != ECA_NORMAL ) {