Refactor rb_syserr_fail and rb_syserr_fail_str to call rb_syserr_fail…

… Ruby method with nil instead of "" when custom message is NULL or Qnil
oracle · Dec 5, 2024 · a19a172 · a19a172
1 parent 7d8b161
commit a19a172
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/lib/cext/ABI_check.txt b/lib/cext/ABI_check.txt
@@ -1 +1 @@
-4
+5
diff --git a/src/main/c/cext/exception.c b/src/main/c/cext/exception.c
@@ -62,15 +62,12 @@ VALUE rb_errinfo(void) {
 }
 
 void rb_syserr_fail(int eno, const char *message) {
-  polyglot_invoke(RUBY_CEXT, "rb_syserr_fail", eno, rb_tr_unwrap(rb_str_new_cstr(message == NULL ? "" : message)));
+  VALUE messageValue = (message == NULL) ? Qnil : rb_str_new_cstr(message);
+  polyglot_invoke(RUBY_CEXT, "rb_syserr_fail", eno, rb_tr_unwrap(messageValue));
   UNREACHABLE;
 }
 
 void rb_syserr_fail_str(int eno, VALUE message) {
-  if (message == Qnil) {
-    message = rb_str_new_cstr("");
-  }
-
   polyglot_invoke(RUBY_CEXT, "rb_syserr_fail", eno, rb_tr_unwrap(message));
   UNREACHABLE;
 }