From 091147080c2d85b40adb69c902924eb2b061c992 Mon Sep 17 00:00:00 2001
From: Jeff Hill <johill@lanl.gov>
Date: Fri, 5 May 2000 01:19:32 +0000
Subject: [PATCH] fixed gnu warnings

---
 src/ca/Makefile          | 1 -
 src/ca/cacIO.h           | 4 ++++
 src/ca/cadef.h           | 3 ---
 src/ca/iocinf.h          | 2 --
 src/db/dbCAC.h           | 4 ++--
 src/db/dbChannelIO.cpp   | 4 ++--
 src/db/dbNotify.c        | 2 +-
 src/db/dbPutNotifyIO.cpp | 2 +-
 src/db/dbServiceIO.cpp   | 8 ++++----
 src/db/db_access.c       | 1 -
 10 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/src/ca/Makefile b/src/ca/Makefile
index a42a168b9..f603f3c72 100644
--- a/src/ca/Makefile
+++ b/src/ca/Makefile
@@ -11,7 +11,6 @@ INC += caerr.h
 INC += caeventmask.h
 INC += caProto.h
 INC += db_access.h
-INC += pvAdapter.h
 INC += addrList.h
 INC += cacIO.h
 
diff --git a/src/ca/cacIO.h b/src/ca/cacIO.h
index 2611cc4c9..5e2875950 100644
--- a/src/ca/cacIO.h
+++ b/src/ca/cacIO.h
@@ -105,3 +105,7 @@ private:
 };
 
 epicsShareExtern cacServiceList cacGlobalServiceList;
+
+epicsShareFunc int epicsShareAPI ca_register_service ( struct cacServiceIO *pService );
+
+
diff --git a/src/ca/cadef.h b/src/ca/cadef.h
index cb41f4c75..25ffaff2c 100644
--- a/src/ca/cadef.h
+++ b/src/ca/cadef.h
@@ -43,7 +43,6 @@
 #include "caerr.h"
 #include "db_access.h"
 #include "caeventmask.h"
-#include "pvAdapter.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -197,8 +196,6 @@ epicsShareFunc int epicsShareAPI ca_task_initialize (void);
 /************************************************************************/
 epicsShareFunc int epicsShareAPI ca_task_exit (void);
 
-epicsShareFunc int epicsShareAPI ca_register_service ( struct cacServiceIO *pService );
-
 /************************************************************************
  * anachronistic entry points                                           *
  * **** Fetching a value while searching no longer supported****        *
diff --git a/src/ca/iocinf.h b/src/ca/iocinf.h
index 06c634476..908a3efdd 100644
--- a/src/ca/iocinf.h
+++ b/src/ca/iocinf.h
@@ -825,8 +825,6 @@ int cac_select_io (cac *pcac, double maxDelay, int flags);
 
 char *localHostName (void);
 
-int ca_os_independent_init (cac *pcac, const pvAdapter *ppva);
-
 bhe *lookupBeaconInetAddr(cac *pcac,
         const struct sockaddr_in *pnet_addr);
 
diff --git a/src/db/dbCAC.h b/src/db/dbCAC.h
index 86a1c48e1..5accaa40c 100644
--- a/src/db/dbCAC.h
+++ b/src/db/dbCAC.h
@@ -48,7 +48,7 @@ extern "C" void dbSubscriptionEventCallback ( void *pPrivate, struct dbAddr *pad
 class dbSubscriptionIO : public cacNotifyIO {
 public:
     dbSubscriptionIO ( dbChannelIO &chanIO, cacNotify &, unsigned type, unsigned long count );
-    int dbSubscriptionIO::begin ( struct dbAddr &addr, unsigned mask );
+    int begin ( struct dbAddr &addr, unsigned mask );
     void destroy ();
     static void * operator new ( size_t size );
     static void operator delete ( void *pCadaver, size_t size );
@@ -99,7 +99,7 @@ private:
 class dbServiceIO : public cacServiceIO {
 public:
     dbServiceIO ();
-    ~dbServiceIO ();
+    virtual ~dbServiceIO ();
     cacChannelIO *createChannelIO ( cacChannel &chan, const char *pName );
     void subscriptionUpdate ( struct dbAddr &addr, unsigned type, unsigned long count, 
             const struct db_field_log *pfl, cacNotifyIO &notify );
diff --git a/src/db/dbChannelIO.cpp b/src/db/dbChannelIO.cpp
index 5cf7a4d5a..2d88fe946 100644
--- a/src/db/dbChannelIO.cpp
+++ b/src/db/dbChannelIO.cpp
@@ -33,8 +33,8 @@ extern "C" unsigned short dbDBRnewToDBRold[DBR_ENUM+1];
 tsFreeList < dbChannelIO > dbChannelIO::freeList;
 
 dbChannelIO::dbChannelIO ( cacChannel &chan, const dbAddr &addrIn, dbServiceIO &serviceIO ) :
-    cacChannelIO ( chan ), serviceIO ( serviceIO ), addr ( addrIn ), 
-    pGetCallbackCache ( 0 ), getCallbackCacheSize ( 0ul )
+    cacChannelIO ( chan ), serviceIO ( serviceIO ), pGetCallbackCache ( 0 ), 
+    getCallbackCacheSize ( 0ul ), addr ( addrIn )
 {
     this->connectNotify ();
 }
diff --git a/src/db/dbNotify.c b/src/db/dbNotify.c
index 7b18b07e8..d8ab7c14e 100644
--- a/src/db/dbNotify.c
+++ b/src/db/dbNotify.c
@@ -395,4 +395,4 @@ long dbtpn(char	*pname,char *pvalue)
     	errMessage(status, "dbtpn");
     }
     return(0);
-}
\ No newline at end of file
+}
diff --git a/src/db/dbPutNotifyIO.cpp b/src/db/dbPutNotifyIO.cpp
index 21e3d8e51..8096f88a2 100644
--- a/src/db/dbPutNotifyIO.cpp
+++ b/src/db/dbPutNotifyIO.cpp
@@ -88,7 +88,7 @@ int dbPutNotifyIO::initiate ( struct dbAddr &addr, unsigned type,
     status = ::dbPutNotify ( &this->pn );
     if ( status && status != S_db_Pending ) {
         this->pn.status = status;
-        putNotifyCallback ();
+        this->cacNotifyIO::exceptionNotify ( ECA_PUTFAIL,  "dbPutNotify() returned failure");
     }
     return ECA_NORMAL;
 }
diff --git a/src/db/dbServiceIO.cpp b/src/db/dbServiceIO.cpp
index b1c1087ce..e463cd5cd 100644
--- a/src/db/dbServiceIO.cpp
+++ b/src/db/dbServiceIO.cpp
@@ -27,16 +27,16 @@
 #include "db_access_routines.h"
 #include "dbCAC.h"
 
-class loadTimeInit {
+class dbServiceIOLoadTimeInit {
 public:
-    loadTimeInit ();
+    dbServiceIOLoadTimeInit ();
 private:
     dbServiceIO dbio;
 };
 
-static loadTimeInit lti;
+static dbServiceIOLoadTimeInit lti;
 
-loadTimeInit::loadTimeInit ()
+dbServiceIOLoadTimeInit::dbServiceIOLoadTimeInit ()
 {
     cacGlobalServiceList.registerService ( this->dbio );
 }
diff --git a/src/db/db_access.c b/src/db/db_access.c
index 8d72765b9..e44a0d22f 100644
--- a/src/db/db_access.c
+++ b/src/db/db_access.c
@@ -54,7 +54,6 @@
 #include "errlog.h"
 #include "ellLib.h"
 #include "tsStamp.h"
-#include "pvAdapter.h"
 #include "dbStaticLib.h"
 #include "dbBase.h"
 #include "dbCommon.h"