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

const-ify string constants

Browse Source 
yes really...
This commit is contained in:
Michael Davidsaver
2018-05-18 10:12:34 -07:00
parent 6abfe9d196
commit 6ccca1ce58
11 changed files with 31 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pvtoolsSrc/eget.cpp
View File

@ -937,8 +937,6 @@ void printValue(std::string const & channelName, PVStructure::shared_pointer con
dumpValue(channelName, pv);
}
static string emptyString;
// only in ValueOnlyMode
// NOTE: names might be empty
void printValues(shared_vector<const string> const & names, vector<PVStructure::shared_pointer> const & values)

4
pvtoolsSrc/pvlist.cpp
View File

@ -67,8 +67,6 @@ string toHex(int8* ba, size_t len) {
}
static string emptyString;
std::size_t readSize(ByteBuffer* buffer) {
int8 b = buffer->getByte();
if(b==-1)
@ -94,7 +92,7 @@ string deserializeString(ByteBuffer* buffer) {
return str;
}
else
return emptyString;
return std::string();
}
struct ServerEntry {

3
src/ca/caProvider.cpp
View File

@ -119,9 +119,8 @@ Channel::shared_pointer CAChannelProvider::createChannel(
ChannelRequester::shared_pointer const & channelRequester,
short priority)
{
static std::string emptyString;
Channel::shared_pointer channel(
createChannel(channelName, channelRequester, priority, emptyString));
createChannel(channelName, channelRequester, priority, std::string()));
return channel;
}

8
src/pipelineService/pipelineServer.cpp
View File

@ -454,9 +454,9 @@ class PipelineChannelProvider :
public:
POINTER_DEFINITIONS(PipelineChannelProvider);
static string PROVIDER_NAME;
static const string PROVIDER_NAME;
static Status noSuchChannelStatus;
static const Status noSuchChannelStatus;
// TODO thread pool support
@ -619,8 +619,8 @@ private:
epics::pvData::Mutex m_mutex;
};
string PipelineChannelProvider::PROVIDER_NAME("PipelineService");
Status PipelineChannelProvider::noSuchChannelStatus(Status::STATUSTYPE_ERROR, "no such channel");
const string PipelineChannelProvider::PROVIDER_NAME("PipelineService");
const Status PipelineChannelProvider::noSuchChannelStatus(Status::STATUSTYPE_ERROR, "no such channel");
PipelineServer::PipelineServer()
:m_channelProviderImpl(new PipelineChannelProvider)

3
src/remoteClient/clientContextImpl.cpp
View File

@ -54,7 +54,6 @@ Status ClientChannelImpl::channelDestroyed(
Status::STATUSTYPE_WARNING, "channel destroyed");
Status ClientChannelImpl::channelDisconnected(
Status::STATUSTYPE_WARNING, "channel disconnected");
string emptyString;
}}
namespace {
@ -3096,7 +3095,7 @@ public:
ChannelRequester::shared_pointer const & channelRequester,
short priority) OVERRIDE FINAL
{
return createChannel(channelName, channelRequester, priority, emptyString);
return createChannel(channelName, channelRequester, priority, std::string());
}
virtual Channel::shared_pointer createChannel(

8
src/rpcService/rpcServer.cpp
View File

@ -248,9 +248,9 @@ class RPCChannelProvider :
public:
POINTER_DEFINITIONS(RPCChannelProvider);
static string PROVIDER_NAME;
static const string PROVIDER_NAME;
static Status noSuchChannelStatus;
static const Status noSuchChannelStatus;
// TODO thread pool support
@ -413,8 +413,8 @@ private:
epics::pvData::Mutex m_mutex;
};
string RPCChannelProvider::PROVIDER_NAME("rpcService");
Status RPCChannelProvider::noSuchChannelStatus(Status::STATUSTYPE_ERROR, "no such channel");
const string RPCChannelProvider::PROVIDER_NAME("rpcService");
const Status RPCChannelProvider::noSuchChannelStatus(Status::STATUSTYPE_ERROR, "no such channel");
RPCServer::RPCServer(const Configuration::const_shared_pointer &conf)

4
src/server/pv/responseHandlers.h
View File

@ -118,7 +118,7 @@ public:
// TODO
static std::map<std::string, std::tr1::weak_ptr<ChannelProvider> > s_channelNameToProvider;
static std::string SUPPORTED_PROTOCOL;
static const std::string SUPPORTED_PROTOCOL;
ServerSearchHandler(ServerContextImpl::shared_pointer const & context);
virtual ~ServerSearchHandler() {}
@ -181,7 +181,7 @@ public:
private:
// Name of the magic "server" PV used to implement channelList() and server info
static std::string SERVER_CHANNEL_NAME;
static const std::string SERVER_CHANNEL_NAME;
void disconnect(Transport::shared_pointer const & transport);
};

8
src/server/responseHandlers.cpp
View File

@ -226,7 +226,7 @@ void ServerEchoHandler::handleResponse(osiSockAddr* responseFrom,
/****************************************************************************************/
std::string ServerSearchHandler::SUPPORTED_PROTOCOL = "tcp";
const std::string ServerSearchHandler::SUPPORTED_PROTOCOL = "tcp";
ServerSearchHandler::ServerSearchHandler(ServerContextImpl::shared_pointer const & context) :
AbstractServerResponseHandler(context, "Search request")
@ -527,7 +527,7 @@ private:
static Structure::const_shared_pointer channelListStructure;
static Structure::const_shared_pointer infoStructure;
static std::string helpString;
static const std::string helpString;
ServerContextImpl::shared_pointer m_serverContext;
@ -680,7 +680,7 @@ Structure::const_shared_pointer ServerRPCService::infoStructure =
createStructure();
std::string ServerRPCService::helpString =
const std::string ServerRPCService::helpString =
"pvAccess server RPC service.\n"
"arguments:\n"
"\tstring op\toperation to execute\n"
@ -695,7 +695,7 @@ std::string ServerRPCService::helpString =
namespace epics {
namespace pvAccess {
std::string ServerCreateChannelHandler::SERVER_CHANNEL_NAME = "server";
const std::string ServerCreateChannelHandler::SERVER_CHANNEL_NAME = "server";
void ServerCreateChannelHandler::handleResponse(osiSockAddr* responseFrom,
Transport::shared_pointer const & transport, int8 version, int8 command,

12
testApp/remote/channelAccessIFTest.cpp
View File

@ -32,17 +32,17 @@ namespace TR1 = std::tr1;
// int value, 1Hz increment by one
std::string ChannelAccessIFTest::TEST_COUNTER_CHANNEL_NAME = "testCounter";
const std::string ChannelAccessIFTest::TEST_COUNTER_CHANNEL_NAME = "testCounter";
// int value, increment on process
std::string ChannelAccessIFTest::TEST_SIMPLECOUNTER_CHANNEL_NAME = "testSimpleCounter";
const std::string ChannelAccessIFTest::TEST_SIMPLECOUNTER_CHANNEL_NAME = "testSimpleCounter";
// double value, NTScalar
std::string ChannelAccessIFTest::TEST_CHANNEL_NAME = "testValue";
const std::string ChannelAccessIFTest::TEST_CHANNEL_NAME = "testValue";
// double value
std::string ChannelAccessIFTest::TEST_VALUEONLY_CHANNEL_NAME = "testValueOnly";
const std::string ChannelAccessIFTest::TEST_VALUEONLY_CHANNEL_NAME = "testValueOnly";
// RPC sum service: int a + int b -> int c
std::string ChannelAccessIFTest::TEST_SUMRPC_CHANNEL_NAME = "testSum";
const std::string ChannelAccessIFTest::TEST_SUMRPC_CHANNEL_NAME = "testSum";
// double[] value
std::string ChannelAccessIFTest::TEST_ARRAY_CHANNEL_NAME = "testArray1";
const std::string ChannelAccessIFTest::TEST_ARRAY_CHANNEL_NAME = "testArray1";
#ifdef ENABLE_STRESS_TESTS
#define EXTRA_STRESS_TESTS 5

12
testApp/remote/channelAccessIFTest.h
View File

@ -16,12 +16,12 @@ public:
protected:
static std::string TEST_COUNTER_CHANNEL_NAME;
static std::string TEST_SIMPLECOUNTER_CHANNEL_NAME;
static std::string TEST_CHANNEL_NAME;
static std::string TEST_VALUEONLY_CHANNEL_NAME;
static std::string TEST_SUMRPC_CHANNEL_NAME;
static std::string TEST_ARRAY_CHANNEL_NAME;
static const std::string TEST_COUNTER_CHANNEL_NAME;
static const std::string TEST_SIMPLECOUNTER_CHANNEL_NAME;
static const std::string TEST_CHANNEL_NAME;
static const std::string TEST_VALUEONLY_CHANNEL_NAME;
static const std::string TEST_SUMRPC_CHANNEL_NAME;
static const std::string TEST_ARRAY_CHANNEL_NAME;
ChannelProvider::shared_pointer getChannelProvider() { return m_provider; }

4
testApp/remote/testServer.cpp
View File

@ -2515,7 +2515,7 @@ public:
typedef std::tr1::shared_ptr<MockServerChannelProvider> shared_pointer;
typedef std::tr1::shared_ptr<const MockServerChannelProvider> const_shared_pointer;
static string PROVIDER_NAME;
static const string PROVIDER_NAME;
MockServerChannelProvider() :
m_mockChannelFind(),
@ -2699,7 +2699,7 @@ private:
epics::auto_ptr<epics::pvData::Thread> m_imgThread;
};
string MockServerChannelProvider::PROVIDER_NAME = "local";
const string MockServerChannelProvider::PROVIDER_NAME = "local";
struct TestServer
{