From 65a30eb3e75823eee745ba9709f99f548a4cc9ef Mon Sep 17 00:00:00 2001 From: matz Date: Tue, 11 Dec 2007 14:05:34 +0000 Subject: [PATCH] * pack.c (pack_pack): RDoc update. a patch from Gary Wright . [ruby-core:13998] * pack.c (pack_unpack): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14196 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ pack.c | 13 +++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 913cc9c969..112e8212c7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Tue Dec 11 23:04:17 2007 Yukihiro Matsumoto + + * pack.c (pack_pack): RDoc update. a patch from Gary Wright + . [ruby-core:13998] + + * pack.c (pack_unpack): ditto. + Tue Dec 11 16:37:47 2007 Tanaka Akira * encoding.c (rb_enc_ascget): renamed from rb_enc_get_ascii. diff --git a/pack.c b/pack.c index b1d7268850..e63c2325e6 100644 --- a/pack.c +++ b/pack.c @@ -395,8 +395,8 @@ static unsigned long utf8_to_uv(const char*,long*); * Directive Meaning * --------------------------------------------------------------- * @ | Moves to absolute position - * A | ASCII string (space padded, count is width) - * a | ASCII string (null padded, count is width) + * A | arbitrary binary string (space padded, count is width) + * a | arbitrary binary string (null padded, count is width) * B | Bit string (descending bit order) * b | Bit string (ascending bit order) * C | Unsigned char @@ -519,8 +519,8 @@ pack_pack(VALUE ary, VALUE fmt) switch (type) { case 'a': /* arbitrary binary string (null padded) */ - case 'A': /* ASCII string (space padded) */ - case 'Z': /* null terminated ASCII string */ + case 'A': /* arbitrary binary string (ASCII space padded) */ + case 'Z': /* null terminated string */ if (plen >= len) { rb_str_buf_cat(res, ptr, len); if (p[-1] == '*' && type == 'Z') @@ -1176,9 +1176,10 @@ infected_str_new(const char *ptr, long len, VALUE str) * * Format | Returns | Function * -------+---------+----------------------------------------- - * A | String | with trailing nulls and spaces removed + * A | String | arbitrary binary string with trailing + * | | nulls and ASCII spaces removed * -------+---------+----------------------------------------- - * a | String | string + * a | String | arbitrary binary string * -------+---------+----------------------------------------- * B | String | extract bits from each character (msb first) * -------+---------+-----------------------------------------