Bug#35877574 Enable -Wformat for clang on windows

The -Werror compiler option is currently disabled for debug builds
with clang on Windows.  Enable it, and fix all warnings.

Change-Id: I79541fcf29037a8bf528fe582ad9e0cce00e240a

Author: Tor Didriksen

CMakeLists.txt

@@ -2088,11 +2088,6 @@ INCLUDE(maintainer)
 INCLUDE(msvc_cppcheck)
 DO_MSVC_CPPCHECK()
 
-IF(WIN32_CLANG AND CMAKE_BUILD_TYPE_UPPER STREQUAL "DEBUG")
-  # Not yet fixed for Debug code
-  STRING_APPEND(CMAKE_CXX_FLAGS " -Wno-format")
-ENDIF()
-
 IF(WITH_UNIT_TESTS)
   ENABLE_TESTING()
   INCLUDE(googletest)

client/mysqltest.cc

@@ -8203,9 +8203,9 @@ void fix_win_paths(const char *val, size_t len [[maybe_unused]]) {
       DBUG_PRINT("info", ("Converted \\ to / in %s", val));
     }
   }
-  DBUG_PRINT("exit", (" val: %s, len: %d", val, len));
+  DBUG_PRINT("exit", (" val: %s, len: %zu", val, len));
 }
-#endif
+#endif  // _WIN32
 
 /*
   Append the result for one field to the dynamic string ds

include/mysql/components/services/bits/my_io_bits.h

@@ -53,10 +53,12 @@ typedef int MY_MODE;
 typedef int mode_t;
 typedef int socket_len_t;
 typedef SOCKET my_socket;
+#define MY_SOCKET_FMT "%llu"
 #else
 typedef mode_t MY_MODE;
 typedef socklen_t socket_len_t;
 typedef int my_socket; /* File descriptor for sockets */
+#define MY_SOCKET_FMT "%d"
 #endif /* _WIN32 */
 
 #endif /* COMPONENTS_SERVICES_BITS_MY_IO_BITS_H */

libmysql/authentication_win/common.cc

@@ -141,7 +141,7 @@ Sid::Sid(const wchar_t *account_name)
 #ifndef NDEBUG
     Error_message_buf error_buf;
     DBUG_PRINT("error", ("Could not determine SID buffer size, "
-                         "LookupAccountName() failed with error %X (%s)",
+                         "LookupAccountName() failed with error %lX (%s)",
                          GetLastError(), get_last_error_message(error_buf)));
 #endif
     return;
@@ -160,7 +160,7 @@ Sid::Sid(const wchar_t *account_name)
 #ifndef NDEBUG
     Error_message_buf error_buf;
     DBUG_PRINT("error", ("Could not determine SID of '%S', "
-                         "LookupAccountName() failed with error %X (%s)",
+                         "LookupAccountName() failed with error %lX (%s)",
                          account_name, GetLastError(),
                          get_last_error_message(error_buf)));
 #endif
@@ -203,7 +203,7 @@ Sid::Sid(HANDLE token)
 #ifndef NDEBUG
     Error_message_buf error_buf;
     DBUG_PRINT("error", ("Could not determine SID buffer size, "
-                         "GetTokenInformation() failed with error %X (%s)",
+                         "GetTokenInformation() failed with error %lX (%s)",
                          GetLastError(), get_last_error_message(error_buf)));
 #endif
     return;
@@ -219,7 +219,7 @@ Sid::Sid(HANDLE token)
     if (!success) {
       Error_message_buf error_buf;
       DBUG_PRINT("error", ("Could not read SID from security token, "
-                           "GetTokenInformation() failed with error %X (%s)",
+                           "GetTokenInformation() failed with error %lX (%s)",
                            GetLastError(), get_last_error_message(error_buf)));
     }
 #endif
@@ -259,7 +259,7 @@ const char *Sid::as_string() {
 #ifndef NDEBUG
       Error_message_buf error_buf;
       DBUG_PRINT("error", ("Could not get textual representation of a SID, "
-                           "ConvertSidToStringSid() failed with error %X (%s)",
+                           "ConvertSidToStringSid() failed with error %lX (%s)",
                            GetLastError(), get_last_error_message(error_buf)));
 #endif
       m_as_string = nullptr;
@@ -297,7 +297,7 @@ UPN::UPN() : m_buf(nullptr) {
 #ifndef NDEBUG
       Error_message_buf error_buf;
       DBUG_PRINT("note", ("When determining UPN"
-                          ", GetUserNameEx() failed with error %X (%s)",
+                          ", GetUserNameEx() failed with error %lX (%s)",
                           GetLastError(), get_last_error_message(error_buf)));
 #endif
       if (ERROR_MORE_DATA == GetLastError())
@@ -382,7 +382,7 @@ char *wchar_to_utf8(const wchar_t *string, size_t *len) {
   Error_message_buf error_buf;
   DBUG_PRINT("error",
              ("Could not convert string '%S' to utf8"
-              ", WideCharToMultiByte() failed with error %X (%s)",
+              ", WideCharToMultiByte() failed with error %lX (%s)",
               string, GetLastError(), get_last_error_message(error_buf)));
 #endif
 
@@ -443,7 +443,7 @@ wchar_t *utf8_to_wchar(const char *string, size_t *len) {
 #ifndef NDEBUG
   Error_message_buf error_buf;
   DBUG_PRINT("error", ("Could not convert UPN from UTF-8"
-                       ", MultiByteToWideChar() failed with error %X (%s)",
+                       ", MultiByteToWideChar() failed with error %lX (%s)",
                        GetLastError(), get_last_error_message(error_buf)));
 #endif
 

libmysql/authentication_win/handshake.cc

@@ -60,7 +60,7 @@ Handshake::Handshake(const char *ssp, side_t side)
 
   if (ret != SEC_E_OK) {
     DBUG_PRINT("error", ("AcqireCredentialsHandle() failed"
-                         " with error %X",
+                         " with error %lX",
                          ret));
     ERROR_LOG(ERROR, ("Could not obtain local credentials"
                       " required for authentication"));
@@ -106,7 +106,7 @@ int Handshake::packet_processing_loop() {
       ERROR_LOG(ERROR, ("Error reading packet in round %d", m_round));
       return 1;
     }
-    DBUG_PRINT("info", ("Got packet of length %d", packet.len()));
+    DBUG_PRINT("info", ("Got packet of length %zu", packet.len()));
 
     /*
       Process received data, possibly generating new data to be sent.
@@ -127,7 +127,7 @@ int Handshake::packet_processing_loop() {
     if (!new_data.is_null()) {
       DBUG_PRINT("info", ("Round %d started", m_round));
 
-      DBUG_PRINT("info", ("Sending packet of length %d", new_data.len()));
+      DBUG_PRINT("info", ("Sending packet of length %zu", new_data.len()));
       const int ret = write_packet(new_data);
       if (ret) {
         ERROR_LOG(ERROR, ("Error writing packet in round %d", m_round));

libmysql/authentication_win/handshake_client.cc

@@ -144,8 +144,8 @@ int Handshake_client::write_packet(Blob &data) {
 
   if (m_round == 1 && data.len() > 254) {
     len2 = data.len() - 254;
-    DBUG_PRINT("info", ("Splitting first packet of length %lu"
-                        ", %lu bytes will be sent in a second part",
+    DBUG_PRINT("info", ("Splitting first packet of length %zu"
+                        ", %zu bytes will be sent in a second part",
                         data.len(), len2));
     /*
       Store in byte 255 the number of 512b blocks that are needed to
@@ -277,7 +277,7 @@ Blob Handshake_client::process_data(const Blob &data) {
 
   if (process_result(ret)) {
     DBUG_PRINT("error",
-               ("InitializeSecurityContext() failed with error %X", ret));
+               ("InitializeSecurityContext() failed with error %lX", ret));
     return Blob();
   }
 
@@ -447,7 +447,7 @@ int win_auth_handshake_client(MYSQL_PLUGIN_VIO *vio, MYSQL *mysql) {
     ERROR_LOG(ERROR, ("Error reading initial packet"));
     return CR_ERROR;
   }
-  DBUG_PRINT("info", ("Got initial packet of length %d", service_name.len()));
+  DBUG_PRINT("info", ("Got initial packet of length %zu", service_name.len()));
 
   // Create authentication handshake context using the given service name.
 

mysys/my_lib.cc

@@ -197,7 +197,7 @@ MY_DIR *my_dir(const char *path, myf MyFlags) {
   void *rawmem = nullptr;
 
   DBUG_TRACE;
-  DBUG_PRINT("my", ("path: '%s' stat: %d  MyFlags: %d", path, MyFlags));
+  DBUG_PRINT("my", ("path: '%s' MyFlags: %d", path, MyFlags));
 
   /* Put LIB-CHAR as last path-character if not there */
   tmp_file = tmp_path;

plugin/x/src/client.cc

@@ -448,8 +448,8 @@ void Client::on_client_addr() {
 
 void Client::on_accept() {
   DBUG_TRACE;
-  log_debug("%s: Accepted client connection from %s (sock:%i)", client_id(),
-            client_address(), m_connection->get_fd());
+  log_debug("%s: Accepted client connection from %s (sock:" MY_SOCKET_FMT ")",
+            client_id(), client_address(), m_connection->get_fd());
 
   DBUG_EXECUTE_IF("client_accept_timeout", {
     int32_t i = 0;

sql-common/client.cc

@@ -6681,9 +6681,9 @@ static mysql_state_machine_status csm_begin_connect(mysql_async_connect *ctx) {
 
       DBUG_PRINT("info", ("No success, try next address."));
     }
-    DBUG_PRINT("info",
-               ("End of connect attempts, sock: %d  status: %d  error: %d",
-                sock, status, saved_error));
+    DBUG_PRINT("info", ("End of connect attempts, sock: " MY_SOCKET_FMT
+                        "  status: %d  error: %d",
+                        sock, status, saved_error));
 
     freeaddrinfo(res_lst);
     if (client_bind_ai_lst) freeaddrinfo(client_bind_ai_lst);

sql/rpl_replica.cc

@@ -4364,21 +4364,26 @@ static int sql_delay_event(Log_event *ev, THD *thd, Relay_log_info *rli) {
       if (sql_delay_end > now) {
         nap_time = sql_delay_end - now;
 
-        DBUG_PRINT("info",
-                   ("sql_delay= %lu "
-                    "now= %ld "
-                    "sql_delay_end= %ld "
-                    "nap_time= %ld",
-                    sql_delay, (long)now, (long)sql_delay_end, (long)nap_time));
-        DBUG_PRINT("info", ("delaying replication event %lu secs", nap_time));
+        DBUG_PRINT(
+            "info",
+            ("sql_delay= %lu "
+             "now= %ld "
+             "sql_delay_end= %ld "
+             "nap_time= %ld",
+             static_cast<unsigned long>(sql_delay), static_cast<long>(now),
+             static_cast<long>(sql_delay_end), static_cast<long>(nap_time)));
+        DBUG_PRINT("info", ("delaying replication event %lu secs",
+                            static_cast<unsigned long>(nap_time)));
         rli->start_sql_delay(sql_delay_end);
         mysql_mutex_unlock(&rli->data_lock);
         return slave_sleep(thd, nap_time, sql_slave_killed, rli);
       } else {
-        DBUG_PRINT("info", ("sql_delay= %lu "
-                            "now= %ld "
-                            "sql_delay_end= %ld ",
-                            sql_delay, (long)now, (long)sql_delay_end));
+        DBUG_PRINT("info",
+                   ("sql_delay= %lu "
+                    "now= %ld "
+                    "sql_delay_end= %ld ",
+                    static_cast<unsigned long>(sql_delay),
+                    static_cast<long>(now), static_cast<long>(sql_delay_end)));
       }
     }
   }

sql/sql_thd_internal_api.cc

@@ -125,7 +125,7 @@ void thd_init(THD *thd, char *stack_start) {
 
   if (!thd->system_thread) {
     DBUG_PRINT("info",
-               ("init new connection. thd: %p fd: %d", thd,
+               ("init new connection. thd: %p fd: " MY_SOCKET_FMT, thd,
                 mysql_socket_getfd(
                     thd->get_protocol_classic()->get_vio()->mysql_socket)));
   }

storage/innobase/buf/buf0rea.cc

@@ -571,8 +571,9 @@ ulint buf_read_ahead_linear(const page_id_t &page_id,
   os_aio_simulated_wake_handler_threads();
 
   if (count) {
-    DBUG_PRINT("ib_buf", ("linear read-ahead %lu pages, " UINT32PF ":" UINT32PF,
-                          count, page_id.space(), page_id.page_no()));
+    DBUG_PRINT("ib_buf",
+               ("linear read-ahead " ULINTPF " pages, " UINT32PF ":" UINT32PF,
+                count, page_id.space(), page_id.page_no()));
   }
 
   /* Read ahead is considered one I/O operation for the purpose of

storage/innobase/dict/dict0dict.cc

@@ -3606,7 +3606,7 @@ ulint dict_table_get_highest_foreign_id(
 
   biggest_id = (size > biggest_id) ? size : biggest_id;
 
-  DBUG_PRINT("dict_table_get_highest_foreign_id", ("id: %lu", biggest_id));
+  DBUG_PRINT("dict_table_get_highest_foreign_id", ("id: " ULINTPF, biggest_id));
 
   return biggest_id;
 }

storage/innobase/que/que0que.cc

@@ -375,7 +375,7 @@ void que_graph_free_recursive(que_node_t *node) /*!< in: query graph node */
   }
 
   DBUG_PRINT("que_graph_free_recursive",
-             ("node: %p, type: %lu", node, que_node_get_type(node)));
+             ("node: %p, type: " ULINTPF, node, que_node_get_type(node)));
 
   switch (que_node_get_type(node)) {
     case QUE_NODE_FORK:

storage/innobase/row/row0upd.cc

@@ -3159,8 +3159,9 @@ static dberr_t row_upd(upd_node_t *node, /*!< in: row update node */
   ut_ad(!node->table->skip_alter_undo);
 
   DBUG_PRINT("row_upd", ("table: %s", node->table->name.m_name));
-  DBUG_PRINT("row_upd", ("info bits in update vector: 0x%lx",
-                         node->update ? node->update->info_bits : 0));
+  DBUG_PRINT("row_upd",
+             ("info bits in update vector: " IF_WIN("0x%llx", "0x%lx"),
+              node->update ? node->update->info_bits : 0));
   DBUG_PRINT("row_upd",
              ("foreign_id: %s", node->foreign ? node->foreign->id : "NULL"));
 

vio/vio.cc

@@ -210,7 +210,8 @@ Vio &Vio::operator=(Vio &&vio) {
 
 static bool vio_init(Vio *vio, enum enum_vio_type type, my_socket sd,
                      uint flags) {
-  DBUG_PRINT("enter vio_init", ("type: %d sd: %d  flags: %d", type, sd, flags));
+  DBUG_PRINT("enter vio_init",
+             ("type: %d sd: " MY_SOCKET_FMT " flags: %d", type, sd, flags));
 
   mysql_socket_setfd(&vio->mysql_socket, sd);
 
@@ -426,7 +427,7 @@ Vio *mysql_socket_vio_new(MYSQL_SOCKET mysql_socket, enum_vio_type type,
   Vio *vio;
   my_socket sd = mysql_socket_getfd(mysql_socket);
   DBUG_TRACE;
-  DBUG_PRINT("enter", ("sd: %d", sd));
+  DBUG_PRINT("enter", ("sd: " MY_SOCKET_FMT, sd));
 
   if ((vio = internal_vio_create(flags))) {
     if (vio_init(vio, type, sd, flags)) {
@@ -444,7 +445,7 @@ Vio *vio_new(my_socket sd, enum enum_vio_type type, uint flags) {
   Vio *vio;
   MYSQL_SOCKET mysql_socket = MYSQL_INVALID_SOCKET;
   DBUG_TRACE;
-  DBUG_PRINT("enter", ("sd: %d", sd));
+  DBUG_PRINT("enter", ("sd: " MY_SOCKET_FMT, sd));
 
   mysql_socket_setfd(&mysql_socket, sd);
   vio = mysql_socket_vio_new(mysql_socket, type, flags);

vio/viosocket.cc

@@ -180,7 +180,7 @@ size_t vio_read_buff(Vio *vio, uchar *buf, size_t size) {
   size_t rc;
 #define VIO_UNBUFFERED_READ_MIN_SIZE 2048
   DBUG_TRACE;
-  DBUG_PRINT("enter", ("sd: %d  buf: %p  size: %u",
+  DBUG_PRINT("enter", ("sd: " MY_SOCKET_FMT "  buf: %p  size: %u",
                        mysql_socket_getfd(vio->mysql_socket), buf, (uint)size));
 
   if (vio->read_pos < vio->read_end) {
@@ -401,7 +401,7 @@ int vio_keepalive(Vio *vio, bool set_keep_alive) {
   uint opt = 0;
   DBUG_TRACE;
   DBUG_PRINT("enter",
-             ("sd: %d  set_keep_alive: %d",
+             ("sd: " MY_SOCKET_FMT "  set_keep_alive: %d",
               mysql_socket_getfd(vio->mysql_socket), (int)set_keep_alive));
   if (vio->type != VIO_TYPE_NAMEDPIPE) {
     if (set_keep_alive) opt = 1;

vio/viossl.cc

@@ -643,7 +643,8 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio, long timeout,
 #endif
 
   DBUG_TRACE;
-  DBUG_PRINT("enter", ("ptr: %p, sd: %d  ctx: %p", ptr, sd, ptr->ssl_context));
+  DBUG_PRINT("enter", ("ptr: %p, sd: " MY_SOCKET_FMT "  ctx: %p", ptr, sd,
+                       ptr->ssl_context));
 
   if (!sslptr) {
     sslptr = &ssl;