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

pvtools: drop unnecessary accessors for global flags

Browse Source 
These don't provide any encapsulation or validation...
This commit is contained in:
Michael Davidsaver
2018-04-24 08:29:45 -07:00
parent a2b60771c2
commit 9c25057d80
5 changed files with 5 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pvtoolsSrc/eget.cpp
View File

@ -1416,7 +1416,7 @@ int main (int argc, char *argv[])
dumpStructure = true;
break;
case 'i': /* T-types format mode */
formatTTypes(false);
formatTTypesFlag = false;
break;
case 't': /* Terse mode */
mode = TerseMode;
@ -1478,7 +1478,7 @@ int main (int argc, char *argv[])
break;
}
case 'n':
setEnumPrintMode(NumberEnum);
enumMode = NumberEnum;
break;
case '?':
fprintf(stderr,
@ -1526,7 +1526,7 @@ int main (int argc, char *argv[])
std::cout << std::boolalpha;
terseSeparator(fieldSeparator);
terseArrayCount(false);
arrayCountFlag = false;
bool allOK = true;

4
pvtoolsSrc/pvget.cpp
View File

@ -427,7 +427,7 @@ int main (int argc, char *argv[])
mode = TerseMode;
break;
case 'i': /* T-types format mode */
formatTTypes(false);
formatTTypesFlag = false;
break;
case 'm': /* Monitor mode */
monitor = true;
@ -468,7 +468,7 @@ int main (int argc, char *argv[])
break;
}
case 'n':
setEnumPrintMode(NumberEnum);
enumMode = NumberEnum;
break;
case '?':
fprintf(stderr,

1
pvtoolsSrc/pvput.cpp
View File

@ -610,7 +610,6 @@ int main (int argc, char *argv[])
std::cout << std::boolalpha;
terseSeparator(fieldSeparator);
setEnumPrintMode(enumMode);
epics::pvAccess::ca::CAClientFactory::start();

17
pvtoolsSrc/pvutils.cpp
View File

@ -50,28 +50,11 @@ void terseSeparator(char c)
}
char arrayCountFlag = true;
void terseArrayCount(bool flag)
{
arrayCountFlag = flag;
}
EnumMode enumMode = AutoEnum;
void setEnumPrintMode(EnumMode mode)
{
enumMode = mode;
}
bool formatTTypesFlag = true;
void formatTTypes(bool flag)
{
formatTTypesFlag = flag;
}
bool printUserTagFlag = true;
void printUserTag(bool flag)
{
printUserTagFlag = flag;
}
std::ostream& terse(std::ostream& o, PVField::const_shared_pointer const & pv)
{

5
pvtoolsSrc/pvutils.h
View File

@ -8,7 +8,6 @@ void convertArray(std::string*, epics::pvData::PVScalarArray * pv, int notFirst)
void convertStructureArray(std::string*, epics::pvData::PVStructureArray * pvdata, int notFirst);
void terseSeparator(char c);
void terseArrayCount(bool flag);
std::ostream& terse(std::ostream& o, epics::pvData::PVField::const_shared_pointer const & pv);
std::ostream& terseUnion(std::ostream& o, epics::pvData::PVUnion::const_shared_pointer const & pvUnion);
std::ostream& terseStructure(std::ostream& o, const epics::pvData::PVStructure::const_shared_pointer &pvStructure);
@ -17,14 +16,10 @@ std::ostream& terseStructureArray(std::ostream& o, epics::pvData::PVStructureArr
std::ostream& terseUnionArray(std::ostream& o, epics::pvData::PVUnionArray::const_shared_pointer const & pvArray);
enum EnumMode { AutoEnum, NumberEnum, StringEnum };
void setEnumPrintMode(EnumMode mode);
void formatTTypes(bool flag);
bool isTType(epics::pvData::PVStructure::const_shared_pointer const & pvStructure);
bool formatTType(std::ostream& o, const epics::pvData::PVStructure::const_shared_pointer &pvStructure);
void printUserTag(bool flag);
std::ostream& printEnumT(std::ostream& o, epics::pvData::PVStructure const & pvEnumT);
std::ostream& printEnumT(std::ostream& o, epics::pvData::PVStructure::const_shared_pointer const & pvEnumT);
std::ostream& printTimeT(std::ostream& o, epics::pvData::PVStructure::const_shared_pointer const & pvTimeT);