Changes based on review.

Author: aardvark179

lib/cext/include/truffleruby/truffleruby.h

@@ -385,7 +385,7 @@ MUST_INLINE int rb_tr_scan_args(int argc, VALUE *argv, const char *format, VALUE
   }
 
   if (argn < argc) {
-	rb_error_arity(argc, pre, rest ? UNLIMITED_ARGUMENTS : pre + optional);
+	rb_error_arity(argc, n_mand, rest ? UNLIMITED_ARGUMENTS : n_mand + n_opt);
   }
 
   return argc;

src/main/c/cext/ruby.c

@@ -3468,25 +3468,23 @@ VALUE rb_enum_values_pack(int argc, const VALUE *argv) {
   rb_tr_error("rb_enum_values_pack not implemented");
 }
 
-static inline VALUE
-rb_arity_error_new(int argc, int min, int max)
-{
-    VALUE err_mess = 0;
-    if (min == max) {
+static inline VALUE rb_arity_error_new(int argc, int min, int max) {
+  VALUE err_mess = 0;
+  if (min == max) {
 	err_mess = rb_sprintf("wrong number of arguments (given %d, expected %d)", argc, min);
-    }
-    else if (max == UNLIMITED_ARGUMENTS) {
+  }
+  else if (max == UNLIMITED_ARGUMENTS) {
 	err_mess = rb_sprintf("wrong number of arguments (given %d, expected %d+)", argc, min);
-    }
-    else {
+  }
+  else {
 	err_mess = rb_sprintf("wrong number of arguments (given %d, expected %d..%d)", argc, min, max);
-    }
-    return rb_exc_new3(rb_eArgError, err_mess);
+  }
+  return rb_exc_new3(rb_eArgError, err_mess);
 }
 
 NORETURN(void rb_error_arity(int argc, int min, int max))
 {
-    rb_exc_raise(rb_arity_error_new(argc, min, max));
+  rb_exc_raise(rb_arity_error_new(argc, min, max));
 }
 
 void rb_error_untrusted(VALUE obj) {