clang compilation fixes
This commit is contained in:
@@ -371,7 +371,7 @@ void PVRecordField::init()
|
||||
{
|
||||
fullFieldName = pvField->getFieldName();
|
||||
PVRecordStructurePtr pvParent = parent;
|
||||
while(pvParent.get()!= NULL) {
|
||||
while(pvParent) {
|
||||
string parentName = pvParent->getPVField()->getFieldName();
|
||||
if(parentName.size()>0) {
|
||||
fullFieldName = pvParent->getPVField()->getFieldName()
|
||||
@@ -434,7 +434,7 @@ void PVRecordField::removeListener(PVListenerPtr const & pvListener)
|
||||
|
||||
void PVRecordField::postPut()
|
||||
{
|
||||
if(parent!=NULL) {
|
||||
if(parent) {
|
||||
parent->postParent(getPtrSelf());
|
||||
}
|
||||
postSubField();
|
||||
@@ -448,7 +448,7 @@ void PVRecordField::postParent(PVRecordFieldPtr const & subField)
|
||||
{
|
||||
(*iter)->dataPut(pvrs,subField);
|
||||
}
|
||||
if(parent!=NULL) parent->postParent(subField);
|
||||
if(parent) parent->postParent(subField);
|
||||
}
|
||||
|
||||
void PVRecordField::postSubField()
|
||||
|
||||
@@ -70,7 +70,7 @@ typedef std::tr1::shared_ptr<ChannelArrayLocal> ChannelArrayLocalPtr;
|
||||
static bool getProcess(PVStructurePtr pvRequest,bool processDefault)
|
||||
{
|
||||
PVFieldPtr pvField = pvRequest->getSubField("record._options.process");
|
||||
if(pvField==NULL || pvField->getField()->getType()!=scalar) {
|
||||
if(!pvField || pvField->getField()->getType()!=scalar) {
|
||||
return processDefault;
|
||||
}
|
||||
ScalarConstPtr scalar = static_pointer_cast<const Scalar>(
|
||||
@@ -146,13 +146,13 @@ ChannelProcessLocalPtr ChannelProcessLocal::create(
|
||||
PVFieldPtr pvField;
|
||||
PVStructurePtr pvOptions;
|
||||
int nProcess = 1;
|
||||
if(pvRequest!=NULL) pvField = pvRequest->getSubField("record._options");
|
||||
if(pvField.get()!=NULL) {
|
||||
if(pvRequest) pvField = pvRequest->getSubField("record._options");
|
||||
if(pvField) {
|
||||
pvOptions = static_pointer_cast<PVStructure>(pvField);
|
||||
pvField = pvOptions->getSubField("nProcess");
|
||||
if(pvField.get()!=NULL) {
|
||||
if(pvField) {
|
||||
PVStringPtr pvString = pvOptions->getStringField("nProcess");
|
||||
if(pvString.get()!=NULL) {
|
||||
if(pvString) {
|
||||
int size;
|
||||
std::stringstream ss;
|
||||
ss << pvString->get();
|
||||
@@ -291,7 +291,7 @@ ChannelGetLocalPtr ChannelGetLocal::create(
|
||||
pvRecord->getPVRecordStructure()->getPVStructure(),
|
||||
pvRequest,
|
||||
"");
|
||||
if(pvCopy==NULL) {
|
||||
if(!pvCopy) {
|
||||
Status status(
|
||||
Status::STATUSTYPE_ERROR,
|
||||
"invalid pvRequest");
|
||||
@@ -442,7 +442,7 @@ ChannelPutLocalPtr ChannelPutLocal::create(
|
||||
pvRecord->getPVRecordStructure()->getPVStructure(),
|
||||
pvRequest,
|
||||
"");
|
||||
if(pvCopy==NULL) {
|
||||
if(!pvCopy) {
|
||||
Status status(
|
||||
Status::STATUSTYPE_ERROR,
|
||||
"invalid pvRequest");
|
||||
@@ -624,7 +624,7 @@ ChannelPutGetLocalPtr ChannelPutGetLocal::create(
|
||||
pvRecord->getPVRecordStructure()->getPVStructure(),
|
||||
pvRequest,
|
||||
"getField");
|
||||
if(pvPutCopy==NULL || pvGetCopy==NULL) {
|
||||
if(!pvPutCopy || !pvGetCopy) {
|
||||
Status status(
|
||||
Status::STATUSTYPE_ERROR,
|
||||
"invalid pvRequest");
|
||||
@@ -846,7 +846,7 @@ ChannelArrayLocalPtr ChannelArrayLocal::create(
|
||||
fieldName = fieldName.substr(6);
|
||||
}
|
||||
pvField = pvRecord->getPVRecordStructure()->getPVStructure()->getSubField(fieldName);
|
||||
if(pvField==NULL) {
|
||||
if(!pvField) {
|
||||
Status status(
|
||||
Status::STATUSTYPE_ERROR,fieldName +" not found");
|
||||
ChannelArrayLocalPtr channelArray;
|
||||
@@ -1190,7 +1190,7 @@ void ChannelLocal::getField(GetFieldRequester::shared_pointer const &requester,
|
||||
}
|
||||
PVFieldPtr pvField =
|
||||
pvRecord->getPVRecordStructure()->getPVStructure()->getSubField(subField);
|
||||
if(pvField.get()!=NULL) {
|
||||
if(pvField) {
|
||||
requester->getDone(Status::Ok,pvField->getField());
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -178,7 +178,7 @@ MonitorElementPtr MonitorLocal::releaseActiveElement()
|
||||
{
|
||||
Lock xx(mutex);
|
||||
MonitorElementPtr newActive = queue->getFree();
|
||||
if(newActive==NULL) return activeElement;
|
||||
if(!newActive) return activeElement;
|
||||
pvCopy->updateCopyFromBitSet(activeElement->pvStructurePtr,activeElement->changedBitSet);
|
||||
BitSetUtil::compress(activeElement->changedBitSet,activeElement->pvStructurePtr);
|
||||
BitSetUtil::compress(activeElement->overrunBitSet,activeElement->pvStructurePtr);
|
||||
|
||||
@@ -77,17 +77,17 @@ void PVCopyMonitor::init(PVFieldPtr const &pvField)
|
||||
size_t offset = pvCopy->getCopyOffset(pvField);
|
||||
if(offset==string::npos) return;
|
||||
PVStructurePtr pvOptions = pvCopy->getOptions(offset);
|
||||
if(pvOptions!=NULL) {
|
||||
if(pvOptions) {
|
||||
PVStringPtr pvName = pvOptions->getSubField<PVString>("plugin");
|
||||
if(pvName!=NULL) {
|
||||
if(pvName) {
|
||||
string pluginName = pvName->get();
|
||||
MonitorPluginManagerPtr manager = MonitorPluginManager::get();
|
||||
MonitorPluginCreatorPtr pluginCreator = manager->findPlugin(pluginName);
|
||||
if(pluginCreator!=NULL) {
|
||||
if(pluginCreator) {
|
||||
StructureConstPtr top = pvCopy->getStructure();
|
||||
FieldConstPtr field = pvField->getField();
|
||||
MonitorPluginPtr monitorPlugin = pluginCreator->create(field,top,pvOptions);
|
||||
if(monitorPlugin!=NULL) {
|
||||
if(monitorPlugin) {
|
||||
PVCopyMonitorFieldNodePtr fieldNode(new PVCopyMonitorFieldNode());
|
||||
fieldNode->monitorPlugin = monitorPlugin;
|
||||
fieldNode->offset = offset;
|
||||
@@ -207,7 +207,7 @@ void PVCopyMonitor::dataPut(PVRecordFieldPtr const & pvRecordField)
|
||||
changedBitSet->set(offset);
|
||||
if(isSet) overrunBitSet->set(offset);
|
||||
MonitorPluginPtr monitorPlugin = getMonitorPlugin(offset);
|
||||
if(monitorPlugin!=NULL) {
|
||||
if(monitorPlugin) {
|
||||
causeMonitor = monitorPlugin->causeMonitor(
|
||||
pvRecordField->getPVField(),
|
||||
pvRecord->getPVRecordStructure()->getPVStructure(),
|
||||
@@ -246,7 +246,7 @@ void PVCopyMonitor::dataPut(
|
||||
changedBitSet->set(offset);
|
||||
if(isSet) overrunBitSet->set(offset);
|
||||
MonitorPluginPtr monitorPlugin = getMonitorPlugin(offsetCopyRequested);
|
||||
if(monitorPlugin!=NULL) {
|
||||
if(monitorPlugin) {
|
||||
causeMonitor = monitorPlugin->causeMonitor(
|
||||
requested->getPVField(),
|
||||
pvRecord->getPVRecordStructure()->getPVStructure(),
|
||||
|
||||
@@ -63,11 +63,11 @@ bool TraceRecord::init()
|
||||
initPVRecord();
|
||||
PVStructurePtr pvStructure = getPVStructure();
|
||||
pvRecordName = pvStructure->getStringField("argument.recordName");
|
||||
if(pvRecordName==NULL) return false;
|
||||
if(!pvRecordName) return false;
|
||||
pvLevel = pvStructure->getIntField("argument.level");
|
||||
if(pvLevel==NULL) return false;
|
||||
if(!pvLevel) return false;
|
||||
pvResult = pvStructure->getStringField("result.status");
|
||||
if(pvResult==NULL) return false;
|
||||
if(!pvResult) return false;
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -75,7 +75,7 @@ void TraceRecord::process()
|
||||
{
|
||||
string name = pvRecordName->get();
|
||||
PVRecordPtr pvRecord = pvDatabase->findRecord(name);
|
||||
if(pvRecord==NULL) {
|
||||
if(!pvRecord) {
|
||||
pvResult->put(name + " not found");
|
||||
return;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user