-Weverything and whitelist warnings

Author: tamird

ext/mysql2/client.c

@@ -610,7 +610,6 @@ void rb_mysql_client_set_active_thread(VALUE self) {
     const char *thr = StringValueCStr(inspect);
 
     rb_raise(cMysql2Error, "This connection is in use by: %s", thr);
-    (void)RB_GC_GUARD(inspect);
   }
 }
 
@@ -1230,7 +1229,6 @@ void init_mysql2_client() {
     }
     if (lib[i] != MYSQL_LINK_VERSION[i]) {
       rb_raise(rb_eRuntimeError, "Incorrect MySQL client library version! This gem was compiled for %s but the client library is %s.", MYSQL_LINK_VERSION, lib);
-      return;
     }
   }
 #endif
@@ -1239,7 +1237,6 @@ void init_mysql2_client() {
   /* without race condition in the library */
   if (mysql_library_init(0, NULL, NULL) != 0) {
     rb_raise(rb_eRuntimeError, "Could not initialize MySQL client library");
-    return;
   }
 
 #if 0

ext/mysql2/client.h

@@ -66,7 +66,7 @@ void rb_mysql_client_set_active_thread(VALUE self);
   mysql_client_wrapper *wrapper; \
   Data_Get_Struct(self, mysql_client_wrapper, wrapper);
 
-void init_mysql2_client();
+void init_mysql2_client(void);
 void decr_mysql2_client(mysql_client_wrapper *wrapper);
 
 #endif

ext/mysql2/extconf.rb

@@ -93,19 +93,36 @@ def asplode(lib)
 end
 
 # This is our wishlist. We use whichever flags work on the host.
-# TODO: fix statement.c and remove -Wno-declaration-after-statement
-# TODO: fix gperf mysql_enc_name_to_ruby.h and remove -Wno-missing-field-initializers
-%w(
-  -Wall
-  -Wextra
-  -Werror
-  -Wno-unused-function
-  -Wno-declaration-after-statement
-  -Wno-missing-field-initializers
-).each do |flag|
-  $CFLAGS << ' ' << flag if try_link('int main() {return 0;}', flag)
+# -Wall and -Wextra are included by default.
+usable_flags = [
+  '-fsanitize=address',
+  '-fsanitize=cfi',
+  '-fsanitize=integer',
+  '-fsanitize=memory',
+  '-fsanitize=thread',
+  '-fsanitize=undefined',
+  '-Werror',
+  '-Weverything',
+  '-Wno-bad-function-cast', # rb_thread_call_without_gvl returns void * that we cast to VALUE
+  '-Wno-conditional-uninitialized', # false positive in client.c
+  '-Wno-covered-switch-default', # result.c -- enum_field_types (when fully covered, e.g. mysql 5.5)
+  '-Wno-declaration-after-statement', # GET_CLIENT followed by GET_STATEMENT in statement.c
+  '-Wno-disabled-macro-expansion', # rubby :(
+  '-Wno-documentation-unknown-command', # rubby :(
+  '-Wno-missing-field-initializers', # gperf generates bad code
+  '-Wno-missing-variable-declarations', # missing symbols due to ruby native ext initialization
+  '-Wno-padded', # mysql :(
+  '-Wno-sign-conversion', # gperf generates bad code
+  '-Wno-static-in-inline', # gperf generates bad code
+  '-Wno-switch-enum', # result.c -- enum_field_types (when not fully covered, e.g. mysql 5.6+)
+  '-Wno-undef', # rubinius :(
+  '-Wno-used-but-marked-unused', # rubby :(
+].select do |flag|
+  try_link('int main() {return 0;}', flag)
 end
 
+$CFLAGS << ' ' << usable_flags.join(' ')
+
 if RUBY_PLATFORM =~ /mswin|mingw/
   # Build libmysql.a interface link library
   require 'rake'

ext/mysql2/infile.c

@@ -56,7 +56,7 @@ mysql2_local_infile_init(void **ptr, const char *filename, void *userdata)
  * < 0   error
  */
 static int
-mysql2_local_infile_read(void *ptr, char *buf, uint buf_len)
+mysql2_local_infile_read(void *ptr, char *buf, unsigned int buf_len)
 {
   int count;
   mysql2_local_infile_data *data = (mysql2_local_infile_data *)ptr;
@@ -95,7 +95,7 @@ mysql2_local_infile_end(void *ptr)
  * Error message number (see http://dev.mysql.com/doc/refman/5.0/en/error-messages-client.html)
  */
 static int
-mysql2_local_infile_error(void *ptr, char *error_msg, uint error_msg_len)
+mysql2_local_infile_error(void *ptr, char *error_msg, unsigned int error_msg_len)
 {
   mysql2_local_infile_data *data = (mysql2_local_infile_data *) ptr;
 

ext/mysql2/mysql2_ext.h

@@ -1,18 +1,14 @@
 #ifndef MYSQL2_EXT
 #define MYSQL2_EXT
 
+void Init_mysql2(void);
+
 /* tell rbx not to use it's caching compat layer
    by doing this we're making a promise to RBX that
    we'll never modify the pointers we get back from RSTRING_PTR */
 #define RSTRING_NOT_MODIFIED
 #include <ruby.h>
 
-#ifndef HAVE_UINT
-#define HAVE_UINT
-typedef unsigned short    ushort;
-typedef unsigned int    uint;
-#endif
-
 #ifdef HAVE_MYSQL_H
 #include <mysql.h>
 #include <mysql_com.h>

ext/mysql2/result.c

@@ -159,8 +159,7 @@ static void *nogvl_stmt_fetch(void *ptr) {
   return (void *)r;
 }
 
-
-static VALUE rb_mysql_result_fetch_field(VALUE self, unsigned int idx, short int symbolize_keys) {
+static VALUE rb_mysql_result_fetch_field(VALUE self, unsigned int idx, int symbolize_keys) {
   VALUE rb_field;
   GET_RESULT(self);
 
@@ -508,7 +507,6 @@ static VALUE rb_mysql_result_fetch_row_stmt(VALUE self, MYSQL_FIELD * fields, co
         default:
           rb_raise(cMysql2Error, "unhandled buffer type: %d",
               result_buffer->buffer_type);
-          break;
       }
     }
 

ext/mysql2/result.h

@@ -1,7 +1,7 @@
 #ifndef MYSQL2_RESULT_H
 #define MYSQL2_RESULT_H
 
-void init_mysql2_result();
+void init_mysql2_result(void);
 VALUE rb_mysql_result_to_obj(VALUE client, VALUE encoding, VALUE options, MYSQL_RES *r, VALUE statement);
 
 typedef struct {

ext/mysql2/statement.h

@@ -9,7 +9,7 @@ typedef struct {
   int refcount;
 } mysql_stmt_wrapper;
 
-void init_mysql2_statement();
+void init_mysql2_statement(void);
 void decr_mysql2_stmt(mysql_stmt_wrapper *stmt_wrapper);
 
 VALUE rb_mysql_stmt_new(VALUE rb_client, VALUE sql);