1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* pack.c (pack_unpack): fix v and V with big endian.

Browse Source 
[1].pack("V").unpack("V") was [4294967296].


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18106 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
mame 2008-07-17 11:42:17 +00:00
parent 871c83dddf
commit df5604ce5d
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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> 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 * pack.c (pack_pack): fix i! with big endian. [1].pack("i!") was

4
pack.c
View File

@ -1617,7 +1617,7 @@ pack_unpack(VALUE str, VALUE fmt)
PACK_LENGTH_ADJUST(unsigned short,2); PACK_LENGTH_ADJUST(unsigned short,2);
while (len-- > 0) { while (len-- > 0) {
unsigned short tmp = 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); s += NATINT_LEN(unsigned short,2);
UNPACK_PUSH(UINT2NUM(vtohs(tmp))); UNPACK_PUSH(UINT2NUM(vtohs(tmp)));
} }
@ -1628,7 +1628,7 @@ pack_unpack(VALUE str, VALUE fmt)
PACK_LENGTH_ADJUST(unsigned long,4); PACK_LENGTH_ADJUST(unsigned long,4);
while (len-- > 0) { while (len-- > 0) {
unsigned long tmp = 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); s += NATINT_LEN(long,4);
UNPACK_PUSH(ULONG2NUM(vtohl(tmp))); UNPACK_PUSH(ULONG2NUM(vtohl(tmp)));
} }