Merge pull request #56 from dirk-zimoch/CleanupWhitespace

Cleanup whitespace
This commit is contained in:
Marty Kraimer
2020-05-20 08:47:32 -04:00
committed by GitHub
40 changed files with 171 additions and 194 deletions

View File

@ -168,36 +168,36 @@ bool PVArrayFilter::filter(const PVFieldPtr & pvField,const BitSetPtr & bitSet,b
long end = this->end;
long no_elements = masterArray->getLength();
if(start<0) {
start = no_elements+start;
if(start<0) start = 0;
start = no_elements+start;
if(start<0) start = 0;
}
if (end < 0) {
end = no_elements + end;
if (end < 0) end = 0;
end = no_elements + end;
if (end < 0) end = 0;
}
if(toCopy) {
if (end >= no_elements) end = no_elements - 1;
if (end - start >= 0) len = 1 + (end - start) / increment;
if(len<=0 || start>=no_elements) {
copyArray->setLength(0);
return true;
}
long indfrom = start;
long indto = 0;
copyArray->setCapacity(len);
if(increment==1) {
if (end >= no_elements) end = no_elements - 1;
if (end - start >= 0) len = 1 + (end - start) / increment;
if(len<=0 || start>=no_elements) {
copyArray->setLength(0);
return true;
}
long indfrom = start;
long indto = 0;
copyArray->setCapacity(len);
if(increment==1) {
copy(*masterArray,indfrom,1,*copyArray,indto,1,len);
} else {
for(long i=0; i<len; ++i) {
copy(*masterArray,indfrom,1,*copyArray,indto,1,1);
indfrom += increment;
indto += 1;
}
}
copyArray->setLength(len);
} else {
for(long i=0; i<len; ++i) {
copy(*masterArray,indfrom,1,*copyArray,indto,1,1);
indfrom += increment;
indto += 1;
}
}
copyArray->setLength(len);
bitSet->set(pvField->getFieldOffset());
return true;
return true;
}
if (end - start >= 0) len = 1 + (end - start) / increment;
if(len<=0) return true;
@ -205,13 +205,13 @@ bool PVArrayFilter::filter(const PVFieldPtr & pvField,const BitSetPtr & bitSet,b
long indfrom = 0;
long indto = start;
if(increment==1) {
copy(*copyArray,indfrom,1,*masterArray,indto,1,len);
copy(*copyArray,indfrom,1,*masterArray,indto,1,len);
} else {
for(long i=0; i<len; ++i) {
copy(*copyArray,indfrom,1,*masterArray,indto,1,1);
indfrom += 1;
indto += increment;
}
for(long i=0; i<len; ++i) {
copy(*copyArray,indfrom,1,*masterArray,indto,1,1);
indfrom += 1;
indto += increment;
}
}
if(isUnion) masterField->postPut();
return true;
@ -219,8 +219,7 @@ bool PVArrayFilter::filter(const PVFieldPtr & pvField,const BitSetPtr & bitSet,b
string PVArrayFilter::getName()
{
return name;
return name;
}
}}

View File

@ -710,7 +710,7 @@ void PVCopy::setIgnore(CopyNodePtr const &node) {
CopyNodePtrArrayPtr nodes = structureNode->nodes;
for(size_t i=0; i<nodes->size(); ++i) {
CopyNodePtr node = (*nodes)[i];
setIgnore(node); }
setIgnore(node); }
} else {
size_t num = node->masterPVField->getNumberFields();
if(num>1) {

View File

@ -128,8 +128,7 @@ bool PVDeadbandFilter::filter(const PVFieldPtr & pvCopy,const BitSetPtr & bitSet
string PVDeadbandFilter::getName()
{
return name;
return name;
}
}}

View File

@ -38,4 +38,3 @@ PVPluginPtr PVPluginRegistry::find(const std::string & name)
}
}}

View File

@ -120,8 +120,7 @@ bool PVTimestampFilter::filter(const PVFieldPtr & pvCopy,const BitSetPtr & bitSe
string PVTimestampFilter::getName()
{
return name;
return name;
}
}}

View File

@ -87,4 +87,3 @@ private:
}}
#endif /* CONTROLSUPPORT_H */

View File

@ -99,4 +99,3 @@ public:
}}
#endif /* PVARRAYPLUGIN_H */

View File

@ -525,4 +525,3 @@ private:
}}
#endif /* PVDATABASE_H */

View File

@ -100,4 +100,3 @@ public:
}}
#endif /* PVDEADBANDPLUGIN_H */

View File

@ -75,4 +75,3 @@ public:
}}
#endif /* PVSUPPORT_H */

View File

@ -98,4 +98,3 @@ public:
}}
#endif /* PVTIMESTAMPPLUGIN_H */

View File

@ -108,4 +108,3 @@ private:
}}
#endif /* SCALARALARMSUPPORT_H */

View File

@ -115,4 +115,3 @@ void AddRecord::process()
}}

View File

@ -164,4 +164,3 @@ void ProcessRecord::run()
}}

View File

@ -90,4 +90,3 @@ void RemoveRecord::process()
}}

View File

@ -93,4 +93,3 @@ void TraceRecord::process()
}}

View File

@ -135,4 +135,3 @@ void ControlSupport::reset()
}}

View File

@ -216,4 +216,3 @@ void ScalarAlarmSupport::setAlarm(
}}

View File

@ -26,7 +26,7 @@
#ifdef listenerEpicsExportSharedSymbols
# define epicsExportSharedSymbols
# undef listenerEpicsExportSharedSymbols
# undef listenerEpicsExportSharedSymbols
#endif
#include <shareLib.h>

View File

@ -25,7 +25,7 @@
#ifdef powerSupplyEpicsExportSharedSymbols
# define epicsExportSharedSymbols
# undef powerSupplyEpicsExportSharedSymbols
# undef powerSupplyEpicsExportSharedSymbols
#endif
#include <shareLib.h>

View File

@ -25,7 +25,7 @@
#ifdef pvRecordClientEpicsExportSharedSymbols
# define epicsExportSharedSymbols
# undef pvRecordClientEpicsExportSharedSymbols
# undef pvRecordClientEpicsExportSharedSymbols
#endif
#include <shareLib.h>

View File

@ -134,4 +134,3 @@ MAIN(testExampleRecord)
test();
return 0;
}

View File

@ -79,4 +79,3 @@ MAIN(testLocalProvider)
test();
return 0;
}

View File

@ -75,4 +75,3 @@ MAIN(testPVAServer)
test();
return 0;
}

View File

@ -401,4 +401,3 @@ MAIN(testPVCopy)
powerSupplyTest();
return 0;
}

View File

@ -103,4 +103,3 @@ MAIN(testPVRecord)
powerSupplyTest();
return 0;
}

View File

@ -343,4 +343,3 @@ MAIN(testPlugin)
ignoreTest();
return 0;
}