Fixed warnings on MacOS(with clang)

Mostly that was removing register storage class specifier and marking
methods with override.

Author: lawrinn

driver/class/ClientSidePreparedStatement.h

@@ -1,5 +1,5 @@
 /************************************************************************************
-   Copyright (C) 2022 MariaDB Corporation AB
+   Copyright (C) 2022, 2025 MariaDB Corporation plc
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
@@ -53,9 +53,9 @@ class ClientSidePreparedStatement : public PreparedStatement
   ClientSidePreparedStatement* clone(Protocol* connection);
 
 protected:
-  bool executeInternal(int32_t fetchSize);
-  void executeBatchInternal(uint32_t queryParameterSize);
-  PrepareResult* getPrepareResult();
+  bool           executeInternal(int32_t fetchSize) override;
+  void           executeBatchInternal(uint32_t queryParameterSize) override;
+  PrepareResult* getPrepareResult() override;
 
 public:
   Longs& executeBatch();
@@ -75,15 +75,15 @@ class ClientSidePreparedStatement : public PreparedStatement
   uint32_t    getErrno();
   const char* getSqlState();
 
-  bool bind(MYSQL_BIND* param);
-  bool sendLongData(uint32_t paramNum, const char* data, std::size_t length);
-  inline bool isServerSide() const { return false; }
-  inline enum enum_field_types getPreferredParamType(enum enum_field_types appType) const
+  bool bind(MYSQL_BIND* param) override;
+  bool sendLongData(uint32_t paramNum, const char* data, std::size_t length) override;
+  inline bool isServerSide() const override { return false; }
+  inline enum enum_field_types getPreferredParamType(enum enum_field_types appType) const override
   { 
     return MYSQL_TYPE_STRING;
   }
-  bool setParamCallback(ParamCodec* callback, uint32_t param) { return true; }
-  bool setCallbackData(void* data) { return true;  }
+  bool setParamCallback(ParamCodec* callback, uint32_t param) override { return true; }
+  bool setCallbackData(void* data) override { return true;  }
   bool isOutParams() { return false; }
   //SQLString toString();
 };

driver/class/CmdInformationBatch.h

@@ -1,5 +1,5 @@
 /************************************************************************************
-   Copyright (C) 2022 MariaDB Corporation AB
+   Copyright (C) 2022, 2025 MariaDB Corporation plc
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
@@ -40,18 +40,18 @@ class CmdInformationBatch : public CmdInformation
   CmdInformationBatch(std::size_t expectedSize);
   ~CmdInformationBatch();
 
-  void addErrorStat();
-  void reset();
-  void addResultSetStat();
-  void addSuccessStat(int64_t updateCount);
-  std::vector<int64_t>& getUpdateCounts();
-  std::vector<int64_t>& getServerUpdateCounts();
-  int64_t getUpdateCount();
-  int32_t getCurrentStatNumber();
-  bool moreResults();
+  void addErrorStat() override;
+  void reset() override;
+  void addResultSetStat() override;
+  void addSuccessStat(int64_t updateCount) override;
+  std::vector<int64_t>& getUpdateCounts() override;
+  std::vector<int64_t>& getServerUpdateCounts() override;
+  int64_t getUpdateCount() override;
+  int32_t getCurrentStatNumber() override;
+  bool moreResults() override;
   inline uint32_t hasMoreResults() override { return 0U; }
-  bool isCurrentUpdateCount();
-  void setRewrite(bool rewritten);
+  bool isCurrentUpdateCount() override;
+  void setRewrite(bool rewritten) override;
 };
 
 }

driver/class/CmdInformationSingle.cpp

@@ -1,5 +1,5 @@
 /************************************************************************************
-   Copyright (C) 2022 MariaDB Corporation AB
+   Copyright (C) 2022, 2024 MariaDB Corporation plc
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public

driver/class/CmdInformationSingle.h

@@ -1,5 +1,5 @@
 /************************************************************************************
-   Copyright (C) 2022 MariaDB Corporation AB
+   Copyright (C) 2022, 2025 MariaDB Corporation plc
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
@@ -34,18 +34,18 @@ class CmdInformationSingle  : public CmdInformation
   CmdInformationSingle(int64_t updateCount);
   ~CmdInformationSingle();
 
-  std::vector<int64_t>& getUpdateCounts();
-  std::vector<int64_t>& getServerUpdateCounts();
-  int64_t getUpdateCount();
-  void addErrorStat();
-  void reset();
-  void addResultSetStat();
-  int32_t getCurrentStatNumber();
-  bool moreResults();
-  inline uint32_t hasMoreResults() override { return 0; }
-  bool isCurrentUpdateCount();
-  void addSuccessStat(int64_t updateCount);
-  void setRewrite(bool rewritten);
+  std::vector<int64_t>& getUpdateCounts() override;
+  std::vector<int64_t>& getServerUpdateCounts() override;
+  int64_t getUpdateCount() override;
+  void addErrorStat() override;
+  void reset() override;
+  void addResultSetStat() override;
+  int32_t getCurrentStatNumber() override;
+  bool moreResults() override;
+  inline uint32_t hasMoreResults() override { return 0U; }
+  bool isCurrentUpdateCount() override;
+  void addSuccessStat(int64_t updateCount) override;
+  void setRewrite(bool rewritten) override;
 };
 
 }

driver/class/ColumnDefinition.cpp

@@ -1,5 +1,5 @@
 /************************************************************************************
-   Copyright (C) 2022 MariaDB Corporation AB
+   Copyright (C) 2022, 2025 MariaDB Corporation plc
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
@@ -37,6 +37,9 @@ namespace mariadb
     switch (type) {
     case MARIADB_INTEGER_TYPES:
       return true;
+    // to avoid warnings
+    default:
+      return false;
     }
     return false;
   }

driver/class/Protocol.cpp

@@ -1,5 +1,5 @@
 /************************************************************************************
-   Copyright (C) 2023 MariaDB Corporation AB
+   Copyright (C) 2023, 2025 MariaDB Corporation plc
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
@@ -1066,12 +1066,15 @@ namespace mariadb
     if (!needLock || lock.try_lock()) {
       //cmdPrologue();
       // If connection is closed - we still need to call mysql_stmt_close to deallocate C/C stmt handle
-      if (mysql_stmt_close(statementId))
-      {
-        needLock && (lock.unlock(), true);
+      if (mysql_stmt_close(statementId)) {
+        if (needLock) {
+          lock.unlock();
+        }
         throw SQLException("Could not deallocate query");
       }
-      needLock && (lock.unlock(), true);
+      if (needLock) {
+        lock.unlock();
+      }
       return true;
 
     }

driver/class/ResultSetBin.h

@@ -1,5 +1,5 @@
 /************************************************************************************
-   Copyright (C) 2020 MariaDB Corporation AB
+   Copyright (C) 2020, 2025 MariaDB Corporation plc
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
@@ -69,8 +69,8 @@ class ResultSetBin : public ResultSet
 
   ~ResultSetBin();
 
-  bool isFullyLoaded() const;
-  void fetchRemaining();
+  bool isFullyLoaded() const override;
+  void fetchRemaining() override;
 
 private:
   void flushPendingServerResults();
@@ -82,45 +82,46 @@ class ResultSetBin : public ResultSet
   uint32_t warningCount();
 
 private:
-  bool readNextValue(bool cacheLocally= false);
+  bool readNextValue(bool cacheLocally= false) override;
 
 protected:
-  std::vector<mariadb::bytes_view>& getCurrentRowData();
-  void updateRowData(std::vector<mariadb::bytes_view>& rawData);
-  void deleteCurrentRowData();
-  void addRowData(std::vector<mariadb::bytes_view>& rawData);
+  std::vector<mariadb::bytes_view>& getCurrentRowData() override;
+
+  void updateRowData(std::vector<mariadb::bytes_view>& rawData) override;
+  void deleteCurrentRowData() override;
+  void addRowData(std::vector<mariadb::bytes_view>& rawData) override;
 
 private:
   void growDataArray(bool complete= false);
 
 public:
-  void abort();
-  void close();
+  void abort() override;
+  //void close();
   //bool fetchNext();
   //SQLWarning* getWarnings();
   //void clearWarnings();
   bool isBeforeFirst() const;
-  bool isAfterLast();
+  bool isAfterLast() override;
   bool isFirst() const;
-  bool isLast();
-  void beforeFirst();
-  void afterLast();
-  bool first();
-  bool last();
-  int64_t getRow();
-  bool absolute(int64_t row);
-  bool relative(int64_t rows);
-  bool previous();
+  bool isLast() override;
+  void beforeFirst() override;
+  void afterLast() override;
+  bool first() override;
+  bool last() override;
+  int64_t getRow() override;
+  bool absolute(int64_t row) override;
+  bool relative(int64_t rows) override;
+  bool previous() override;
   int32_t getFetchSize() const;
-  void setFetchSize(int32_t fetchSize);
+  void    setFetchSize(int32_t fetchSize);
   int32_t getType() const;
 //  int32_t getConcurrency() const;
 
 private:
   void checkClose() const;
 
 public:
-  bool isCallableResult() const;
+  bool isCallableResult() const override;
   bool isClosed() const;
   bool wasNull() const;
 
@@ -130,40 +131,41 @@ class ResultSetBin : public ResultSet
   SQLString zeroFillingIfNeeded(const SQLString& value, ColumnDefinition* columnInformation);
 
 public:
-  std::istream* getBinaryStream(int32_t columnIndex) const;
-  int32_t getInt(int32_t columnIndex) const;
-  int64_t getLong(int32_t columnIndex) const;
-  uint64_t getUInt64(int32_t columnIndex) const;
-  uint32_t getUInt(int32_t columnIndex) const;
-  float getFloat(int32_t columnIndex) const;
-  long double getDouble(int32_t columnIndex) const;
-  bool getBoolean(int32_t index) const;
-  int8_t getByte(int32_t index) const;
-  int16_t getShort(int32_t index) const;
-
-  ResultSetMetaData* getMetaData() const;
+  std::istream* getBinaryStream(int32_t columnIndex) const override;
+  int32_t       getInt(int32_t columnIndex) const override;
+  int64_t       getLong(int32_t columnIndex) const override;
+  uint64_t      getUInt64(int32_t columnIndex) const override;
+  uint32_t      getUInt(int32_t columnIndex) const override;
+  float         getFloat(int32_t columnIndex) const override;
+  long double   getDouble(int32_t columnIndex) const override;
+  bool          getBoolean(int32_t index) const override;
+  int8_t        getByte(int32_t index) const override;
+  int16_t       getShort(int32_t index) const override;
+
+  ResultSetMetaData* getMetaData() const override;
   /*Blob* getBlob(int32_t columnIndex) const;*/
 
-  std::size_t rowsCount() const;
+  std::size_t rowsCount() const override;
 
-  void setForceTableAlias();
+  void setForceTableAlias() override;
 
 private:
-  void rangeCheck(const SQLString& className,int64_t minValue,int64_t maxValue,int64_t value, ColumnDefinition* columnInfo);
+  void rangeCheck(const SQLString& className,int64_t minValue,int64_t maxValue,int64_t value,
+    ColumnDefinition* columnInfo);
 
 protected:
-  void setRowPointer(int32_t pointer);
+  void setRowPointer(int32_t pointer) override;
 
 public:
-  int32_t getRowPointer();
-  std::size_t getDataSize();
-  bool isBinaryEncoded();
+  int32_t     getRowPointer() override;
+  std::size_t getDataSize() override;
+  bool isBinaryEncoded() override;
   void realClose(bool noLock= true);
-  void bind(MYSQL_BIND* bind);
-  bool get(MYSQL_BIND* bind, uint32_t colIdx0based, uint64_t offset);
-  bool get();
-  bool setResultCallback(ResultCodec* callback, uint32_t column);
-  bool setCallbackData(void* data);
+  void bind(MYSQL_BIND* bind) override;
+  bool get(MYSQL_BIND* bind, uint32_t colIdx0based, uint64_t offset) override;
+  bool get() override;
+  bool setResultCallback(ResultCodec* callback, uint32_t column) override;
+  bool setCallbackData(void* data) override;
 };
 
 }