diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/ruby/intern.h | 7 | ||||
| -rw-r--r-- | include/ruby/ruby.h | 16 |
2 files changed, 11 insertions, 12 deletions
diff --git a/include/ruby/intern.h b/include/ruby/intern.h index e53b4e607c..e20aa3155d 100644 --- a/include/ruby/intern.h +++ b/include/ruby/intern.h @@ -459,7 +459,8 @@ int rb_provided(const char*); int rb_feature_provided(const char *, const char **); void rb_provide(const char*); VALUE rb_f_require(VALUE, VALUE); -VALUE rb_require_safe(VALUE, int); +VALUE rb_require_safe(VALUE, int); /* Remove in 3.0 */ +VALUE rb_require_string(VALUE); void rb_obj_call_init(VALUE, int, const VALUE*); void rb_obj_call_init_kw(VALUE, int, const VALUE*, int); VALUE rb_class_new_instance(int, const VALUE*, VALUE); @@ -519,8 +520,8 @@ 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); -VALUE rb_find_file_safe(VALUE, int); +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); diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index 2f9855e41e..8a5aacb42b 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -604,21 +604,18 @@ char *rb_string_value_cstr(volatile VALUE*); #define StringValueCStr(v) rb_string_value_cstr(&(v)) void rb_check_safe_obj(VALUE); -#define SafeStringValue(v) do {\ - StringValue(v);\ - rb_check_safe_obj(v);\ -} while (0) +#define SafeStringValue(v) StringValue(v) #if GCC_VERSION_SINCE(4,4,0) -void rb_check_safe_str(VALUE) __attribute__((error("rb_check_safe_str() and Check_SafeStr() are obsolete; use SafeStringValue() instead"))); +void rb_check_safe_str(VALUE) __attribute__((error("rb_check_safe_str() and Check_SafeStr() are obsolete; use StringValue() instead"))); # define Check_SafeStr(v) rb_check_safe_str((VALUE)(v)) #else -# define rb_check_safe_str(x) [<"rb_check_safe_str() is obsolete; use SafeStringValue() instead">] -# define Check_SafeStr(v) [<"Check_SafeStr() is obsolete; use SafeStringValue() instead">] +# define rb_check_safe_str(x) [<"rb_check_safe_str() is obsolete; use StringValue() instead">] +# define Check_SafeStr(v) [<"Check_SafeStr() is obsolete; use StringValue() instead">] #endif VALUE rb_str_export(VALUE); #define ExportStringValue(v) do {\ - SafeStringValue(v);\ + StringValue(v);\ (v) = rb_str_export(v);\ } while (0) VALUE rb_str_export_locale(VALUE); @@ -627,8 +624,9 @@ VALUE rb_get_path(VALUE); #define FilePathValue(v) (RB_GC_GUARD(v) = rb_get_path(v)) VALUE rb_get_path_no_checksafe(VALUE); -#define FilePathStringValue(v) ((v) = rb_get_path_no_checksafe(v)) +#define FilePathStringValue(v) ((v) = rb_get_path(v)) +/* Remove in 3.0 */ #define RUBY_SAFE_LEVEL_MAX 1 void rb_secure(int); int rb_safe_level(void); |