Addendum to the fix for bug #34828882: Enable MSVC Code Analysis for C/C++

gkodinov · gkodinov · commit ce37ce0a5db2 · 2022-12-02T11:24:51.000+02:00
1. Extended the scope of the checks.
2. Fixed a couple of obvious warnings

Change-Id: If5e5677b90ac8cb25f0ec8fa6a453180837ec927
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
@@ -21,6 +21,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
 ADD_WSHADOW_WARNING()
+MSVC_CPPCHECK()
 
 # We are not interesting in profiling clients.
 DISABLE_MISSING_PROFILE_WARNING()
diff --git a/client/mysql.cc b/client/mysql.cc
@@ -1221,7 +1221,7 @@ inline int get_command_index(char cmd_char) {
     All client-specific commands are in the first part of commands array
     and have a function to implement it.
   */
-  for (uint i = 0; *commands[i].func != nullptr; i++)
+  for (uint i = 0; commands[i].func != nullptr; i++)
     if (commands[i].cmd_char == cmd_char) return i;
   return -1;
 }
diff --git a/client/mysqlslap.cc b/client/mysqlslap.cc
@@ -311,8 +311,8 @@ static long int timedif(struct timeval a, struct timeval b) {
 
 #ifdef _WIN32
 static int gettimeofday(struct timeval *tp, void *) {
-  unsigned int ticks;
-  ticks = GetTickCount();
+  ULONGLONG ticks;
+  ticks = GetTickCount64();
   tp->tv_usec = ticks * 1000;
   tp->tv_sec = ticks / 1000;
 
diff --git a/cmake/msvc_cppcheck.cmake b/cmake/msvc_cppcheck.cmake
@@ -147,8 +147,6 @@ ENDMACRO()
 
 MACRO(MSVC_CPPCHECK_ADD_ANALYZE)
   IF (MSVC AND MSVC_CPPCHECK)
-    MESSAGE(STATUS "MSVC Code analysis (MSVC_CPPCHECK) turned ON")
-
     STRING_APPEND(CMAKE_C_FLAGS " /analyze /analyze:external- /analyze:pluginEspXEngine.dll")
     STRING_APPEND(CMAKE_CXX_FLAGS " /analyze /analyze:external- /analyze:pluginEspXEngine.dll")
   ENDIF()
diff --git a/components/audit_api_message_emit/CMakeLists.txt b/components/audit_api_message_emit/CMakeLists.txt
@@ -21,6 +21,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
 DISABLE_MISSING_PROFILE_WARNING()
+MSVC_CPPCHECK()
 
 MYSQL_ADD_COMPONENT(audit_api_message_emit
   audit_api_message_emit.cc
diff --git a/components/example/CMakeLists.txt b/components/example/CMakeLists.txt
@@ -20,6 +20,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
+MSVC_CPPCHECK()
 MYSQL_ADD_COMPONENT(example_component1
   english_greeting_service_imp.cc
   example_component1.cc
diff --git a/components/libminchassis/CMakeLists.txt b/components/libminchassis/CMakeLists.txt
@@ -20,6 +20,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
+MSVC_CPPCHECK()
 SET(LIBMINCHASSIS_SOURCES
   component_common.cc
   dynamic_loader.cc
diff --git a/components/mysqlbackup/CMakeLists.txt b/components/mysqlbackup/CMakeLists.txt
@@ -22,6 +22,7 @@
 
 DISABLE_MISSING_PROFILE_WARNING()
 
+MSVC_CPPCHECK()
 MYSQL_ADD_COMPONENT(mysqlbackup
   mysqlbackup.cc
   backup_page_tracker.cc
diff --git a/components/pfs_component/CMakeLists.txt b/components/pfs_component/CMakeLists.txt
@@ -21,6 +21,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
 DISABLE_MISSING_PROFILE_WARNING()
+MSVC_CPPCHECK()
 
 MYSQL_ADD_COMPONENT(pfs_example_component_population
   pfs_example_component_population.cc
diff --git a/components/pfs_example/CMakeLists.txt b/components/pfs_example/CMakeLists.txt
@@ -21,6 +21,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
 DISABLE_MISSING_PROFILE_WARNING()
+MSVC_CPPCHECK()
 
 MYSQL_ADD_COMPONENT(pfs_example
   pfs_example.cc
diff --git a/components/query_attributes/CMakeLists.txt b/components/query_attributes/CMakeLists.txt
@@ -20,6 +20,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
+MSVC_CPPCHECK()
 MYSQL_ADD_COMPONENT(query_attributes
   query_attributes.cc
   MODULE_ONLY
diff --git a/components/reference_cache/CMakeLists.txt b/components/reference_cache/CMakeLists.txt
@@ -20,6 +20,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
+MSVC_CPPCHECK()
 MYSQL_ADD_COMPONENT(reference_cache
   component.cc
   channel.cc
diff --git a/components/validate_password/CMakeLists.txt b/components/validate_password/CMakeLists.txt
@@ -20,6 +20,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
+MSVC_CPPCHECK()
 MYSQL_ADD_COMPONENT(validate_password
   validate_password_imp.cc
   MODULE_ONLY
diff --git a/libbinlogevents/CMakeLists.txt b/libbinlogevents/CMakeLists.txt
@@ -23,6 +23,8 @@
 
 ADD_WSHADOW_WARNING()
 
+MSVC_CPPCHECK()
+
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/libbinlogevents/include)
 
 CONFIGURE_FILE(binlog_config.h.cmake
diff --git a/libbinlogstandalone/CMakeLists.txt b/libbinlogstandalone/CMakeLists.txt
@@ -22,6 +22,7 @@
 #
 
 ADD_WSHADOW_WARNING()
+MSVC_CPPCHECK()
 DISABLE_MISSING_PROFILE_WARNING()
 
 ADD_DEFINITIONS(-DSTANDALONE_BINLOG)
diff --git a/libchangestreams/CMakeLists.txt b/libchangestreams/CMakeLists.txt
@@ -24,6 +24,7 @@ OPTION(WITH_CS_PROTOBUF
   "Compile change streams library with protobuf based functionality" OFF)
 
 ADD_WSHADOW_WARNING()
+MSVC_CPPCHECK()
 DISABLE_MISSING_PROFILE_WARNING()
 
 SET(CS_BASE_SRC_DIR ${CMAKE_SOURCE_DIR}/libchangestreams/src)
diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt
@@ -22,6 +22,8 @@
 
 ADD_WSHADOW_WARNING()
 
+MSVC_CPPCHECK()
+
 SET(CLIENT_API_FUNCTIONS
   mysql_affected_rows
   mysql_autocommit
diff --git a/libservices/CMakeLists.txt b/libservices/CMakeLists.txt
@@ -25,6 +25,7 @@ IF(WITHOUT_SERVER)
   RETURN()
 ENDIF()
 
+MSVC_CPPCHECK()
 ADD_WSHADOW_WARNING()
 
 SET(MYSQLSERVICES_SOURCES
diff --git a/mysys/CMakeLists.txt b/mysys/CMakeLists.txt
@@ -27,6 +27,9 @@ SET(MY_TIME_SOURCES my_time.cc my_systime.cc)
 ADD_CONVENIENCE_LIBRARY(mytime ${MY_TIME_SOURCES})
 
 MSVC_CPPCHECK()
+IF (MSVC AND MSVC_CPPCHECK)
+  MESSAGE(STATUS "MSVC Code analysis (MSVC_CPPCHECK) turned ON")
+ENDIF()
 
 SET(MYSYS_SOURCES
   array.cc
diff --git a/testclients/CMakeLists.txt b/testclients/CMakeLists.txt
@@ -21,6 +21,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
 ADD_WSHADOW_WARNING()
+MSVC_CPPCHECK()
 
 MYSQL_ADD_EXECUTABLE(mysql_client_test mysql_client_test.cc COMPONENT Test)
 TARGET_LINK_LIBRARIES(mysql_client_test mysqlclient)
diff --git a/testclients/mysql_client_test.cc b/testclients/mysql_client_test.cc
@@ -20518,7 +20518,7 @@ static void test_skip_metadata() {
   }
 
   /* Check CLIENT_OPTIONAL_RESULTSET_METADATA flag. */
-  DIE_UNLESS(mysql->client_flag | CLIENT_OPTIONAL_RESULTSET_METADATA);
+  DIE_UNLESS(mysql1->client_flag & CLIENT_OPTIONAL_RESULTSET_METADATA);
 
   /* Check MYSQL_OPT_OPTIONAL_RESULTSET_METADATA option. */
   mysql_get_option(mysql1, MYSQL_OPT_OPTIONAL_RESULTSET_METADATA,
diff --git a/vio/CMakeLists.txt b/vio/CMakeLists.txt
@@ -22,6 +22,8 @@
 
 ADD_WSHADOW_WARNING()
 
+MSVC_CPPCHECK()
+
 SET(VIO_SOURCES
   vio.cc
   viosocket.cc

Original file line number	Diff line number	Diff line change
`@@ -1221,7 +1221,7 @@ inline int get_command_index(char cmd_char) {`
`1221`	`1221`	`All client-specific commands are in the first part of commands array`
`1222`	`1222`	`and have a function to implement it.`
`1223`	`1223`	`*/`
`1224`		`- for (uint i = 0; *commands[i].func != nullptr; i++)`
	`1224`	`+ for (uint i = 0; commands[i].func != nullptr; i++)`
`1225`	`1225`	`if (commands[i].cmd_char == cmd_char) return i;`
`1226`	`1226`	`return -1;`
`1227`	`1227`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@`
`22`	`22`	`#`
`23`	`23`
`24`	`24`	`ADD_WSHADOW_WARNING()`
	`25`	`+MSVC_CPPCHECK()`
`25`	`26`	`DISABLE_MISSING_PROFILE_WARNING()`
`26`	`27`
`27`	`28`	`ADD_DEFINITIONS(-DSTANDALONE_BINLOG)`
Original file line number	Diff line number	Diff line change
`@@ -20518,7 +20518,7 @@ static void test_skip_metadata() {`
`20518`	`20518`	`}`
`20519`	`20519`
`20520`	`20520`	`/* Check CLIENT_OPTIONAL_RESULTSET_METADATA flag. */`
`20521`		`- DIE_UNLESS(mysql->client_flag \| CLIENT_OPTIONAL_RESULTSET_METADATA);`
	`20521`	`+ DIE_UNLESS(mysql1->client_flag & CLIENT_OPTIONAL_RESULTSET_METADATA);`
`20522`	`20522`
`20523`	`20523`	`/* Check MYSQL_OPT_OPTIONAL_RESULTSET_METADATA option. */`
`20524`	`20524`	`mysql_get_option(mysql1, MYSQL_OPT_OPTIONAL_RESULTSET_METADATA,`