From 139ab718de87af8ca9a3c83da9ca4f59c9cdb7e8 Mon Sep 17 00:00:00 2001 From: yugui Date: Mon, 20 Dec 2010 13:22:32 +0000 Subject: merges r29804 from trunk into ruby_1_9_2. -- * pack.c (PACK_ITEM_ADJUST): return nil not result array and yield values if block is given. [ruby-core:33193] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30257 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- pack.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pack.c') diff --git a/pack.c b/pack.c index be42c6293e..d659266a41 100644 --- a/pack.c +++ b/pack.c @@ -1189,7 +1189,7 @@ hex2num(char c) } while (0) #define PACK_ITEM_ADJUST() do { \ - if (tmp_len > 0) \ + if (tmp_len > 0 && !block_p) \ rb_ary_store(ary, RARRAY_LEN(ary)+tmp_len-1, Qnil); \ } while (0) -- cgit v1.2.3