diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | enc/unicode.c | 1 | ||||
| -rw-r--r-- | thread.c | 1 | ||||
| -rw-r--r-- | variable.c | 2 | ||||
| -rw-r--r-- | vm.c | 12 |
5 files changed, 13 insertions, 12 deletions
@@ -1,3 +1,12 @@ +Mon Oct 4 07:16:55 2010 NARUSE, Yui <naruse@ruby-lang.org> + + * enc/unicode.c (onigenc_unicode_property_name_to_ctype): + remove useless assignment. + + * vm.c (vm_make_proc_from_block): ditto. + + * variable.c (rb_ivar_count): ditto. + Mon Oct 4 06:40:24 2010 NARUSE, Yui <naruse@ruby-lang.org> * Makefile.in (clean-rdoc): Don't use \ in variable expantion. diff --git a/enc/unicode.c b/enc/unicode.c index e3a314b6f3..3ffe2057cb 100644 --- a/enc/unicode.c +++ b/enc/unicode.c @@ -2091,7 +2091,6 @@ onigenc_unicode_property_name_to_ctype(OnigEncoding enc, UChar* name, UChar* end UChar *p; OnigCodePoint code; - p = name; len = 0; for (p = name; p < end; p += enclen(enc, p, end)) { code = ONIGENC_MBC_TO_CODE(enc, p, end); @@ -1387,7 +1387,6 @@ ruby_thread_stack_overflow(rb_thread_t *th) { th->raised_flag = 0; #ifdef USE_SIGALTSTACK - th->raised_flag = 0; rb_exc_raise(sysstack_error); #else th->errinfo = sysstack_error; diff --git a/variable.c b/variable.c index 5333aa2d92..6c653ca1d4 100644 --- a/variable.c +++ b/variable.c @@ -1204,7 +1204,7 @@ rb_ivar_count(VALUE obj) switch (TYPE(obj)) { case T_OBJECT: if ((tbl = ROBJECT_IV_INDEX_TBL(obj)) != 0) { - st_index_t i, num = tbl->num_entries, count = 0; + st_index_t i, count, num = tbl->num_entries; const VALUE *const ivptr = ROBJECT_IVPTR(obj); for (i = count = 0; i < num; ++i) { if (ivptr[i] != Qundef) { @@ -453,16 +453,10 @@ rb_vm_stack_to_heap(rb_thread_t * const th) static VALUE vm_make_proc_from_block(rb_thread_t *th, rb_block_t *block) { - VALUE proc = block->proc; - - if (block->proc) { - return block->proc; + if (!block->proc) { + block->proc = rb_vm_make_proc(th, block, rb_cProc); } - - proc = rb_vm_make_proc(th, block, rb_cProc); - block->proc = proc; - - return proc; + return block->proc; } VALUE |