Skip to content

Commit

Permalink
Added rb_syserr_new_path
Browse files Browse the repository at this point in the history
Similar to rb_syserr_fail_path, but just returns the created
exception instance instead of raising it.
  • Loading branch information
nobu committed Apr 15, 2020
1 parent 69b3e0a commit d72fd1e
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
8 changes: 7 additions & 1 deletion error.c
Expand Up @@ -2829,6 +2829,12 @@ rb_sys_fail_path_in(const char *func_name, VALUE path)

void
rb_syserr_fail_path_in(const char *func_name, int n, VALUE path)
{
rb_exc_raise(rb_syserr_new_path_in(func_name, n, path));
}

VALUE
rb_syserr_new_path_in(const char *func_name, int n, VALUE path)
{
VALUE args[2];

Expand All @@ -2841,7 +2847,7 @@ rb_syserr_fail_path_in(const char *func_name, int n, VALUE path)
}
args[0] = path;
args[1] = rb_str_new_cstr(func_name);
rb_exc_raise(rb_class_new_instance(2, args, get_syserr(n)));
return rb_class_new_instance(2, args, get_syserr(n));
}
#endif

Expand Down
3 changes: 3 additions & 0 deletions internal/error.h
Expand Up @@ -32,9 +32,11 @@
#ifdef RUBY_FUNCTION_NAME_STRING
# define rb_sys_fail_path(path) rb_sys_fail_path_in(RUBY_FUNCTION_NAME_STRING, path)
# define rb_syserr_fail_path(err, path) rb_syserr_fail_path_in(RUBY_FUNCTION_NAME_STRING, (err), (path))
# define rb_syserr_new_path(err, path) rb_syserr_new_path_in(RUBY_FUNCTION_NAME_STRING, (err), (path))
#else
# define rb_sys_fail_path(path) rb_sys_fail_str(path)
# define rb_syserr_fail_path(err, path) rb_syserr_fail_str((err), (path))
# define rb_syserr_new_path(err, path) rb_syserr_new_str((err), (path))
#endif

/* error.c */
Expand Down Expand Up @@ -79,6 +81,7 @@ int rb_bug_reporter_add(void (*func)(FILE *, void *), void *data);
#ifdef RUBY_FUNCTION_NAME_STRING
NORETURN(void rb_sys_fail_path_in(const char *func_name, VALUE path));
NORETURN(void rb_syserr_fail_path_in(const char *func_name, int err, VALUE path));
VALUE rb_syserr_new_path_in(const char *func_name, int n, VALUE path);
#endif
RUBY_SYMBOL_EXPORT_END

Expand Down

0 comments on commit d72fd1e

Please sign in to comment.