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

pvif: DBCH fix NULL check

Browse Source
This commit is contained in:
Michael Davidsaver
2018-02-14 10:52:37 -08:00
parent b7de8ba8b0
commit 6982fa2d8f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pdbApp/pvif.cpp
View File

@ -37,19 +37,19 @@ 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");
}
if(!chan)
throw std::invalid_argument(std::string("Invalid channel ")+dbChannelName(ch));
}
DBCH::DBCH(const std::string& name)
:chan(dbChannelCreate(name.c_str()))
{
if(!chan)
throw std::invalid_argument("Invalid channel");
throw std::invalid_argument("NULL channel");
if(dbChannelOpen(chan)) {
dbChannelDelete(chan);
throw std::invalid_argument("Failed to open channel "+name);