summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHiroshi SHIBATA <hsbt@ruby-lang.org>2020-09-12 08:55:14 +0900
committerHiroshi SHIBATA <hsbt@ruby-lang.org>2020-09-23 09:09:36 +0900
commite380f78851b27511f165bcd841626f2cb9fa87be (patch)
tree1c7dec291dec777eb8a77d57e66e106a000235a7
parented27c2514c2f4140546dce2e8f5f64cb91712c47 (diff)
Removed rb_find_file_ext_safe and rb_find_file_safe
Notes
Notes: Merged: https://github.com/ruby/ruby/pull/3537
-rw-r--r--file.c14
-rw-r--r--include/ruby/internal/intern/file.h2
2 files changed, 0 insertions, 16 deletions
diff --git a/file.c b/file.c
index d9b113ef89..0c599b0895 100644
--- a/file.c
+++ b/file.c
@@ -6302,13 +6302,6 @@ copy_path_class(VALUE path, VALUE orig)
}
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)
{
const char *f = StringValueCStr(*filep);
@@ -6368,13 +6361,6 @@ rb_find_file_ext(VALUE *filep, const char *const *ext)
}
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)
{
VALUE tmp, load_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);