From da9222929bdc6fd39cdb95da196b266e1d390ac2 Mon Sep 17 00:00:00 2001
From: ebbit1q <ebbit1q@gmail.com>
Date: Wed, 2 Jun 2021 03:57:37 +0200
Subject: [PATCH] add werror flags when making a debug build using llvm (#4344)

* add werror flags when making a debug build using llvm

this would get bugs like
https://github.com/Cockatrice/Cockatrice/pull/4337
get signalled earlier to us

* fix error: 'Servatrice_DatabaseInterface::registerUser' hides overloaded virtual function

* remove unused field

* mac machines have 3 cores

see
https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners#supported-runners-and-hardware-resources

* typo
---
 .github/workflows/ci-builds.yml                  | 2 ++
 CMakeLists.txt                                   | 6 +++++-
 cockatrice/src/userconnection_information.h      | 1 -
 servatrice/src/servatrice_database_interface.cpp | 3 +--
 servatrice/src/servatrice_database_interface.h   | 1 -
 servatrice/src/serversocketinterface.cpp         | 3 +--
 6 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci-builds.yml b/.github/workflows/ci-builds.yml
index 21daccf90..a29df84ac 100644
--- a/.github/workflows/ci-builds.yml
+++ b/.github/workflows/ci-builds.yml
@@ -271,6 +271,8 @@ jobs:
 
       - name: Build on Xcode ${{matrix.xcode}}
         shell: bash
+        env:
+          CMAKE_BUILD_PARALLEL_LEVEL: 3  # mac machines actually have 3 cores
         run: .ci/compile.sh ${{matrix.type}} --server
 
       - name: Test
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e4838bb62..38759aade 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -134,7 +134,11 @@ ELSEIF (CMAKE_COMPILER_IS_GNUCXX)
 ELSE()
     # other: osx/llvm, bsd/llvm
     set(CMAKE_CXX_FLAGS_RELEASE "-O2")
-    set(CMAKE_CXX_FLAGS_DEBUG "-g -O0")
+    if(WARNING_AS_ERROR)
+      set(CMAKE_CXX_FLAGS_DEBUG "-g -O0 -Wall -Wextra -Werror")
+    else()
+      set(CMAKE_CXX_FLAGS_DEBUG "-g -O0 -Wall -Wextra")
+    endif()
 ENDIF()
 
 # GNU systems need to define the Mersenne exponent for the RNG to compile w/o warning
diff --git a/cockatrice/src/userconnection_information.h b/cockatrice/src/userconnection_information.h
index 843f991a5..137060afe 100644
--- a/cockatrice/src/userconnection_information.h
+++ b/cockatrice/src/userconnection_information.h
@@ -17,7 +17,6 @@ private:
     QString password;
     bool savePassword;
     QString site;
-    bool isCustom;
 
 public:
     UserConnection_Information();
diff --git a/servatrice/src/servatrice_database_interface.cpp b/servatrice/src/servatrice_database_interface.cpp
index fcb43bf95..aceb4c467 100644
--- a/servatrice/src/servatrice_database_interface.cpp
+++ b/servatrice/src/servatrice_database_interface.cpp
@@ -201,14 +201,13 @@ bool Servatrice_DatabaseInterface::registerUser(const QString &userName,
                                                 const QString &password,
                                                 const QString &emailAddress,
                                                 const QString &country,
-                                                QString &token,
                                                 bool active)
 {
     if (!checkSql())
         return false;
 
     QString passwordSha512 = PasswordHasher::computeHash(password, PasswordHasher::generateRandomSalt());
-    token = active ? QString() : PasswordHasher::generateActivationToken();
+    QString token = active ? QString() : PasswordHasher::generateActivationToken();
 
     QSqlQuery *query =
         prepareQuery("insert into {prefix}_users "
diff --git a/servatrice/src/servatrice_database_interface.h b/servatrice/src/servatrice_database_interface.h
index 0107e02b3..2c225b82f 100644
--- a/servatrice/src/servatrice_database_interface.h
+++ b/servatrice/src/servatrice_database_interface.h
@@ -99,7 +99,6 @@ public:
                       const QString &password,
                       const QString &emailAddress,
                       const QString &country,
-                      QString &token,
                       bool active = false);
     bool activateUser(const QString &userName, const QString &token);
     void updateUsersClientID(const QString &userName, const QString &userClientID);
diff --git a/servatrice/src/serversocketinterface.cpp b/servatrice/src/serversocketinterface.cpp
index c652ae804..f2d0e1a3b 100644
--- a/servatrice/src/serversocketinterface.cpp
+++ b/servatrice/src/serversocketinterface.cpp
@@ -1099,9 +1099,8 @@ Response::ResponseCode AbstractServerSocketInterface::cmdRegisterAccount(const C
         return Response::RespPasswordTooShort;
     }
 
-    QString token;
     bool requireEmailActivation = settingsCache->value("registration/requireemailactivation", true).toBool();
-    bool regSucceeded = sqlInterface->registerUser(userName, realName, gender, password, emailAddress, country, token,
+    bool regSucceeded = sqlInterface->registerUser(userName, realName, gender, password, emailAddress, country,
                                                    !requireEmailActivation);
 
     if (regSucceeded) {