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

simplify

Browse Source
This commit is contained in:
Michael Davidsaver
2020-05-31 10:39:04 -07:00
parent 1335d75403
commit 29d00e7e38
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pdbApp/pdb.cpp
View File

@ -100,8 +100,6 @@ struct PDBProcessor
typedef std::map<std::string, GroupInfo> groups_t;
groups_t groups;
GroupInfo *curgroup;
// validate trigger mappings and process into bit map form
void resolveTriggers()
{
@ -176,7 +174,7 @@ struct PDBProcessor
}
}
PDBProcessor() : curgroup(NULL)
PDBProcessor()
{
GroupConfig conf;
@ -264,7 +262,8 @@ struct PDBProcessor
std::pair<groups_t::iterator, bool> ins(groups.insert(std::make_pair(grpname, GroupInfo(grpname))));
it = ins.first;
}
curgroup = &it->second;
GroupInfo *curgroup = &it->second;
if(!grp.id.empty())
curgroup->structID = grp.id;
@ -274,8 +273,7 @@ struct PDBProcessor
const std::string& fldname = fit->first;
const GroupConfig::Field& fld = fit->second;
GroupInfo::members_map_t::const_iterator oldgrp(curgroup->members_map.find(fldname));
if(oldgrp!=curgroup->members_map.end()) {
if(curgroup->members_map.find(fldname) != curgroup->members_map.end()) {
fprintf(stderr, "%s.%s Warning: ignoring duplicate mapping %s\n",
grpname.c_str(), fldname.c_str(),
fld.channel.c_str());