summaryrefslogtreecommitdiff
path: root/src/account-server
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2010-05-13 19:57:49 +0200
committerThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2010-05-16 23:25:35 +0200
commit32a27a534582b63324444b4650f08637834232fd (patch)
tree9e7f349f948864e551711a8c479a24cb0496f387 /src/account-server
parent1e164776a737b57c54a71f6eab8f93263146b089 (diff)
downloadmanaserv-32a27a534582b63324444b4650f08637834232fd.tar.gz
manaserv-32a27a534582b63324444b4650f08637834232fd.tar.bz2
manaserv-32a27a534582b63324444b4650f08637834232fd.tar.xz
manaserv-32a27a534582b63324444b4650f08637834232fd.zip
Random cleanups, adding const, removing unnecessary clear calls
Reviewed-by: Jared Adams
Diffstat (limited to 'src/account-server')
-rw-r--r--src/account-server/accounthandler.hpp2
-rw-r--r--src/account-server/serverhandler.cpp9
-rw-r--r--src/account-server/storage.cpp6
3 files changed, 8 insertions, 9 deletions
diff --git a/src/account-server/accounthandler.hpp b/src/account-server/accounthandler.hpp
index 4bb3eae9..5fa2a06f 100644
--- a/src/account-server/accounthandler.hpp
+++ b/src/account-server/accounthandler.hpp
@@ -46,4 +46,4 @@ namespace AccountClientHandler
void process();
}
-#endif
+#endif // ACCOUNTHANDLER_H
diff --git a/src/account-server/serverhandler.cpp b/src/account-server/serverhandler.cpp
index b4037633..a6cf21f0 100644
--- a/src/account-server/serverhandler.cpp
+++ b/src/account-server/serverhandler.cpp
@@ -133,8 +133,9 @@ static GameServer *getGameServerFromMap(int mapId)
return NULL;
}
-bool GameServerHandler::getGameServerFromMap
- (int mapId, std::string &address, int &port)
+bool GameServerHandler::getGameServerFromMap(int mapId,
+ std::string &address,
+ int &port)
{
if (GameServer *s = ::getGameServerFromMap(mapId))
{
@@ -513,7 +514,9 @@ void GameServerHandler::dumpStatistics(std::ostream &os)
i_end = serverHandler->clients.end(); i != i_end; ++i)
{
GameServer *server = static_cast< GameServer * >(*i);
- if (!server->port) continue;
+ if (!server->port)
+ continue;
+
os << "<gameserver address=\"" << server->address << "\" port=\""
<< server->port << "\">\n";
diff --git a/src/account-server/storage.cpp b/src/account-server/storage.cpp
index 39735067..1c2a175b 100644
--- a/src/account-server/storage.cpp
+++ b/src/account-server/storage.cpp
@@ -1902,7 +1902,7 @@ void Storage::deletePost(Letter *letter)
mDb->commitTransaction();
letter->setId(0);
}
- catch(const dal::DbSqlQueryExecFailure &e)
+ catch (const dal::DbSqlQueryExecFailure &e)
{
mDb->rollbackTransaction();
LOG_ERROR("(DALStorage::deletePost) SQL query failure: " << e.what());
@@ -1943,17 +1943,13 @@ void Storage::syncDatabase()
}
if (!xmlStrEqual(node->name, BAD_CAST "item"))
- {
continue;
- }
if (xmlStrEqual(node->name, BAD_CAST "item"))
{
int id = XML::getProperty(node, "id", 0);
if (id < 500)
- {
continue;
- }
int weight = XML::getProperty(node, "weight", 0);
std::string type = XML::getProperty(node, "type", "");