ruby-changes:10874
From: shyouhei <ko1@a...>
Date: Thu, 19 Feb 2009 18:01:48 +0900 (JST)
Subject: [ruby-changes:10874] Ruby:r22448 (ruby_1_8_6): merge revision(s) 20581:
shyouhei 2009-02-19 18:01:35 +0900 (Thu, 19 Feb 2009) New Revision: 22448 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=22448 Log: merge revision(s) 20581: * pack.c (pack_pack): fixed odd act of 'm*', 'M*', and 'P*'. just ignores '*' in these cases. [ruby-dev:37289] Modified files: branches/ruby_1_8_6/ChangeLog branches/ruby_1_8_6/pack.c branches/ruby_1_8_6/version.h Index: ruby_1_8_6/ChangeLog =================================================================== --- ruby_1_8_6/ChangeLog (revision 22447) +++ ruby_1_8_6/ChangeLog (revision 22448) @@ -1,3 +1,9 @@ +Thu Feb 19 17:52:42 2009 Yuki Sonoda (Yugui) <yugui@y...> + + * pack.c (pack_pack): fixed odd act of 'm*', 'M*', and 'P*'. + just ignores '*' in these cases. + [ruby-dev:37289] + Thu Feb 19 17:24:30 2009 Nobuyoshi Nakada <nobu@r...> * pack.c (pack_pack): fixed length for odd length string. Index: ruby_1_8_6/version.h =================================================================== --- ruby_1_8_6/version.h (revision 22447) +++ ruby_1_8_6/version.h (revision 22448) @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2009-02-19" #define RUBY_VERSION_CODE 186 #define RUBY_RELEASE_CODE 20090219 -#define RUBY_PATCHLEVEL 342 +#define RUBY_PATCHLEVEL 343 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 Index: ruby_1_8_6/pack.c =================================================================== --- ruby_1_8_6/pack.c (revision 22447) +++ ruby_1_8_6/pack.c (revision 22448) @@ -494,7 +494,9 @@ } } if (*p == '*') { /* set data length */ - len = strchr("@Xxu", type) ? 0 : items; + len = strchr("@Xxu", type) ? 0 + : strchr("PMm", type) ? 1 + : items; p++; } else if (ISDIGIT(*p)) { -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/