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

pvif: DBCH cleanup

Browse Source 
avoid some duplication
This commit is contained in:
Michael Davidsaver
2018-02-14 11:10:09 -08:00
parent 392a44b791
commit d229efbb66
3 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pdbApp/pvif.cpp
View File

@@ -19,6 +19,7 @@
#include <pv/reftrack.h>
#define epicsExportSharedSymbols
#include "sb.h"
#include "pvif.h"
#include <epicsExport.h>
@@ -37,22 +38,22 @@ namespace pvd = epics::pvData;
DBCH::DBCH(dbChannel *ch) :chan(ch)
{
if(!chan)
throw std::invalid_argument("NULL channel");
if(dbChannelOpen(chan)) {
dbChannelDelete(chan);
throw std::invalid_argument("Failed to open channel");
}
prepare();
}
DBCH::DBCH(const std::string& name)
:chan(dbChannelCreate(name.c_str()))
{
prepare();
}
void DBCH::prepare()
{
if(!chan)
throw std::invalid_argument("NULL channel");
if(dbChannelOpen(chan)) {
dbChannelDelete(chan);
throw std::invalid_argument("Failed to open channel "+name);
throw std::invalid_argument(SB()<<"Failed to open channel "<<dbChannelName(chan));
}
}