diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/Client/CommandParser.cpp | 4 | ||||
-rw-r--r-- | src/Client/UserCommands.cpp | 6 | ||||
-rw-r--r-- | src/Common/RequestHandlers/FSInfoRequestHandler.cpp | 2 | ||||
-rw-r--r-- | src/Common/RequestHandlers/StatusRequestHandler.cpp | 2 | ||||
-rw-r--r-- | src/Common/RequestManager.h | 2 | ||||
-rw-r--r-- | src/Common/SystemBackend.h | 10 | ||||
-rw-r--r-- | src/Common/UserConfigBackend.h | 18 | ||||
-rw-r--r-- | src/Common/UserDBBackend.h | 38 | ||||
-rw-r--r-- | src/Common/UserManager.cpp | 2 | ||||
-rw-r--r-- | src/Common/XmlPacket.cpp | 2 | ||||
-rw-r--r-- | src/Core/LogManager.cpp | 6 | ||||
-rw-r--r-- | src/Core/LogManager.h | 8 | ||||
-rw-r--r-- | src/Core/ThreadManager.h | 2 | ||||
-rw-r--r-- | src/Net/Connection.h | 2 | ||||
-rw-r--r-- | src/Server/RequestHandlers/ConnectionRequestHandlerGroup.cpp | 4 | ||||
-rw-r--r-- | src/Server/RequestHandlers/UserRequestHandlerGroup.cpp | 26 | ||||
-rw-r--r-- | src/modules/UserBackendMysql/UserBackendMysql.cpp | 2 |
17 files changed, 57 insertions, 79 deletions
diff --git a/src/Client/CommandParser.cpp b/src/Client/CommandParser.cpp index b81d6df..838c831 100644 --- a/src/Client/CommandParser.cpp +++ b/src/Client/CommandParser.cpp @@ -17,8 +17,6 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include <config.h> - #include "CommandParser.h" #include "Application.h" #include "InformationManager.h" @@ -194,7 +192,7 @@ void CommandParser::listHostsCommand(const std::vector<std::string> &args) { } } -void CommandParser::exitCommand(const std::vector<std::string> &args _UNUSED_PARAMETER_) { +void CommandParser::exitCommand(const std::vector<std::string> &/*args*/) { boost::shared_ptr<Common::Requests::DisconnectRequest> request(new Common::Requests::DisconnectRequest(application)); application->getRequestManager()->sendRequest(connection, request); diff --git a/src/Client/UserCommands.cpp b/src/Client/UserCommands.cpp index ab6449e..43131c7 100644 --- a/src/Client/UserCommands.cpp +++ b/src/Client/UserCommands.cpp @@ -17,8 +17,6 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include <config.h> - #include "UserCommands.h" #include "Application.h" #include "CommandParser.h" @@ -71,7 +69,7 @@ std::string UserCommands::getGroupName(CommandParser *commandParser, unsigned lo return stream.str(); } -void UserCommands::listUsersCommand(CommandParser *commandParser, const std::vector<std::string> &args _UNUSED_PARAMETER_) { +void UserCommands::listUsersCommand(CommandParser *commandParser, const std::vector<std::string> &/*args*/) { try { boost::shared_ptr<const std::map<unsigned long, Common::UserInfo> > users = commandParser->application->getUserManager()->getUserList(); @@ -138,7 +136,7 @@ void UserCommands::userInfoCommand(CommandParser *commandParser, const std::vect } } -void UserCommands::listGroupsCommand(CommandParser *commandParser, const std::vector<std::string> &args _UNUSED_PARAMETER_) { +void UserCommands::listGroupsCommand(CommandParser *commandParser, const std::vector<std::string> &/*args*/) { try { boost::shared_ptr<const std::map<unsigned long, Common::GroupInfo> > groups = commandParser->application->getUserManager()->getGroupList(); diff --git a/src/Common/RequestHandlers/FSInfoRequestHandler.cpp b/src/Common/RequestHandlers/FSInfoRequestHandler.cpp index 4b7972f..8af1ed3 100644 --- a/src/Common/RequestHandlers/FSInfoRequestHandler.cpp +++ b/src/Common/RequestHandlers/FSInfoRequestHandler.cpp @@ -24,7 +24,7 @@ namespace Mad { namespace Common { namespace RequestHandlers { -void FSInfoRequestHandler::handleRequest(boost::shared_ptr<const Common::XmlPacket> packet _UNUSED_PARAMETER_, Common::XmlPacket *ret) { +void FSInfoRequestHandler::handleRequest(boost::shared_ptr<const Common::XmlPacket> /*packet*/, Common::XmlPacket *ret) { // TODO Require authentication std::vector<SystemManager::FSInfo> fsInfo; diff --git a/src/Common/RequestHandlers/StatusRequestHandler.cpp b/src/Common/RequestHandlers/StatusRequestHandler.cpp index 1709fff..18b8868 100644 --- a/src/Common/RequestHandlers/StatusRequestHandler.cpp +++ b/src/Common/RequestHandlers/StatusRequestHandler.cpp @@ -24,7 +24,7 @@ namespace Mad { namespace Common { namespace RequestHandlers { -void StatusRequestHandler::handleRequest(boost::shared_ptr<const Common::XmlPacket> packet _UNUSED_PARAMETER_, Common::XmlPacket *ret) { +void StatusRequestHandler::handleRequest(boost::shared_ptr<const Common::XmlPacket> /*packet*/, Common::XmlPacket *ret) { // TODO Require authentication ret->setType("OK"); diff --git a/src/Common/RequestManager.h b/src/Common/RequestManager.h index cbd1aa1..0c50881 100644 --- a/src/Common/RequestManager.h +++ b/src/Common/RequestManager.h @@ -81,7 +81,7 @@ class RequestManager : private boost::noncopyable { return types; } - virtual boost::shared_ptr<RequestHandler> createRequestHandler(Application *application, const std::string &type _UNUSED_PARAMETER_) { + virtual boost::shared_ptr<RequestHandler> createRequestHandler(Application *application, const std::string& /*type*/) { return boost::shared_ptr<RequestHandler>(new T(application)); } }; diff --git a/src/Common/SystemBackend.h b/src/Common/SystemBackend.h index 2e23527..aba83f8 100644 --- a/src/Common/SystemBackend.h +++ b/src/Common/SystemBackend.h @@ -20,8 +20,6 @@ #ifndef MAD_COMMON_SYSTEMBACKEND_H_ #define MAD_COMMON_SYSTEMBACKEND_H_ -#include <config.h> - #include "SystemManager.h" namespace Mad { @@ -31,19 +29,19 @@ class SystemBackend { protected: friend class SystemManager; - virtual void getUptimeInfo(unsigned long *uptime _UNUSED_PARAMETER_, unsigned long *idleTime _UNUSED_PARAMETER_) throw(Core::Exception) { + virtual void getUptimeInfo(unsigned long */*uptime*/, unsigned long */*idleTime*/) throw(Core::Exception) { throw Core::Exception(Core::Exception::NOT_IMPLEMENTED); } - virtual void getMemoryInfo(unsigned long *totalMem _UNUSED_PARAMETER_, unsigned long *freeMem _UNUSED_PARAMETER_, unsigned long *totalSwap _UNUSED_PARAMETER_, unsigned long *freeSwap _UNUSED_PARAMETER_) throw(Core::Exception) { + virtual void getMemoryInfo(unsigned long */*totalMem*/, unsigned long */*freeMem*/, unsigned long */*totalSwap*/, unsigned long */*freeSwap*/) throw(Core::Exception) { throw Core::Exception(Core::Exception::NOT_IMPLEMENTED); } - virtual void getLoadInfo(unsigned long *currentLoad _UNUSED_PARAMETER_, unsigned long *nProcesses _UNUSED_PARAMETER_, float *loadAvg1 _UNUSED_PARAMETER_, float *loadAvg5 _UNUSED_PARAMETER_, float *loadAvg15 _UNUSED_PARAMETER_) throw(Core::Exception) { + virtual void getLoadInfo(unsigned long */*currentLoad*/, unsigned long */*nProcesses*/, float */*loadAvg1*/, float */*loadAvg5*/, float */*loadAvg15*/) throw(Core::Exception) { throw Core::Exception(Core::Exception::NOT_IMPLEMENTED); } - virtual void getFSInfo(std::vector<SystemManager::FSInfo> *fsInfo _UNUSED_PARAMETER_) throw(Core::Exception) { + virtual void getFSInfo(std::vector<SystemManager::FSInfo> */*fsInfo*/) throw(Core::Exception) { throw Core::Exception(Core::Exception::NOT_IMPLEMENTED); } diff --git a/src/Common/UserConfigBackend.h b/src/Common/UserConfigBackend.h index 0036e9c..5055599 100644 --- a/src/Common/UserConfigBackend.h +++ b/src/Common/UserConfigBackend.h @@ -20,8 +20,6 @@ #ifndef MAD_COMMON_USERCONFIGBACKEND_H_ #define MAD_COMMON_USERCONFIGBACKEND_H_ -#include <config.h> - #include <Core/Exception.h> #include "UserInfo.h" @@ -36,16 +34,16 @@ class UserConfigBackend { protected: friend class UserManager; - virtual void addUser(const UserInfo &userInfo _UNUSED_PARAMETER_) throw(Core::Exception) {} - virtual void updateUser(const UserInfo &oldUserInfo _UNUSED_PARAMETER_, const UserInfo &userInfo _UNUSED_PARAMETER_) throw(Core::Exception) {} - virtual void deleteUser(const UserInfo &userInfo _UNUSED_PARAMETER_) throw(Core::Exception) {} + virtual void addUser(const UserInfo& /*userInfo*/) throw(Core::Exception) {} + virtual void updateUser(const UserInfo& /*oldUserInfo*/, const UserInfo& /*userInfo*/) throw(Core::Exception) {} + virtual void deleteUser(const UserInfo& /*userInfo*/) throw(Core::Exception) {} - virtual void addGroup(const GroupInfo &groupInfo _UNUSED_PARAMETER_) throw(Core::Exception) {} - virtual void updateGroup(const GroupInfo &oldGroupInfo _UNUSED_PARAMETER_, const GroupInfo &groupInfo _UNUSED_PARAMETER_) throw(Core::Exception) {} - virtual void deleteGroup(const GroupInfo &groupInfo _UNUSED_PARAMETER_) throw(Core::Exception) {} + virtual void addGroup(const GroupInfo& /*groupInfo*/) throw(Core::Exception) {} + virtual void updateGroup(const GroupInfo& /*oldGroupInfo*/, const GroupInfo& /*groupInfo*/) throw(Core::Exception) {} + virtual void deleteGroup(const GroupInfo& /*groupInfo*/) throw(Core::Exception) {} - virtual void addUserToGroup(const UserInfo &userInfo _UNUSED_PARAMETER_, const GroupInfo &groupInfo _UNUSED_PARAMETER_) throw(Core::Exception) {} - virtual void deleteUserFromGroup(const UserInfo &userInfo _UNUSED_PARAMETER_, const GroupInfo &groupInfo _UNUSED_PARAMETER_) throw(Core::Exception) {} + virtual void addUserToGroup(const UserInfo& /*userInfo*/, const GroupInfo& /*groupInfo*/) throw(Core::Exception) {} + virtual void deleteUserFromGroup(const UserInfo& /*userInfo*/, const GroupInfo& /*groupInfo*/) throw(Core::Exception) {} }; } diff --git a/src/Common/UserDBBackend.h b/src/Common/UserDBBackend.h index 5267ef3..bed4c83 100644 --- a/src/Common/UserDBBackend.h +++ b/src/Common/UserDBBackend.h @@ -20,8 +20,6 @@ #ifndef MAD_SERVER_USERDBBACKEND_H_ #define MAD_SERVER_USERDBBACKEND_H_ -#include <config.h> - #include <Core/Exception.h> #include "UserInfo.h" @@ -48,80 +46,80 @@ class UserDBBackend { UserDBBackend() {} - virtual boost::shared_ptr<const std::map<unsigned long, UserInfo> > getUserList(boost::posix_time::ptime *timestamp _UNUSED_PARAMETER_) throw(Core::Exception) { + virtual boost::shared_ptr<const std::map<unsigned long, UserInfo> > getUserList(boost::posix_time::ptime* /*timestamp*/) throw(Core::Exception) { throw(Core::Exception(Core::Exception::NOT_IMPLEMENTED)); } - virtual boost::shared_ptr<const UserInfo> getUserInfo(unsigned long uid _UNUSED_PARAMETER_, boost::posix_time::ptime *timestamp _UNUSED_PARAMETER_) throw(Core::Exception) { + virtual boost::shared_ptr<const UserInfo> getUserInfo(unsigned long /*uid*/, boost::posix_time::ptime* /*timestamp*/) throw(Core::Exception) { throw(Core::Exception(Core::Exception::NOT_IMPLEMENTED)); } - virtual boost::shared_ptr<const UserInfo> getUserInfoByName(const std::string &name _UNUSED_PARAMETER_, boost::posix_time::ptime *timestamp _UNUSED_PARAMETER_) throw(Core::Exception) { + virtual boost::shared_ptr<const UserInfo> getUserInfoByName(const std::string& /*name*/, boost::posix_time::ptime* /*timestamp*/) throw(Core::Exception) { throw(Core::Exception(Core::Exception::NOT_IMPLEMENTED)); } - virtual boost::shared_ptr<const std::set<unsigned long> > getUserGroupList(unsigned long uid _UNUSED_PARAMETER_, boost::posix_time::ptime *timestamp _UNUSED_PARAMETER_) throw(Core::Exception) { + virtual boost::shared_ptr<const std::set<unsigned long> > getUserGroupList(unsigned long /*uid*/, boost::posix_time::ptime* /*timestamp*/) throw(Core::Exception) { throw(Core::Exception(Core::Exception::NOT_IMPLEMENTED)); } - virtual boost::shared_ptr<const std::map<unsigned long, GroupInfo> > getGroupList(boost::posix_time::ptime *timestamp _UNUSED_PARAMETER_) throw(Core::Exception) { + virtual boost::shared_ptr<const std::map<unsigned long, GroupInfo> > getGroupList(boost::posix_time::ptime* /*timestamp*/) throw(Core::Exception) { throw(Core::Exception(Core::Exception::NOT_IMPLEMENTED)); } - virtual boost::shared_ptr<const GroupInfo> getGroupInfo(unsigned long gid _UNUSED_PARAMETER_, boost::posix_time::ptime *timestamp _UNUSED_PARAMETER_) throw(Core::Exception) { + virtual boost::shared_ptr<const GroupInfo> getGroupInfo(unsigned long /*gid*/, boost::posix_time::ptime* /*timestamp*/) throw(Core::Exception) { throw(Core::Exception(Core::Exception::NOT_IMPLEMENTED)); } - virtual boost::shared_ptr<const GroupInfo> getGroupInfoByName(const std::string &name _UNUSED_PARAMETER_, boost::posix_time::ptime *timestamp _UNUSED_PARAMETER_) throw(Core::Exception) { + virtual boost::shared_ptr<const GroupInfo> getGroupInfoByName(const std::string& /*name*/, boost::posix_time::ptime* /*timestamp*/) throw(Core::Exception) { throw(Core::Exception(Core::Exception::NOT_IMPLEMENTED)); } - virtual boost::shared_ptr<const std::set<unsigned long> > getGroupUserList(unsigned long gid _UNUSED_PARAMETER_, boost::posix_time::ptime *timestamp _UNUSED_PARAMETER_) throw(Core::Exception) { + virtual boost::shared_ptr<const std::set<unsigned long> > getGroupUserList(unsigned long /*gid*/, boost::posix_time::ptime* /*timestamp*/) throw(Core::Exception) { throw(Core::Exception(Core::Exception::NOT_IMPLEMENTED)); } - virtual boost::shared_ptr<const std::multimap<unsigned long, unsigned long> > getFullUserGroupList(boost::posix_time::ptime *timestamp _UNUSED_PARAMETER_) throw(Core::Exception) { + virtual boost::shared_ptr<const std::multimap<unsigned long, unsigned long> > getFullUserGroupList(boost::posix_time::ptime* /*timestamp*/) throw(Core::Exception) { throw(Core::Exception(Core::Exception::NOT_IMPLEMENTED)); } - virtual void setPassword(unsigned long uid _UNUSED_PARAMETER_, const std::string &password _UNUSED_PARAMETER_) throw(Core::Exception) { + virtual void setPassword(unsigned long /*uid*/, const std::string& /*password*/) throw(Core::Exception) { throw(Core::Exception(Core::Exception::NOT_IMPLEMENTED)); } - virtual void addUser(const UserInfo &userInfo _UNUSED_PARAMETER_) throw(Core::Exception) { + virtual void addUser(const UserInfo& /*userInfo*/) throw(Core::Exception) { throw(Core::Exception(Core::Exception::NOT_IMPLEMENTED)); } - virtual void updateUser(unsigned long uid _UNUSED_PARAMETER_, const UserInfo &userInfo _UNUSED_PARAMETER_) throw(Core::Exception) { + virtual void updateUser(unsigned long /*uid*/, const UserInfo& /*userInfo*/) throw(Core::Exception) { throw(Core::Exception(Core::Exception::NOT_IMPLEMENTED)); } - virtual void deleteUser(unsigned long uid _UNUSED_PARAMETER_) throw(Core::Exception) { + virtual void deleteUser(unsigned long /*uid*/) throw(Core::Exception) { throw(Core::Exception(Core::Exception::NOT_IMPLEMENTED)); } - virtual void addGroup(const GroupInfo &groupInfo _UNUSED_PARAMETER_) throw(Core::Exception) { + virtual void addGroup(const GroupInfo& /*groupInfo*/) throw(Core::Exception) { throw(Core::Exception(Core::Exception::NOT_IMPLEMENTED)); } - virtual void updateGroup(unsigned long gid _UNUSED_PARAMETER_, const GroupInfo &groupInfo _UNUSED_PARAMETER_) throw(Core::Exception) { + virtual void updateGroup(unsigned long /*gid*/, const GroupInfo& /*groupInfo*/) throw(Core::Exception) { throw(Core::Exception(Core::Exception::NOT_IMPLEMENTED)); } - virtual void deleteGroup(unsigned long gid _UNUSED_PARAMETER_) throw(Core::Exception) { + virtual void deleteGroup(unsigned long /*gid*/) throw(Core::Exception) { throw(Core::Exception(Core::Exception::NOT_IMPLEMENTED)); } - virtual void addUserToGroup(unsigned long uid _UNUSED_PARAMETER_, unsigned long gid _UNUSED_PARAMETER_) throw(Core::Exception) { + virtual void addUserToGroup(unsigned long /*uid*/, unsigned long /*gid*/) throw(Core::Exception) { throw(Core::Exception(Core::Exception::NOT_IMPLEMENTED)); } - virtual void deleteUserFromGroup(unsigned long uid _UNUSED_PARAMETER_, unsigned long gid _UNUSED_PARAMETER_) throw(Core::Exception) { + virtual void deleteUserFromGroup(unsigned long /*uid*/, unsigned long /*gid*/) throw(Core::Exception) { throw(Core::Exception(Core::Exception::NOT_IMPLEMENTED)); } diff --git a/src/Common/UserManager.cpp b/src/Common/UserManager.cpp index ebeb26d..37cee6c 100644 --- a/src/Common/UserManager.cpp +++ b/src/Common/UserManager.cpp @@ -133,7 +133,7 @@ boost::shared_ptr<const std::multimap<unsigned long, unsigned long> > UserManage return dbBackend->getFullUserGroupList(timestamp); } -void UserManager::setPassword(unsigned long uid _UNUSED_PARAMETER_, const std::string &password _UNUSED_PARAMETER_) throw(Core::Exception) { +void UserManager::setPassword(unsigned long /*uid*/, const std::string& /*password*/) throw(Core::Exception) { throw Core::Exception(Core::Exception::NOT_AVAILABLE); } diff --git a/src/Common/XmlPacket.cpp b/src/Common/XmlPacket.cpp index 9d497be..dbd3fc7 100644 --- a/src/Common/XmlPacket.cpp +++ b/src/Common/XmlPacket.cpp @@ -17,8 +17,6 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include <config.h> - #include "XmlPacket.h" #include "Base64Encoder.h" #include <cstdlib> diff --git a/src/Core/LogManager.cpp b/src/Core/LogManager.cpp index 4f000e9..d5928f9 100644 --- a/src/Core/LogManager.cpp +++ b/src/Core/LogManager.cpp @@ -27,7 +27,7 @@ namespace Mad { namespace Core { -void LogManager::ConsoleLogger::logMessage(MessageCategory category _UNUSED_PARAMETER_, MessageLevel level, time_t timestamp _UNUSED_PARAMETER_, const std::string &message) { +void LogManager::ConsoleLogger::logMessage(MessageCategory /*category*/, MessageLevel level, time_t /*timestamp*/, const std::string &message) { if(level != CRITICAL) {// Critical messages are printed to cerr directly, so don't print them a second time cerrLock.lock(); std::cerr << message << std::endl; @@ -35,13 +35,13 @@ void LogManager::ConsoleLogger::logMessage(MessageCategory category _UNUSED_PARA } } -void LogManager::ConsoleLogger::logMessage(MessageCategory category _UNUSED_PARAMETER_, MessageLevel, time_t timestamp _UNUSED_PARAMETER_, const std::string &message, const std::string &messageSource) { +void LogManager::ConsoleLogger::logMessage(MessageCategory /*category*/, MessageLevel /*level*/, time_t /*timestamp*/, const std::string &message, const std::string &messageSource) { cerrLock.lock(); std::cerr << message << " from " << messageSource << std::endl; cerrLock.unlock(); } -void LogManager::ConsoleLogger::logMessageDirect(MessageCategory category _UNUSED_PARAMETER_, MessageLevel level _UNUSED_PARAMETER_, time_t timestamp _UNUSED_PARAMETER_, const std::string &message) { +void LogManager::ConsoleLogger::logMessageDirect(MessageCategory /*category*/, MessageLevel /*level*/, time_t /*timestamp*/, const std::string &message) { cerrLock.lock(); std::cerr << message << std::endl; cerrLock.unlock(); diff --git a/src/Core/LogManager.h b/src/Core/LogManager.h index 7d3b434..d3233f0 100644 --- a/src/Core/LogManager.h +++ b/src/Core/LogManager.h @@ -20,8 +20,6 @@ #ifndef MAD_CORE_LOGMANAGER_H_ #define MAD_CORE_LOGMANAGER_H_ -#include <config.h> - #include "Configurable.h" #include "Logger.h" #include "RemoteLogger.h" @@ -68,13 +66,13 @@ class LogManager : public Configurable { boost::mutex cerrLock; protected: - virtual void logMessage(MessageCategory category _UNUSED_PARAMETER_, MessageLevel level, time_t timestamp _UNUSED_PARAMETER_, const std::string &message); - virtual void logMessage(MessageCategory category _UNUSED_PARAMETER_, MessageLevel, time_t timestamp _UNUSED_PARAMETER_, const std::string &message, const std::string &messageSource); + virtual void logMessage(MessageCategory category, MessageLevel level, time_t timestamp, const std::string &message); + virtual void logMessage(MessageCategory category, MessageLevel, time_t timestamp, const std::string &message, const std::string &messageSource); public: ConsoleLogger() {} - void logMessageDirect(MessageCategory category _UNUSED_PARAMETER_, MessageLevel level _UNUSED_PARAMETER_, time_t timestamp _UNUSED_PARAMETER_, const std::string &message); + void logMessageDirect(MessageCategory category, MessageLevel level, time_t timestamp, const std::string &message); }; diff --git a/src/Core/ThreadManager.h b/src/Core/ThreadManager.h index 08e35ba..ab5113c 100644 --- a/src/Core/ThreadManager.h +++ b/src/Core/ThreadManager.h @@ -20,8 +20,6 @@ #ifndef MAD_CORE_THREADMANAGER_H_ #define MAD_CORE_THREADMANAGER_H_ -#include <config.h> - #include <queue> #include <map> diff --git a/src/Net/Connection.h b/src/Net/Connection.h index d7de538..3070282 100644 --- a/src/Net/Connection.h +++ b/src/Net/Connection.h @@ -20,8 +20,6 @@ #ifndef MAD_NET_CONNECTION_H_ #define MAD_NET_CONNECTION_H_ -#include <config.h> - #include "Packet.h" #include <Core/Signals.h> #include <Core/ThreadManager.h> diff --git a/src/Server/RequestHandlers/ConnectionRequestHandlerGroup.cpp b/src/Server/RequestHandlers/ConnectionRequestHandlerGroup.cpp index 60d669b..0de73f9 100644 --- a/src/Server/RequestHandlers/ConnectionRequestHandlerGroup.cpp +++ b/src/Server/RequestHandlers/ConnectionRequestHandlerGroup.cpp @@ -27,8 +27,8 @@ namespace Mad { namespace Server { namespace RequestHandlers { -void ConnectionRequestHandlerGroup::handleDaemonListRequest(boost::shared_ptr<const Common::XmlPacket> packet _UNUSED_PARAMETER_, Common::XmlPacket *ret, - Common::Connection *connection _UNUSED_PARAMETER_) { +void ConnectionRequestHandlerGroup::handleDaemonListRequest(boost::shared_ptr<const Common::XmlPacket> /*packet*/, Common::XmlPacket *ret, + Common::Connection* /*connection*/) { // TODO Require authentication ret->setType("OK"); diff --git a/src/Server/RequestHandlers/UserRequestHandlerGroup.cpp b/src/Server/RequestHandlers/UserRequestHandlerGroup.cpp index 0bb3cfa..b830920 100644 --- a/src/Server/RequestHandlers/UserRequestHandlerGroup.cpp +++ b/src/Server/RequestHandlers/UserRequestHandlerGroup.cpp @@ -17,8 +17,6 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include <config.h> - #include "UserRequestHandlerGroup.h" #include "../Application.h" @@ -31,7 +29,7 @@ namespace Server { namespace RequestHandlers { void UserRequestHandlerGroup::handleUserListRequest(boost::shared_ptr<const Common::XmlPacket> packet, Common::XmlPacket *ret, - Common::Connection *connection _UNUSED_PARAMETER_) { + Common::Connection* /*connection*/) { boost::posix_time::ptime timestamp(boost::posix_time::not_a_date_time); const std::string ×tr = packet->get<const std::string&>("timestamp"); @@ -64,7 +62,7 @@ void UserRequestHandlerGroup::handleUserListRequest(boost::shared_ptr<const Comm } void UserRequestHandlerGroup::handleUserInfoRequest(boost::shared_ptr<const Common::XmlPacket> packet, Common::XmlPacket *ret, - Common::Connection *connection _UNUSED_PARAMETER_) { + Common::Connection* /*connection*/) { boost::posix_time::ptime timestamp(boost::posix_time::not_a_date_time); const std::string ×tr = packet->get<const std::string&>("timestamp"); @@ -97,7 +95,7 @@ void UserRequestHandlerGroup::handleUserInfoRequest(boost::shared_ptr<const Comm } void UserRequestHandlerGroup::handleUserGroupListRequest(boost::shared_ptr<const Common::XmlPacket> packet, Common::XmlPacket *ret, - Common::Connection *connection _UNUSED_PARAMETER_) { + Common::Connection* /*connection*/) { boost::posix_time::ptime timestamp(boost::posix_time::not_a_date_time); const std::string ×tr = packet->get<const std::string&>("timestamp"); @@ -127,7 +125,7 @@ void UserRequestHandlerGroup::handleUserGroupListRequest(boost::shared_ptr<const } void UserRequestHandlerGroup::handleGroupListRequest(boost::shared_ptr<const Common::XmlPacket> packet, Common::XmlPacket *ret, - Common::Connection *connection _UNUSED_PARAMETER_) { + Common::Connection* /*connection*/) { boost::posix_time::ptime timestamp(boost::posix_time::not_a_date_time); const std::string ×tr = packet->get<const std::string&>("timestamp"); @@ -158,7 +156,7 @@ void UserRequestHandlerGroup::handleGroupListRequest(boost::shared_ptr<const Com } void UserRequestHandlerGroup::handleGroupInfoRequest(boost::shared_ptr<const Common::XmlPacket> packet, Common::XmlPacket *ret, - Common::Connection *connection _UNUSED_PARAMETER_) { + Common::Connection* /*connection*/) { boost::posix_time::ptime timestamp(boost::posix_time::not_a_date_time); const std::string ×tr = packet->get<const std::string&>("timestamp"); @@ -189,7 +187,7 @@ void UserRequestHandlerGroup::handleGroupInfoRequest(boost::shared_ptr<const Com } void UserRequestHandlerGroup::handleGroupUserListRequest(boost::shared_ptr<const Common::XmlPacket> packet, Common::XmlPacket *ret, - Common::Connection *connection _UNUSED_PARAMETER_) { + Common::Connection* /*connection*/) { boost::posix_time::ptime timestamp(boost::posix_time::not_a_date_time); const std::string ×tr = packet->get<const std::string&>("timestamp"); @@ -217,7 +215,7 @@ void UserRequestHandlerGroup::handleGroupUserListRequest(boost::shared_ptr<const } void UserRequestHandlerGroup::handleFullUserGroupListRequest(boost::shared_ptr<const Common::XmlPacket> packet, Common::XmlPacket *ret, - Common::Connection *connection _UNUSED_PARAMETER_) { + Common::Connection* /*connection*/) { boost::posix_time::ptime timestamp(boost::posix_time::not_a_date_time); const std::string ×tr = packet->get<const std::string&>("timestamp"); @@ -248,7 +246,7 @@ void UserRequestHandlerGroup::handleFullUserGroupListRequest(boost::shared_ptr<c } void UserRequestHandlerGroup::handleUserAddRequest(boost::shared_ptr<const Common::XmlPacket> packet, Common::XmlPacket *ret, - Common::Connection *connection _UNUSED_PARAMETER_) { + Common::Connection* /*connection*/) { Common::UserInfo userInfo(packet->get<unsigned long>("uid"), packet->get<const std::string&>("username")); userInfo.setGid(packet->get<unsigned long>("gid")); userInfo.setFullName(packet->get<const std::string&>("fullName")); @@ -259,7 +257,7 @@ void UserRequestHandlerGroup::handleUserAddRequest(boost::shared_ptr<const Commo } void UserRequestHandlerGroup::handleUserUpdateRequest(boost::shared_ptr<const Common::XmlPacket> packet, Common::XmlPacket *ret, - Common::Connection *connection _UNUSED_PARAMETER_) { + Common::Connection* /*connection*/) { Common::UserInfo userInfo(packet->get<unsigned long>("uid"), packet->get<const std::string&>("username")); userInfo.setGid(packet->get<unsigned long>("gid")); userInfo.setFullName(packet->get<const std::string&>("fullName")); @@ -270,21 +268,21 @@ void UserRequestHandlerGroup::handleUserUpdateRequest(boost::shared_ptr<const Co } void UserRequestHandlerGroup::handleUserDeleteRequest(boost::shared_ptr<const Common::XmlPacket> packet, Common::XmlPacket *ret, - Common::Connection *connection _UNUSED_PARAMETER_) { + Common::Connection* /*connection*/) { application->getUserManager()->deleteUser(packet->get<unsigned long>("uid")); ret->setType("OK"); } void UserRequestHandlerGroup::handleAddUserToGroupRequest(boost::shared_ptr<const Common::XmlPacket> packet, Common::XmlPacket *ret, - Common::Connection *connection _UNUSED_PARAMETER_) { + Common::Connection* /*connection*/) { application->getUserManager()->addUserToGroup(packet->get<unsigned long>("uid"), packet->get<unsigned long>("gid")); ret->setType("OK"); } void UserRequestHandlerGroup::handleDeleteUserFromGroupRequest(boost::shared_ptr<const Common::XmlPacket> packet, Common::XmlPacket *ret, - Common::Connection *connection _UNUSED_PARAMETER_) { + Common::Connection* /*connection*/) { application->getUserManager()->deleteUserFromGroup(packet->get<unsigned long>("uid"), packet->get<unsigned long>("gid")); ret->setType("OK"); diff --git a/src/modules/UserBackendMysql/UserBackendMysql.cpp b/src/modules/UserBackendMysql/UserBackendMysql.cpp index e7c656b..ebf86d5 100644 --- a/src/modules/UserBackendMysql/UserBackendMysql.cpp +++ b/src/modules/UserBackendMysql/UserBackendMysql.cpp @@ -17,8 +17,6 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include <config.h> - #include "UserBackendMysql.h" #include <Core/ConfigEntry.h> #include <Core/ConfigManager.h> |