From 4a5067b8a6b0bf80b8bdddafa6c379444f5f8693 Mon Sep 17 00:00:00 2001
From: Jeff Hill <johill@lanl.gov>
Date: Wed, 23 May 2001 00:57:05 +0000
Subject: [PATCH] fixed gnu warnings

---
 src/ca/test_event.cpp   |  2 +-
 src/rsrv/camessage.c    | 24 +-----------------------
 src/rsrv/caservertask.c |  4 ++--
 3 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/src/ca/test_event.cpp b/src/ca/test_event.cpp
index 8d6f6ea64..3c9442630 100644
--- a/src/ca/test_event.cpp
+++ b/src/ca/test_event.cpp
@@ -35,7 +35,7 @@ extern "C" void epicsShareAPI ca_test_event ( struct event_handler_args args )
     printf ( "CAC: Value:\t<%d>\n", *(dbr_short_t *) args.dbr );
     break;
   case	DBR_LONG:
-    printf ( "CAC: Value:\t<%ld>\n", *(dbr_long_t *)args.dbr );
+    printf ( "CAC: Value:\t<%d>\n", *(dbr_long_t *)args.dbr );
     break;
   case	DBR_FLOAT:
     printf ( "CAC: Value:\t<%f>\n", *(dbr_float_t *)args.dbr );
diff --git a/src/rsrv/camessage.c b/src/rsrv/camessage.c
index de14722cf..5d533f07c 100644
--- a/src/rsrv/camessage.c
+++ b/src/rsrv/camessage.c
@@ -53,8 +53,6 @@ typedef unsigned long arrayElementCount;
 #include "net_convert.h"
 #include "server.h"
 
-static caHdr nill_msg;
-
 #define RECORD_NAME(PADDR) ((PADDR)->precord->name)
 
 LOCAL EVENTFUNC read_reply;
@@ -271,26 +269,6 @@ LOCAL void log_header (
     }
 }
 
-/*  log_old_header ()
- */
-LOCAL void log_old_header (
-    const char      *pContext,
-    struct client   *client,
-    const caHdr     *mp,
-    const void      *pPayLoad,
-    unsigned        mnum
-)
-{
-    caHdrLargeArray msg;
-    msg.m_cmmd = mp->m_cmmd;
-    msg.m_postsize = mp->m_postsize;
-    msg.m_count = mp->m_count;
-    msg.m_dataType = mp->m_dataType;
-    msg.m_cid = mp->m_cid;
-    msg.m_available = mp->m_available;
-    log_header ( pContext, client, &msg, pPayLoad, mnum );
-}
-
 /*
  * logBadIdWithFileAndLineno()
  */
@@ -343,7 +321,7 @@ LOCAL int udp_echo_action ( caHdrLargeArray *mp,
 /*
  * bad_tcp_cmd_action()
  */
-LOCAL int bad_tcp_cmd_action ( caHdrLargeArray *mp, const void *pPayload, 
+LOCAL int bad_tcp_cmd_action ( caHdrLargeArray *mp, void *pPayload, 
                            struct client *client )
 {
     const char *pCtx = "invalid (damaged?) request code from TCP";
diff --git a/src/rsrv/caservertask.c b/src/rsrv/caservertask.c
index f6d64d56d..1b1ade98c 100644
--- a/src/rsrv/caservertask.c
+++ b/src/rsrv/caservertask.c
@@ -344,7 +344,7 @@ LOCAL void log_one_client (struct client *client, unsigned level)
         "\tSecs since last send %6.2f, Secs since last receive %6.2f\n", 
             send_delay, recv_delay);
         printf( 
-        "\tUnprocessed request bytes=%lu, Undelivered response bytes=%lu, State=%s\n", 
+        "\tUnprocessed request bytes=%u, Undelivered response bytes=%u, State=%s\n", 
             client->send.stk,
             client->recv.cnt - client->recv.stk,
             state[client->disconnect?1:0]); 
@@ -366,7 +366,7 @@ LOCAL void log_one_client (struct client *client, unsigned level)
             pciu = (struct channel_in_use *) ellNext(&pciu->node);
         }
         epicsMutexUnlock(client->addrqLock);
-        printf( "\t%ld bytes allocated\n", bytes_reserved);
+        printf( "\t%d bytes allocated\n", bytes_reserved);
 
 
         epicsMutexMustLock(client->addrqLock);