From 448010b6ad22b07779b04a50b07dd6cafb22ffef Mon Sep 17 00:00:00 2001
From: Jeff Hill <johill@lanl.gov>
Date: Tue, 17 Dec 2002 16:55:41 +0000
Subject: [PATCH] fixed hpux accc warning

---
 src/cas/generic/casCoreClient.cc |  2 +-
 src/cas/generic/casStrmClient.cc | 38 ++++++++++++++------------------
 src/cas/generic/server.h         |  4 ++--
 3 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/src/cas/generic/casCoreClient.cc b/src/cas/generic/casCoreClient.cc
index 8baf9f9dd..b76e38031 100644
--- a/src/cas/generic/casCoreClient.cc
+++ b/src/cas/generic/casCoreClient.cc
@@ -137,7 +137,7 @@ caStatus casCoreClient::enumPostponedCreateChanResponse ( casChannelI &,
 	return S_casApp_noSupport;
 }
 caStatus casCoreClient::channelCreateFailedResp ( const caHdrLargeArray &, 
-    caStatus )
+    const caStatus )
 {
 	return S_casApp_noSupport;
 }
diff --git a/src/cas/generic/casStrmClient.cc b/src/cas/generic/casStrmClient.cc
index 42e0a1a3d..a0c56ea9f 100644
--- a/src/cas/generic/casStrmClient.cc
+++ b/src/cas/generic/casStrmClient.cc
@@ -1158,42 +1158,36 @@ caStatus casStrmClient::enumPostponedCreateChanResponse (
 
 /*
  * casStrmClient::channelCreateFailed()
- *
- * If we are talking to an CA_V46 client then tell them when a channel
- * cant be created (instead of just disconnecting)
  */
 caStatus casStrmClient::channelCreateFailedResp (
-    const caHdrLargeArray & hdr, caStatus createStatus )
+    const caHdrLargeArray & hdr, const caStatus createStatus )
 {
-    caStatus status;
- 
 	if ( createStatus == S_casApp_asyncCompletion ) {
 		errMessage( S_cas_badParameter, 
-	"- no asynchronous IO create in pvAttach() ?");
+	        "- no asynchronous IO create in pvAttach() ?");
 		errMessage( S_cas_badParameter, 
-	"- or S_casApp_asyncCompletion was async IO competion code ?");
+	        "- or S_casApp_asyncCompletion was "
+            "async IO competion code ?");
 	}
-	else if ( status != S_casApp_pvNotFound ) {
-		errMessage ( createStatus, "- Server unable to create a new PV");
+	else if ( createStatus != S_casApp_pvNotFound ) {
+		errMessage ( createStatus, 
+            "- Server unable to create a new PV");
 	}
-	if ( CA_V46( this->minor_version_number ) ) {
+    caStatus status;
+	if ( CA_V46 ( this->minor_version_number ) ) {
         epicsGuard < epicsMutex > guard ( this->mutex );
-        status = this->out.copyInHeader ( CA_PROTO_CLAIM_CIU_FAILED, 0,
+        status = this->out.copyInHeader ( 
+            CA_PROTO_CLAIM_CIU_FAILED, 0,
             0, 0, hdr.m_cid, 0, 0 );
-		if ( status ) {
-			return status;
+		if ( status == S_cas_success ) {
+		    this->out.commitMsg ();
 		}
-		this->out.commitMsg ();
-		createStatus = S_cas_success;
 	}
 	else {
-		status = this->sendErrWithEpicsStatus ( & hdr, createStatus, ECA_ALLOCMEM );
-		if ( status ) {
-			return status;
-		}
+		status = this->sendErrWithEpicsStatus ( 
+            & hdr, createStatus, ECA_ALLOCMEM );
 	}
-
-	return createStatus;
+	return status;
 }
 
 /*
diff --git a/src/cas/generic/server.h b/src/cas/generic/server.h
index 13498434e..caa33e88a 100644
--- a/src/cas/generic/server.h
+++ b/src/cas/generic/server.h
@@ -460,7 +460,7 @@ public:
     virtual caStatus enumPostponedCreateChanResponse ( casChannelI & chan, 
         const caHdrLargeArray & hdr, unsigned dbrType );
 	virtual caStatus channelCreateFailedResp ( const caHdrLargeArray &, 
-        caStatus createStatus );
+        const caStatus createStatus );
 
     virtual void eventSignal () = 0;
 
@@ -644,7 +644,7 @@ public:
     caStatus enumPostponedCreateChanResponse ( casChannelI & chan, 
         const caHdrLargeArray & hdr, unsigned dbrType );
 	caStatus channelCreateFailedResp ( const caHdrLargeArray &, 
-        caStatus createStatus );
+        const caStatus createStatus );
 
 	caStatus disconnectChan ( caResId id );