[svn] commit: r1322 - in /trunk/src: bin/auth/main.cc lib/config/ccsession.cc lib/config/ccsession.h
BIND 10 source code commits
bind10-changes at lists.isc.org
Thu Mar 11 10:23:23 UTC 2010
Author: jelte
Date: Thu Mar 11 10:23:23 2010
New Revision: 1322
Log:
renamed some functions that weren't following style guide
Modified:
trunk/src/bin/auth/main.cc
trunk/src/lib/config/ccsession.cc
trunk/src/lib/config/ccsession.h
Modified: trunk/src/bin/auth/main.cc
==============================================================================
--- trunk/src/bin/auth/main.cc (original)
+++ trunk/src/bin/auth/main.cc Thu Mar 11 10:23:23 2010
@@ -595,7 +595,7 @@
processMessageTCP(socket_set.tps6, dns_message, response_renderer);
}
if (FD_ISSET(ss, &fds)) {
- cs.check_command();
+ cs.checkCommand();
}
}
}
Modified: trunk/src/lib/config/ccsession.cc
==============================================================================
--- trunk/src/lib/config/ccsession.cc (original)
+++ trunk/src/lib/config/ccsession.cc Thu Mar 11 10:23:23 2010
@@ -143,7 +143,7 @@
}
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 @@
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 @@
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 @@
}
int
-ModuleCCSession::check_command()
+ModuleCCSession::checkCommand()
{
ElementPtr cmd, routing, data;
if (session_.group_recvmsg(routing, data, true)) {
@@ -332,7 +332,7 @@
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);
Modified: trunk/src/lib/config/ccsession.h
==============================================================================
--- trunk/src/lib/config/ccsession.h (original)
+++ trunk/src/lib/config/ccsession.h Thu Mar 11 10:23:23 2010
@@ -77,7 +77,7 @@
* 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 @@
*
* 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 @@
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_;
More information about the bind10-changes
mailing list