Make rb_fiddle_generic_to_value take int

Author: jhawthorn

ext/fiddle/conversions.c

@@ -308,10 +308,8 @@ value_to_generic(int type, VALUE src, fiddle_generic *dst)
 }
 
 VALUE
-rb_fiddle_generic_to_value(VALUE rettype, fiddle_generic retval)
+rb_fiddle_generic_to_value(int type, fiddle_generic retval)
 {
-    int type = NUM2INT(rettype);
-
     switch (type) {
       case TYPE_VOID:
 	return Qnil;
@@ -374,5 +372,5 @@ rb_fiddle_generic_to_value(VALUE rettype, fiddle_generic retval)
 VALUE
 generic_to_value(VALUE rettype, fiddle_generic retval)
 {
-    return rb_fiddle_generic_to_value(rettype, retval);
+    return rb_fiddle_generic_to_value(NUM2INT(rettype), retval);
 }

ext/fiddle/conversions.h

@@ -27,7 +27,7 @@ typedef union
 VALUE rb_fiddle_type_ensure(VALUE type);
 ffi_type * rb_fiddle_int_to_ffi_type(int type);
 void rb_fiddle_value_to_generic(int type, VALUE *src, fiddle_generic *dst);
-VALUE rb_fiddle_generic_to_value(VALUE rettype, fiddle_generic retval);
+VALUE rb_fiddle_generic_to_value(int type, fiddle_generic retval);
 
 /* Deprecated. Use rb_fiddle_*() version. */
 ffi_type * int_to_ffi_type(int type);

ext/fiddle/function.c

@@ -433,7 +433,7 @@ function_call(int argc, VALUE argv[], VALUE self)
 
     ALLOCV_END(alloc_buffer);
 
-    return GENERIC2VALUE(INT2FIX(func->return_type), args.retval);
+    return GENERIC2VALUE(func->return_type, args.retval);
 }
 
 void