Work around statement.c

Author: tamird

ext/mysql2/extconf.rb

@@ -100,6 +100,7 @@ def asplode lib
 
   # This is our wishlist. We use whichever flags work on the host.
   # -Wall and -Wextra are included by default.
+  # TODO: fix statement.c and remove -Wno-error=declaration-after-statement
   %w(
     -Werror
     -Weverything
@@ -109,6 +110,7 @@ def asplode lib
     -fsanitize=memory
     -fsanitize=undefined
     -fsanitize=cfi
+    -Wno-error=declaration-after-statement
   ).each do |flag|
     if try_link('int main() {return 0;}', flag)
       $CFLAGS << ' ' << flag

ext/mysql2/result.c

@@ -848,7 +848,7 @@ static VALUE rb_mysql_result_each_(VALUE self,
 
 static VALUE rb_mysql_result_each(int argc, VALUE * argv, VALUE self) {
   result_each_args args;
-  VALUE defaults, opts, block;
+  VALUE defaults, opts, block, (*fetch_row_func)(VALUE, MYSQL_FIELD *fields, const result_each_args *args);
   ID db_timezone, app_timezone, dbTz, appTz;
   mysql2_result_wrapper * wrapper;
   int symbolizeKeys, asArray, castBool, cacheRows, cast;
@@ -921,7 +921,6 @@ static VALUE rb_mysql_result_each(int argc, VALUE * argv, VALUE self) {
   args.app_timezone = app_timezone;
   args.block_given = block;
 
-  VALUE (*fetch_row_func)(VALUE, MYSQL_FIELD *fields, const result_each_args *args);
   if (wrapper->stmt) {
     fetch_row_func = rb_mysql_result_fetch_row_stmt;
   } else {

ext/mysql2/statement.c

@@ -31,6 +31,7 @@ VALUE rb_raise_mysql2_stmt_error2(MYSQL_STMT *stmt
   ) {
   VALUE rb_error_msg = rb_str_new2(mysql_stmt_error(stmt));
   VALUE rb_sql_state = rb_tainted_str_new2(mysql_stmt_sqlstate(stmt));
+  VALUE e = rb_exc_new3(cMysql2Error, rb_error_msg);
 #ifdef HAVE_RUBY_ENCODING_H
   rb_encoding *default_internal_enc = rb_default_internal_encoding();
 
@@ -41,8 +42,6 @@ VALUE rb_raise_mysql2_stmt_error2(MYSQL_STMT *stmt
     rb_sql_state = rb_str_export_to_enc(rb_sql_state, default_internal_enc);
   }
 #endif
-
-  VALUE e = rb_exc_new3(cMysql2Error, rb_error_msg);
   rb_funcall(e, intern_error_number_eql, 1, UINT2NUM(mysql_stmt_errno(stmt)));
   rb_funcall(e, intern_sql_state_eql, 1, rb_sql_state);
   rb_exc_raise(e);
@@ -209,19 +208,15 @@ static VALUE execute(int argc, VALUE *argv, VALUE self) {
   long i;
   MYSQL_STMT *stmt;
   MYSQL_RES *metadata;
+  VALUE current;
   VALUE resultObj;
   VALUE *params_enc = alloca(sizeof(VALUE) * argc);
   unsigned long* length_buffers = NULL;
   int is_streaming = 0;
-#ifdef HAVE_RUBY_ENCODING_H
-  rb_encoding *conn_enc;
-#endif
   GET_STATEMENT(self);
+  GET_CLIENT(stmt_wrapper->client);
 #ifdef HAVE_RUBY_ENCODING_H
-  {
-    GET_CLIENT(stmt_wrapper->client);
-    conn_enc = rb_to_encoding(wrapper->encoding);
-  }
+  rb_encoding *conn_enc = rb_to_encoding(wrapper->encoding);
 #endif
   {
     VALUE valStreaming = rb_hash_aref(rb_iv_get(stmt_wrapper->client, "@query_options"), sym_stream);
@@ -287,11 +282,12 @@ static VALUE execute(int argc, VALUE *argv, VALUE self) {
         default:
           // TODO: what Ruby type should support MYSQL_TYPE_TIME
           if (CLASS_OF(argv[i]) == rb_cTime || CLASS_OF(argv[i]) == cDateTime) {
+            MYSQL_TIME t;
+            VALUE rb_time = argv[i];
+
             bind_buffers[i].buffer_type = MYSQL_TYPE_DATETIME;
             bind_buffers[i].buffer = xmalloc(sizeof(MYSQL_TIME));
 
-            MYSQL_TIME t;
-            VALUE rb_time = argv[i];
             memset(&t, 0, sizeof(MYSQL_TIME));
             t.neg = 0;
             t.second_part = FIX2INT(rb_funcall(rb_time, rb_intern("usec"), 0));
@@ -304,13 +300,12 @@ static VALUE execute(int argc, VALUE *argv, VALUE self) {
 
             *(MYSQL_TIME*)(bind_buffers[i].buffer) = t;
           } else if (CLASS_OF(argv[i]) == cDate) {
+            MYSQL_TIME t;
+            VALUE rb_time = argv[i];
 
             bind_buffers[i].buffer_type = MYSQL_TYPE_DATE;
-
             bind_buffers[i].buffer = xmalloc(sizeof(MYSQL_TIME));
 
-            MYSQL_TIME t;
-            VALUE rb_time = argv[i];
             memset(&t, 0, sizeof(MYSQL_TIME));
             t.second_part = 0;
             t.neg = 0;
@@ -352,9 +347,7 @@ static VALUE execute(int argc, VALUE *argv, VALUE self) {
     return Qnil;
   }
 
-  VALUE current;
   current = rb_hash_dup(rb_iv_get(stmt_wrapper->client, "@query_options"));
-  GET_CLIENT(stmt_wrapper->client);
 
   if (!is_streaming) {
     // recieve the whole result set from the server