diff options
| author | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-07-17 11:42:17 +0000 |
|---|---|---|
| committer | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-07-17 11:42:17 +0000 |
| commit | 1cf42d35dd4e9d4fc20a6873bf389eff028b60a3 (patch) | |
| tree | 5e7e28646cc7477d499930702d9915ce6d4b44d1 | |
| parent | a87a4b2a29ad7dee09b29064549ab9aa9620c286 (diff) | |
| download | ruby-1cf42d35dd4e9d4fc20a6873bf389eff028b60a3.tar.gz ruby-1cf42d35dd4e9d4fc20a6873bf389eff028b60a3.tar.xz ruby-1cf42d35dd4e9d4fc20a6873bf389eff028b60a3.zip | |
* pack.c (pack_unpack): fix v and V with big endian.
[1].pack("V").unpack("V") was [4294967296].
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@18106 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | pack.c | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Thu Jul 17 20:41:42 2008 Yusuke Endoh <mame@tsg.ne.jp> + + * pack.c (pack_unpack): fix v and V with big endian. + [1].pack("V").unpack("V") was [4294967296]. + Thu Jul 17 20:35:03 2008 Yusuke Endoh <mame@tsg.ne.jp> * pack.c (pack_pack): fix i! with big endian. [1].pack("i!") was @@ -1617,7 +1617,7 @@ pack_unpack(VALUE str, VALUE fmt) PACK_LENGTH_ADJUST(unsigned short,2); while (len-- > 0) { unsigned short tmp = 0; - memcpy(OFF16(&tmp), s, NATINT_LEN(unsigned short,2)); + memcpy(&tmp, s, NATINT_LEN(unsigned short,2)); s += NATINT_LEN(unsigned short,2); UNPACK_PUSH(UINT2NUM(vtohs(tmp))); } @@ -1628,7 +1628,7 @@ pack_unpack(VALUE str, VALUE fmt) PACK_LENGTH_ADJUST(unsigned long,4); while (len-- > 0) { unsigned long tmp = 0; - memcpy(OFF32(&tmp), s, NATINT_LEN(long,4)); + memcpy(&tmp, s, NATINT_LEN(long,4)); s += NATINT_LEN(long,4); UNPACK_PUSH(ULONG2NUM(vtohl(tmp))); } |