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

fixed hpux accc warning

Browse Source
This commit is contained in:
Jeff Hill
2002-12-17 16:55:41 +00:00
parent ce3bbc453d
commit 448010b6ad
3 changed files with 19 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/cas/generic/casCoreClient.cc
View File

@@ -137,7 +137,7 @@ caStatus casCoreClient::enumPostponedCreateChanResponse ( casChannelI &,
return S_casApp_noSupport;
}
caStatus casCoreClient::channelCreateFailedResp ( const caHdrLargeArray &,
caStatus )
const caStatus )
{
return S_casApp_noSupport;
}

38
src/cas/generic/casStrmClient.cc
View File

@@ -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;
}
/*

4
src/cas/generic/server.h
View File

@@ -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 );