From 4d69cc1c567180b408ddbadb9edf26859cf4c006 Mon Sep 17 00:00:00 2001 From: Shauren Date: Thu, 21 May 2020 22:15:58 +0200 Subject: Core/Misc: GCC build and warning fixes --- src/server/database/Database/MySQLConnection.cpp | 5 +---- src/server/database/Updater/UpdateFetcher.cpp | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'src/server/database') diff --git a/src/server/database/Database/MySQLConnection.cpp b/src/server/database/Database/MySQLConnection.cpp index 466e00e35e4..bde2004afdf 100644 --- a/src/server/database/Database/MySQLConnection.cpp +++ b/src/server/database/Database/MySQLConnection.cpp @@ -513,7 +513,6 @@ bool MySQLConnection::_HandleMySQLErrno(uint32 errNo, uint8 attempts /*= 5*/) case CR_SERVER_GONE_ERROR: case CR_SERVER_LOST: case CR_SERVER_LOST_EXTENDED: - { if (m_Mysql) { TC_LOG_ERROR("sql.sql", "Lost the connection to the MySQL server!"); @@ -521,9 +520,7 @@ bool MySQLConnection::_HandleMySQLErrno(uint32 errNo, uint8 attempts /*= 5*/) mysql_close(m_Mysql); m_Mysql = nullptr; } - - /*no break*/ - } + /* fallthrough */ case CR_CONN_HOST_ERROR: { TC_LOG_INFO("sql.sql", "Attempting to reconnect to the MySQL server..."); diff --git a/src/server/database/Updater/UpdateFetcher.cpp b/src/server/database/Updater/UpdateFetcher.cpp index 123bb6dc711..3241d7feea6 100644 --- a/src/server/database/Updater/UpdateFetcher.cpp +++ b/src/server/database/Updater/UpdateFetcher.cpp @@ -307,7 +307,7 @@ UpdateResult UpdateFetcher::Update(bool const redundancyChecks, { case MODE_APPLY: speed = Apply(availableQuery.first); - /*no break*/ + /* fallthrough */ case MODE_REHASH: UpdateEntry(file, speed); break; -- cgit v1.2.3