isomorfeus-iodine 0.7.45 → 0.7.46

data/ext/iodine/iodine_caller.c

@@ -10,7 +10,7 @@
 static pthread_key_t iodine_GVL_state_key;
 static pthread_once_t iodine_GVL_state_once = PTHREAD_ONCE_INIT;
 static void init_iodine_GVL_state_key(void) {
-  pthread_key_create(&iodine_GVL_state_key, NULL); 
+  pthread_key_create(&iodine_GVL_state_key, NULL);
 }
 static void init_iodine_GVL_state_init(void) {
   uint8_t *gvl = malloc(sizeof(uint8_t));
@@ -31,7 +31,7 @@ typedef struct {
   ID method;
   int exception;
   VALUE (*protected_task)(VALUE tsk_);
-  VALUE (*each_func)(VALUE block_arg, VALUE data, int argc, VALUE *argv);
+  rb_block_call_func_t each_func;
   VALUE each_udata;
 } iodine_rb_task_s;
 
@@ -158,9 +158,7 @@ static VALUE iodine_call2(VALUE obj, ID method, int argc, VALUE *argv) {
 
 /** Calls a Ruby method on a given object, protecting against exceptions. */
 static VALUE iodine_call_block(VALUE obj, ID method, int argc, VALUE *argv,
-                               VALUE udata,
-                               VALUE(each_func)(VALUE block_arg, VALUE udata,
-                                                int argc, VALUE *argv)) {
+                               VALUE udata, rb_block_call_func_t each_func) {
   iodine_rb_task_s task = {
       .obj = obj,
       .argc = argc,
@@ -186,7 +184,7 @@ static uint8_t iodine_in_GVL(void) {
 }
 
 /** Forces the GVL state flag. */
-static void iodine_set_GVL(uint8_t state) { 
+static void iodine_set_GVL(uint8_t state) {
   pthread_once(&iodine_GVL_state_once, init_iodine_GVL_state_key);
   uint8_t *iodine_GVL_state = pthread_getspecific(iodine_GVL_state_key);
   if (!iodine_GVL_state) {

data/ext/iodine/iodine_caller.h

@@ -1,27 +1,26 @@
-#ifndef H_IODINE_CALLER_H
-#define H_IODINE_CALLER_H
-
-#include "ruby.h"
-
-#include <stdint.h>
-
-extern struct IodineCaller_s {
-  /** Calls a C function within the GVL (unprotected). */
-  void *(*enterGVL)(void *(*func)(void *), void *arg);
-  /** Calls a C function outside the GVL (no Ruby API calls allowed). */
-  void *(*leaveGVL)(void *(*func)(void *), void *arg);
-  /** Calls a Ruby method on a given object, protecting against exceptions. */
-  VALUE (*call)(VALUE obj, ID method);
-  /** Calls a Ruby method on a given object, protecting against exceptions. */
-  VALUE (*call2)(VALUE obj, ID method, int argc, VALUE *argv);
-  /** Calls a Ruby method on a given object, protecting against exceptions. */
-  VALUE(*call_with_block)
-  (VALUE obj, ID method, int argc, VALUE *argv, VALUE udata,
-   VALUE (*block_func)(VALUE block_argv1, VALUE udata, int argc, VALUE *argv));
-  /** Returns the GVL state flag. */
-  uint8_t (*in_GVL)(void);
-  /** Forces the GVL state flag. */
-  void (*set_GVL)(uint8_t state);
-} IodineCaller;
-
-#endif
+#ifndef H_IODINE_CALLER_H
+#define H_IODINE_CALLER_H
+
+#include "ruby.h"
+
+#include <stdint.h>
+
+extern struct IodineCaller_s {
+  /** Calls a C function within the GVL (unprotected). */
+  void *(*enterGVL)(void *(*func)(void *), void *arg);
+  /** Calls a C function outside the GVL (no Ruby API calls allowed). */
+  void *(*leaveGVL)(void *(*func)(void *), void *arg);
+  /** Calls a Ruby method on a given object, protecting against exceptions. */
+  VALUE (*call)(VALUE obj, ID method);
+  /** Calls a Ruby method on a given object, protecting against exceptions. */
+  VALUE (*call2)(VALUE obj, ID method, int argc, VALUE *argv);
+  /** Calls a Ruby method on a given object, protecting against exceptions. */
+  VALUE(*call_with_block)
+  (VALUE obj, ID method, int argc, VALUE *argv, VALUE udata, rb_block_call_func_t block_func);
+  /** Returns the GVL state flag. */
+  uint8_t (*in_GVL)(void);
+  /** Forces the GVL state flag. */
+  void (*set_GVL)(uint8_t state);
+} IodineCaller;
+
+#endif

data/ext/iodine/iodine_connection.c

@@ -900,7 +900,7 @@ void iodine_connection_init(void) {
   IodineStore.add(RAWSymbol);
 
   // define the Connection Class and it's methods
-  ConnectionKlass = rb_define_class_under(IodineModule, "Connection", rb_cData);
+  ConnectionKlass = rb_define_class_under(IodineModule, "Connection", rb_cObject);
   rb_define_alloc_func(ConnectionKlass, iodine_connection_data_alloc_c);
   rb_define_method(ConnectionKlass, "write", iodine_connection_write, 1);
   rb_define_method(ConnectionKlass, "close", iodine_connection_close, 0);

data/ext/iodine/iodine_http.c

@@ -520,7 +520,7 @@ static int for_each_header_data(VALUE key, VALUE val, VALUE h_) {
 
 // writes the body to the response object
 static VALUE for_each_body_string(VALUE str, VALUE body_, int argc,
-                                  VALUE *argv) {
+                                  const VALUE *argv, VALUE unused) {
   // fprintf(stderr, "For_each - body\n");
   // write body
   if (TYPE(str) != T_STRING) {
@@ -533,6 +533,7 @@ static VALUE for_each_body_string(VALUE str, VALUE body_, int argc,
   return Qtrue;
   (void)argc;
   (void)argv;
+  (void)unused;
 }
 
 static inline int ruby2c_response_send(iodine_http_request_handle_s *handle,

data/ext/iodine/iodine_mustache.c

@@ -558,7 +558,7 @@ void iodine_init_mustache(void) {
   rb_global_variable(&filename_id);
   rb_global_variable(&data_id);
   rb_global_variable(&template_id);
-  VALUE tmp = rb_define_class_under(IodineModule, "Mustache", rb_cData);
+  VALUE tmp = rb_define_class_under(IodineModule, "Mustache", rb_cObject);
   rb_define_alloc_func(tmp, iodine_mustache_data_alloc_c);
   rb_define_method(tmp, "initialize", iodine_mustache_new, -1);
   rb_define_method(tmp, "render", iodine_mustache_render, 1);