1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* hash.c (recursive_hash): remove unused local variable.

Browse Source 
* parse.y (parser_yylex): ditto.

* parse.y (rb_gc_mark_symbols): fix unmatched prototype .

* file.c (rb_get_path): check NUL byte in the path string.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11018 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2006-09-25 05:57:37 +00:00
parent 8366008bcf
commit 5cc2093ccd
5 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
Mon Sep 25 11:26:25 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* hash.c (recursive_hash): remove unused local variable.
* parse.y (parser_yylex): ditto.
* parse.y (rb_gc_mark_symbols): fix unmatched prototype .
* file.c (rb_get_path): check NUL byte in the path string.
Mon Sep 25 08:14:43 2006 Yukihiro Matsumoto <matz@ruby-lang.org> Mon Sep 25 08:14:43 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* array.c (rb_ary_shift): should clear shifting top element. * array.c (rb_ary_shift): should clear shifting top element.

5
file.c
View File

@ -111,11 +111,10 @@ rb_get_path(VALUE obj)
to_path = rb_intern("to_path"); to_path = rb_intern("to_path");
} }
if (rb_respond_to(obj, to_path)) { if (rb_respond_to(obj, to_path)) {
obj = rb_funcall(obj, to_path, 0, 0); tmp = rb_funcall(obj, to_path, 0, 0);
} }
tmp = obj;
StringValueCStr(tmp);
exit: exit:
StringValueCStr(tmp);
if (obj != tmp) { if (obj != tmp) {
rb_check_safe_obj(tmp); rb_check_safe_obj(tmp);
} }

1
hash.c
View File

@ -1416,7 +1416,6 @@ static VALUE
recursive_hash(VALUE hash, VALUE dummy, int recur) recursive_hash(VALUE hash, VALUE dummy, int recur)
{ {
int hval; int hval;
VALUE n;
if (recur) { if (recur) {
return LONG2FIX(0); return LONG2FIX(0);

1
intern.h
View File

@ -401,6 +401,7 @@ int rb_is_local_id(ID);
int rb_is_junk_id(ID); int rb_is_junk_id(ID);
int rb_symname_p(const char*); int rb_symname_p(const char*);
int rb_sym_interned_p(VALUE); int rb_sym_interned_p(VALUE);
void rb_gc_mark_symbols(void);
VALUE rb_backref_get(void); VALUE rb_backref_get(void);
void rb_backref_set(VALUE); void rb_backref_set(VALUE);
VALUE rb_lastline_get(void); VALUE rb_lastline_get(void);

3
parse.y
View File

@ -6029,7 +6029,6 @@ parser_yylex(struct parser_params *parser)
return tOP_ASGN; return tOP_ASGN;
} }
if (c == '>') { if (c == '>') {
enum lex_state_e state = lex_state;
lex_state = EXPR_ARG; lex_state = EXPR_ARG;
return tLAMBDA; return tLAMBDA;
} }
@ -8275,7 +8274,7 @@ Init_sym(void)
} }
void void
rb_gc_mark_symbols(int lev) rb_gc_mark_symbols(void)
{ {
rb_mark_tbl(global_symbols.id_sym); rb_mark_tbl(global_symbols.id_sym);
} }