Commit e7361328 authored by Jelte Jansen's avatar Jelte Jansen
Browse files

renamed some functions that weren't following style guide


git-svn-id: svn://bind10.isc.org/svn/bind10/trunk@1322 e5f2f494-b856-4b98-b285-d166d9295462
parent d0dbc943
......@@ -595,7 +595,7 @@ run_server(const char* port, const bool use_ipv4, const bool use_ipv6,
processMessageTCP(socket_set.tps6, dns_message, response_renderer);
}
if (FD_ISSET(ss, &fds)) {
cs.check_command();
cs.checkCommand();
}
}
}
......
......@@ -143,7 +143,7 @@ parseCommand(ElementPtr& arg, const ElementPtr command)
}
ModuleSpec
ModuleCCSession::read_module_specification(const std::string& filename) {
ModuleCCSession::readModuleSpecification(const std::string& filename) {
std::ifstream file;
ModuleSpec module_spec;
......@@ -172,7 +172,7 @@ void
ModuleCCSession::startCheck() {
// data available on the command channel. process it in the synchronous
// mode.
check_command();
checkCommand();
// start asynchronous read again.
session_.startRead(boost::bind(&ModuleCCSession::startCheck, this));
......@@ -212,7 +212,7 @@ ModuleCCSession::init(
const std::string& command, const isc::data::ElementPtr args)
) throw (isc::cc::SessionError)
{
module_specification_ = read_module_specification(spec_file_name);
module_specification_ = readModuleSpecification(spec_file_name);
sleep(1);
module_name_ = module_specification_.getFullSpec()->get("module_name")->stringValue();
......@@ -292,7 +292,7 @@ ModuleCCSession::getSocket()
}
int
ModuleCCSession::check_command()
ModuleCCSession::checkCommand()
{
ElementPtr cmd, routing, data;
if (session_.group_recvmsg(routing, data, true)) {
......@@ -332,7 +332,7 @@ ModuleCCSession::check_command()
std::string
ModuleCCSession::addRemoteConfig(const std::string& spec_file_name)
{
ModuleSpec rmod_spec = read_module_specification(spec_file_name);
ModuleSpec rmod_spec = readModuleSpecification(spec_file_name);
std::string module_name = rmod_spec.getFullSpec()->get("module_name")->stringValue();
ConfigData rmod_config = ConfigData(rmod_spec);
session_.subscribe(module_name);
......
......@@ -77,7 +77,7 @@ public:
* This is a non-blocking read; if there is nothing this function
* will return 0.
*/
int check_command();
int checkCommand();
/**
* The config handler function should expect an ElementPtr containing
......@@ -99,7 +99,7 @@ public:
*
* This protocol is very likely to change.
*/
void set_command_handler(isc::data::ElementPtr(*command_handler)(const std::string& command, const isc::data::ElementPtr args)) { command_handler_ = command_handler; };
void setCommandHandler(isc::data::ElementPtr(*command_handler)(const std::string& command, const isc::data::ElementPtr args)) { command_handler_ = command_handler; };
/**
* Gives access to the configuration values of a different module
......@@ -147,7 +147,7 @@ private:
isc::data::ElementPtr(*command_handler)(
const std::string& command, const isc::data::ElementPtr args)
) throw (isc::cc::SessionError);
ModuleSpec read_module_specification(const std::string& filename);
ModuleSpec readModuleSpecification(const std::string& filename);
void startCheck();
std::string module_name_;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment