Permalink
Browse files

merge revision(s) 20581:

	* pack.c (pack_pack): fixed odd act of 'm*', 'M*', and 'P*'.
	  just ignores '*' in these cases.
	  [ruby-dev:37289]


git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_7@22450 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
1 parent d735a87 commit dd52fe61f92855a3598d68aca0e5b59e7bffb552 @shyouhei shyouhei committed Feb 19, 2009
Showing with 10 additions and 2 deletions.
  1. +6 −0 ChangeLog
  2. +3 −1 pack.c
  3. +1 −1 version.h
View
@@ -1,3 +1,9 @@
+Thu Feb 19 18:02:10 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
+
+ * pack.c (pack_pack): fixed odd act of 'm*', 'M*', and 'P*'.
+ just ignores '*' in these cases.
+ [ruby-dev:37289]
+
Thu Feb 19 17:26:11 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* pack.c (pack_pack): fixed length for odd length string.
View
@@ -494,7 +494,9 @@ pack_pack(ary, fmt)
}
}
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)) {
View
@@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2009-02-19"
#define RUBY_VERSION_CODE 187
#define RUBY_RELEASE_CODE 20090219
-#define RUBY_PATCHLEVEL 129
+#define RUBY_PATCHLEVEL 130
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8

0 comments on commit dd52fe6

Please sign in to comment.