From e380f78851b27511f165bcd841626f2cb9fa87be Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Sat, 12 Sep 2020 08:55:14 +0900 Subject: [PATCH] Removed rb_find_file_ext_safe and rb_find_file_safe --- file.c | 14 -------------- include/ruby/internal/intern/file.h | 2 -- 2 files changed, 16 deletions(-) diff --git a/file.c b/file.c index d9b113ef89..0c599b0895 100644 --- a/file.c +++ b/file.c @@ -6301,13 +6301,6 @@ copy_path_class(VALUE path, VALUE orig) return path; } -int -rb_find_file_ext_safe(VALUE *filep, const char *const *ext, int _level) -{ - rb_warn("rb_find_file_ext_safe will be removed in Ruby 3.0"); - return rb_find_file_ext(filep, ext); -} - int rb_find_file_ext(VALUE *filep, const char *const *ext) { @@ -6367,13 +6360,6 @@ rb_find_file_ext(VALUE *filep, const char *const *ext) return 0; } -VALUE -rb_find_file_safe(VALUE path, int _level) -{ - rb_warn("rb_find_file_safe will be removed in Ruby 3.0"); - return rb_find_file(path); -} - VALUE rb_find_file(VALUE path) { diff --git a/include/ruby/internal/intern/file.h b/include/ruby/internal/intern/file.h index 5a52d570e4..9ebefece66 100644 --- a/include/ruby/internal/intern/file.h +++ b/include/ruby/internal/intern/file.h @@ -31,8 +31,6 @@ VALUE rb_file_expand_path(VALUE, VALUE); VALUE rb_file_s_absolute_path(int, const VALUE *); VALUE rb_file_absolute_path(VALUE, VALUE); VALUE rb_file_dirname(VALUE fname); -int rb_find_file_ext_safe(VALUE*, const char* const*, int); /* Remove in 3.0 */ -VALUE rb_find_file_safe(VALUE, int); /* Remove in 3.0 */ int rb_find_file_ext(VALUE*, const char* const*); VALUE rb_find_file(VALUE); VALUE rb_file_directory_p(VALUE,VALUE);