1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* configure.in (DEPRECATED): backported from trunk.

* eval.c (rb_mod_autoload): should use SafeStringValue() instead
  obsolete Check_SafeStr().

* ruby.h (rb_check_safe_str, rb_str2cstr): deprecation warning.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@24202 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-07-19 05:03:30 +00:00
parent d1b83a59ef
commit 1031c20714
5 changed files with 19 additions and 6 deletions

View file

@ -1,3 +1,12 @@
Sun Jul 19 14:03:22 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (DEPRECATED): backported from trunk.
* eval.c (rb_mod_autoload): should use SafeStringValue() instead
obsolete Check_SafeStr().
* ruby.h (rb_check_safe_str, rb_str2cstr): deprecation warning.
Sat Jul 18 12:05:45 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> Sat Jul 18 12:05:45 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ruby.h (RFLOAT_VALUE, RSTRING_END, RREGEXP_SRC_*, RBIGNUM_*): * ruby.h (RFLOAT_VALUE, RSTRING_END, RREGEXP_SRC_*, RBIGNUM_*):

View file

@ -382,6 +382,7 @@ AS_VAR_POPDEF([rbcv])
]) ])
RUBY_FUNC_ATTRIBUTE(noreturn, NORETURN) RUBY_FUNC_ATTRIBUTE(noreturn, NORETURN)
RUBY_FUNC_ATTRIBUTE(deprecated, DEPRECATED)
RUBY_FUNC_ATTRIBUTE(noinline, NOINLINE) RUBY_FUNC_ATTRIBUTE(noinline, NOINLINE)
AC_CACHE_CHECK([for RUBY_EXTERN], rb_cv_ruby_extern, AC_CACHE_CHECK([for RUBY_EXTERN], rb_cv_ruby_extern,

2
eval.c
View file

@ -8388,7 +8388,7 @@ rb_mod_autoload(mod, sym, file)
{ {
ID id = rb_to_id(sym); ID id = rb_to_id(sym);
Check_SafeStr(file); SafeStringValue(file);
rb_autoload(mod, id, RSTRING(file)->ptr); rb_autoload(mod, id, RSTRING(file)->ptr);
return Qnil; return Qnil;
} }

7
ruby.h
View file

@ -30,6 +30,9 @@ extern "C" {
#ifndef NORETURN #ifndef NORETURN
# define NORETURN(x) x # define NORETURN(x) x
#endif #endif
#ifndef DEPRECATED
# define DEPRECATED(x) x
#endif
#ifndef NOINLINE #ifndef NOINLINE
# define NOINLINE(x) x # define NOINLINE(x) x
#endif #endif
@ -239,7 +242,7 @@ char *rb_string_value_cstr _((volatile VALUE*));
#define StringValueCStr(v) rb_string_value_cstr(&(v)) #define StringValueCStr(v) rb_string_value_cstr(&(v))
void rb_check_safe_obj _((VALUE)); void rb_check_safe_obj _((VALUE));
void rb_check_safe_str _((VALUE)); DEPRECATED(void rb_check_safe_str _((VALUE)));
#define SafeStringValue(v) do {\ #define SafeStringValue(v) do {\
StringValue(v);\ StringValue(v);\
rb_check_safe_obj(v);\ rb_check_safe_obj(v);\
@ -290,7 +293,7 @@ double rb_num2dbl _((VALUE));
#define NUM2DBL(x) rb_num2dbl((VALUE)(x)) #define NUM2DBL(x) rb_num2dbl((VALUE)(x))
/* obsolete API - use StringValue() */ /* obsolete API - use StringValue() */
char *rb_str2cstr _((VALUE,long*)); DEPRECATED(char *rb_str2cstr _((VALUE,long*)));
/* obsolete API - use StringValuePtr() */ /* obsolete API - use StringValuePtr() */
#define STR2CSTR(x) rb_str2cstr((VALUE)(x),0) #define STR2CSTR(x) rb_str2cstr((VALUE)(x),0)

View file

@ -1,7 +1,7 @@
#define RUBY_VERSION "1.8.8" #define RUBY_VERSION "1.8.8"
#define RUBY_RELEASE_DATE "2009-07-18" #define RUBY_RELEASE_DATE "2009-07-19"
#define RUBY_VERSION_CODE 188 #define RUBY_VERSION_CODE 188
#define RUBY_RELEASE_CODE 20090718 #define RUBY_RELEASE_CODE 20090719
#define RUBY_PATCHLEVEL -1 #define RUBY_PATCHLEVEL -1
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 8 #define RUBY_VERSION_TEENY 8
#define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_YEAR 2009
#define RUBY_RELEASE_MONTH 7 #define RUBY_RELEASE_MONTH 7
#define RUBY_RELEASE_DAY 18 #define RUBY_RELEASE_DAY 19
#ifdef RUBY_EXTERN #ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[]; RUBY_EXTERN const char ruby_version[];