Skip to content

Commit

Permalink
removed spaces at end of line
Browse files Browse the repository at this point in the history
  • Loading branch information
dirk-zimoch authored and mdavidsaver committed Apr 15, 2020
1 parent 40300a1 commit 3ba6679
Show file tree
Hide file tree
Showing 23 changed files with 52 additions and 71 deletions.
32 changes: 16 additions & 16 deletions src/ca/caChannel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ void CAChannel::activate(short priority)
CAChannel::~CAChannel()
{
if(DEBUG_LEVEL>0) {
cout << "CAChannel::~CAChannel() " << channelName
cout << "CAChannel::~CAChannel() " << channelName
<< " channelCreated " << (channelCreated ? "true" : "false")
<< endl;
}
Expand All @@ -177,7 +177,7 @@ void CAChannel::disconnectChannel()
{
if(DEBUG_LEVEL>0) {
cout << "CAChannel::disconnectChannel() "
<< channelName
<< channelName
<< " channelCreated " << (channelCreated ? "true" : "false")
<< endl;
}
Expand Down Expand Up @@ -285,7 +285,7 @@ ChannelGet::shared_pointer CAChannel::createChannelGet(
if(DEBUG_LEVEL>0) {
cout << "CAChannel::createChannelGet " << channelName << endl;
}
CAChannelGetPtr channelGet =
CAChannelGetPtr channelGet =
CAChannelGet::create(shared_from_this(), channelGetRequester, pvRequest);
{
Lock lock(requestsMutex);
Expand All @@ -306,7 +306,7 @@ ChannelPut::shared_pointer CAChannel::createChannelPut(
if(DEBUG_LEVEL>0) {
cout << "CAChannel::createChannelPut " << channelName << endl;
}
CAChannelPutPtr channelPut =
CAChannelPutPtr channelPut =
CAChannelPut::create(shared_from_this(), channelPutRequester, pvRequest);
{
Lock lock(requestsMutex);
Expand All @@ -327,7 +327,7 @@ Monitor::shared_pointer CAChannel::createMonitor(
if(DEBUG_LEVEL>0) {
cout << "CAChannel::createMonitor " << channelName << endl;
}
CAChannelMonitorPtr channelMonitor =
CAChannelMonitorPtr channelMonitor =
CAChannelMonitor::create(shared_from_this(), monitorRequester, pvRequest);
{
Lock lock(requestsMutex);
Expand Down Expand Up @@ -496,10 +496,10 @@ static void ca_get_handler(struct event_handler_args args)
void CAChannelGet::getDone(struct event_handler_args &args)
{
if(DEBUG_LEVEL>1) {
std::cout << "CAChannelGet::getDone "
std::cout << "CAChannelGet::getDone "
<< channel->getChannelName() << endl;
}

ChannelGetRequester::shared_pointer getRequester(channelGetRequester.lock());
if(!getRequester) return;
getStatus = dbdToPv->getFromDBD(pvStructure,bitSet,args);
Expand Down Expand Up @@ -640,7 +640,7 @@ void CAChannelPut::put(PVStructure::shared_pointer const & pvPutStructure,
ChannelPutRequester::shared_pointer putRequester(channelPutRequester.lock());
if(!putRequester) return;
{
Lock lock(mutex);
Lock lock(mutex);
isPut = true;
}
putStatus = dbdToPv->putToDBD(channel,pvPutStructure,block,&ca_put_handler,this);
Expand Down Expand Up @@ -671,7 +671,7 @@ void CAChannelPut::getDone(struct event_handler_args &args)
if(DEBUG_LEVEL>1) {
cout << "CAChannelPut::getDone " << channel->getChannelName() << endl;
}

ChannelPutRequester::shared_pointer putRequester(channelPutRequester.lock());
if(!putRequester) return;
getStatus = dbdToPv->getFromDBD(pvStructure,bitSet,args);
Expand All @@ -698,7 +698,7 @@ void CAChannelPut::get()
ChannelPutRequester::shared_pointer putRequester(channelPutRequester.lock());
if(!putRequester) return;
{
Lock lock(mutex);
Lock lock(mutex);
isPut = false;
}

Expand Down Expand Up @@ -753,7 +753,7 @@ class CACMonitorQueue :
size_t queueSize;
bool isStarted;
Mutex mutex;

std::queue<MonitorElementPtr> monitorElementQueue;
public:
CACMonitorQueue(
Expand All @@ -763,7 +763,7 @@ class CACMonitorQueue :
{}
~CACMonitorQueue()
{
}
}
void start()
{
Lock guard(mutex);
Expand All @@ -784,7 +784,7 @@ class CACMonitorQueue :
Lock guard(mutex);
if(!isStarted) return false;
if(monitorElementQueue.size()==queueSize) return false;
PVStructure::shared_pointer pvs =
PVStructure::shared_pointer pvs =
getPVDataCreate()->createPVStructure(pvStructure);
MonitorElementPtr monitorElement(new MonitorElement(pvs));
*(monitorElement->changedBitSet) = *(activeElement->changedBitSet);
Expand Down Expand Up @@ -826,7 +826,7 @@ CAChannelMonitorPtr CAChannelMonitor::create(
CAChannelMonitor::CAChannelMonitor(
CAChannel::shared_pointer const & channel,
MonitorRequester::shared_pointer const & monitorRequester,
PVStructurePtr const & pvRequest)
PVStructurePtr const & pvRequest)
:
channel(channel),
monitorRequester(monitorRequester),
Expand Down Expand Up @@ -896,7 +896,7 @@ void CAChannelMonitor::subscriptionEvent(struct event_handler_args &args)
<< channel->getChannelName() << endl;
}
{
Lock lock(mutex);
Lock lock(mutex);
if(!isStarted) return;
}
MonitorRequester::shared_pointer requester(monitorRequester.lock());
Expand Down Expand Up @@ -975,7 +975,7 @@ Status CAChannelMonitor::stop()
{
Lock lock(mutex);
if(!isStarted) return Status(Status::STATUSTYPE_WARNING,"already stopped");
isStarted = false;
isStarted = false;
}
monitorQueue->stop();
int result = ca_clear_subscription(pevid);
Expand Down
5 changes: 2 additions & 3 deletions src/ca/caProvider.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ using namespace epics::pvData;
catch (std::exception &e) { LOG(logLevelError, "Unhandled exception caught from client code at %s:%d: %s", __FILE__, __LINE__, e.what()); } \
catch (...) { LOG(logLevelError, "Unhandled exception caught from client code at %s:%d.", __FILE__, __LINE__); }

CAChannelProvider::CAChannelProvider()
CAChannelProvider::CAChannelProvider()
: current_context(0)
{
initialize();
Expand Down Expand Up @@ -73,7 +73,7 @@ CAChannelProvider::~CAChannelProvider()
std::cout << "~CAChannelProvider() calling disconnectChannel "
<< channelQ.front()->getChannelName()
<< std::endl;
}
}
channelQ.front()->disconnectChannel();
channelQ.pop();
}
Expand Down Expand Up @@ -218,4 +218,3 @@ void CAClientFactory::stop()
}

}}}

4 changes: 2 additions & 2 deletions src/ca/channelConnectThread.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ void ChannelConnectThread::start()
"channelConnectThread",
epicsThreadGetStackSize(epicsThreadStackSmall),
epicsThreadPriorityLow));
thread->start();
thread->start();
}


Expand All @@ -67,7 +67,7 @@ void ChannelConnectThread::stop()
void ChannelConnectThread::channelConnected(
NotifyChannelRequesterPtr const &notifyChannelRequester)
{
{
{
Lock lock(mutex);
if(notifyChannelRequester->isOnQueue) return;
notifyChannelRequester->isOnQueue = true;
Expand Down
26 changes: 13 additions & 13 deletions src/ca/dbdToPv.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ void DbdToPv::activate(
string mess(caChannel->getChannelName());
mess += " DbdToPv::activate pvRequest is null";
throw std::runtime_error(mess);
}
}
PVStructurePtr fieldPVStructure;
if(pvRequest->getPVFields().size()==0) {
fieldPVStructure = pvRequest;
Expand All @@ -159,8 +159,8 @@ void DbdToPv::activate(
mess << caChannel->getChannelName()
<< " DbdToPv::activate illegal pvRequest " << pvRequest;
throw std::runtime_error(mess.str());
}
if(fieldPVStructure->getPVFields().size()==0)
}
if(fieldPVStructure->getPVFields().size()==0)
{
valueRequested = true;
alarmRequested = true;
Expand Down Expand Up @@ -308,7 +308,7 @@ void DbdToPv::activate(
caRequestType = caValueType;
if(displayRequested || controlRequested || valueAlarmRequested)
{
caRequestType = dbf_type_to_DBR_CTRL(caValueType);
caRequestType = dbf_type_to_DBR_CTRL(caValueType);
} else if(timeStampRequested || alarmRequested) {
caRequestType = dbf_type_to_DBR_TIME(caValueType);
} else {
Expand Down Expand Up @@ -350,7 +350,7 @@ void DbdToPv::getChoicesDone(struct event_handler_args &args)
choices.reserve(num);
for(size_t i=0; i<num; ++i) choices.push_back(string(&dbr_enum_p->strs[i][0]));
choicesEvent.signal();
}
}


void DbdToPv::getChoices(CAChannelPtr const & caChannel)
Expand Down Expand Up @@ -522,7 +522,7 @@ Status DbdToPv::getFromDBD(
ConvertPtr convert = getConvert();
size_t n = choices.size();
pvChoices->setLength(n);
convert->fromStringArray(pvChoices,0,n,choices,0);
convert->fromStringArray(pvChoices,0,n,choices,0);
bitSet->set(pvStructure->getSubField("value")->getFieldOffset());
} else {
bitSet->set(value->getFieldOffset());
Expand Down Expand Up @@ -552,7 +552,7 @@ Status DbdToPv::getFromDBD(
}
copy_DBRScalar<dbr_long_t,PVInt>(value,pvValue); break;
case DBR_FLOAT: copy_DBRScalar<dbr_float_t,PVFloat>(value,pvValue); break;
case DBR_DOUBLE:
case DBR_DOUBLE:
if(dbfIsINT64)
{
copy_DBRScalar<dbr_double_t,PVLong>(value,pvValue);
Expand All @@ -575,7 +575,7 @@ Status DbdToPv::getFromDBD(
}
}
if(alarmRequested) {
// Note that status and severity are aways the first two members of DBR_
// Note that status and severity are aways the first two members of DBR_
const dbr_sts_string *data = static_cast<const dbr_sts_string *>(args.dbr);
dbr_short_t status = data->status;
dbr_short_t severity = data->severity;
Expand Down Expand Up @@ -927,29 +927,29 @@ Status DbdToPv::putToDBD(
break;
}
case DBR_STRING: pValue = pvStructure->getSubField<PVString>("value")->get().c_str(); break;
case DBR_CHAR:
case DBR_CHAR:
if(dbfIsUCHAR)
{
pValue = put_DBRScalar<dbr_char_t,PVUByte>(&bvalue,pvValue);
break;
}
pValue = put_DBRScalar<dbr_char_t,PVByte>(&bvalue,pvValue); break;
case DBR_SHORT:
case DBR_SHORT:
if(dbfIsUSHORT)
{
pValue = put_DBRScalar<dbr_short_t,PVUShort>(&svalue,pvValue);
break;
}
pValue = put_DBRScalar<dbr_short_t,PVShort>(&svalue,pvValue); break;
case DBR_LONG:
case DBR_LONG:
if(dbfIsULONG)
{
pValue = put_DBRScalar<dbr_long_t,PVUInt>(&lvalue,pvValue);
break;
}
pValue = put_DBRScalar<dbr_long_t,PVInt>(&lvalue,pvValue); break;
case DBR_FLOAT: pValue = put_DBRScalar<dbr_float_t,PVFloat>(&fvalue,pvValue); break;
case DBR_DOUBLE:
case DBR_DOUBLE:
if(dbfIsINT64)
{
pValue = put_DBRScalar<dbr_double_t,PVLong>(&dvalue,pvValue);
Expand Down Expand Up @@ -982,6 +982,6 @@ Status DbdToPv::putToDBD(
}
if(ca_stringBuffer!=NULL) delete[] ca_stringBuffer;
return status;
}
}

}}}
4 changes: 2 additions & 2 deletions src/ca/getDoneThread.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ void GetDoneThread::start()
"getDoneThread",
epicsThreadGetStackSize(epicsThreadStackBig),
epicsThreadPriorityLow));
thread->start();
thread->start();
}


Expand All @@ -66,7 +66,7 @@ void GetDoneThread::stop()

void GetDoneThread::getDone(NotifyGetRequesterPtr const &notifyGetRequester)
{
{
{
Lock lock(mutex);
if(notifyGetRequester->isOnQueue) return;
notifyGetRequester->isOnQueue = true;
Expand Down
4 changes: 2 additions & 2 deletions src/ca/monitorEventThread.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ void MonitorEventThread::start()
"monitorEventThread",
epicsThreadGetStackSize(epicsThreadStackBig),
epicsThreadPriorityLow));
thread->start();
thread->start();
}

void MonitorEventThread::stop()
Expand All @@ -65,7 +65,7 @@ void MonitorEventThread::stop()

void MonitorEventThread::event(NotifyMonitorRequesterPtr const &notifyMonitorRequester)
{
{
{
Lock lock(mutex);
if(notifyMonitorRequester->isOnQueue) return;
notifyMonitorRequester->isOnQueue = true;
Expand Down
4 changes: 2 additions & 2 deletions src/ca/putDoneThread.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ void PutDoneThread::start()
"putDoneThread",
epicsThreadGetStackSize(epicsThreadStackBig),
epicsThreadPriorityLow));
thread->start();
thread->start();
}


Expand All @@ -66,7 +66,7 @@ void PutDoneThread::stop()

void PutDoneThread::putDone(NotifyPutRequesterPtr const &notifyPutRequester)
{
{
{
Lock lock(mutex);
if(notifyPutRequester->isOnQueue) return;
notifyPutRequester->isOnQueue = true;
Expand Down
1 change: 0 additions & 1 deletion src/factory/ChannelAccessFactory.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -267,4 +267,3 @@ ChannelProvider::createChannel(std::string const & name,

}
}

1 change: 0 additions & 1 deletion src/remote/beaconHandler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -84,4 +84,3 @@ bool BeaconHandler::updateBeacon(int8 /*remoteTransportRevision*/, TimeStamp* /*

}
}

1 change: 0 additions & 1 deletion src/remote/channelSearchManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -392,4 +392,3 @@ void ChannelSearchManager::timerStopped()

}
}

2 changes: 0 additions & 2 deletions src/remote/serializationHelper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -96,5 +96,3 @@ void SerializationHelper::serializeFull(ByteBuffer* buffer, SerializableControl*

}
}


1 change: 0 additions & 1 deletion src/remote/transportRegistry.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -174,4 +174,3 @@ void TransportRegistry::toArray(transportVector_t & transportArray, const osiSoc

}
}

1 change: 0 additions & 1 deletion src/remoteClient/clientContextImpl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4761,4 +4761,3 @@ ChannelProvider::shared_pointer createClientProvider(const Configuration::shared

}
};

1 change: 0 additions & 1 deletion src/server/beaconEmitter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -135,4 +135,3 @@ void BeaconEmitter::callback()

}
}

1 change: 0 additions & 1 deletion src/server/beaconServerStatusProvider.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,3 @@ PVField::shared_pointer DefaultBeaconServerStatusProvider::getServerStatusData()

}
}

2 changes: 1 addition & 1 deletion src/server/responseHandlers.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@ void ServerChannelFindRequesterImpl::channelFindResult(const Status& /*status*/,
_context->s_channelNameToProvider[_name] = channelFind->getChannelProvider();
}
_wasFound = wasFound;

BlockingUDPTransport::shared_pointer bt = _context->getBroadcastTransport();
if (bt)
{
Expand Down
1 change: 0 additions & 1 deletion src/utils/configuration.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -257,4 +257,3 @@ ConfigurationProvider::shared_pointer ConfigurationFactory::getProvider()

}
}

0 comments on commit 3ba6679

Please sign in to comment.