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

* pack.c (pack_pack): Use rb_integer_pack_2comp.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41249 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2013-06-12 03:35:54 +00:00
parent 174e3fb6e4
commit ff6104ba62
2 changed files with 8 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Wed Jun 12 12:35:13 2013 Tanaka Akira <akr@fsij.org>
* pack.c (pack_pack): Use rb_integer_pack_2comp.
Wed Jun 12 12:07:04 2013 Tanaka Akira <akr@fsij.org> Wed Jun 12 12:07:04 2013 Tanaka Akira <akr@fsij.org>
* sprintf.c (rb_str_format): Fix a dynamic format string. * sprintf.c (rb_str_format): Fix a dynamic format string.

27
pack.c
View File

@ -796,31 +796,12 @@ pack_pack(VALUE ary, VALUE fmt)
if (integer_size > MAX_INTEGER_PACK_SIZE) if (integer_size > MAX_INTEGER_PACK_SIZE)
rb_bug("unexpected intger size for pack: %d", integer_size); rb_bug("unexpected intger size for pack: %d", integer_size);
while (len-- > 0) { while (len-- > 0) {
union { char intbuf[MAX_INTEGER_PACK_SIZE];
unsigned long i[(MAX_INTEGER_PACK_SIZE+SIZEOF_LONG-1)/SIZEOF_LONG];
char a[(MAX_INTEGER_PACK_SIZE+SIZEOF_LONG-1)/SIZEOF_LONG*SIZEOF_LONG];
} v;
int num_longs = (integer_size+SIZEOF_LONG-1)/SIZEOF_LONG;
int i;
from = NEXTFROM; from = NEXTFROM;
rb_big_pack(from, v.i, num_longs); rb_integer_pack_2comp(from, intbuf, integer_size, 1, 0,
if (bigendian_p) { bigendian_p ? INTEGER_PACK_BIG_ENDIAN : INTEGER_PACK_LITTLE_ENDIAN);
for (i = 0; i < num_longs/2; i++) { rb_str_buf_cat(res, intbuf, integer_size);
unsigned long t = v.i[i];
v.i[i] = v.i[num_longs-1-i];
v.i[num_longs-1-i] = t;
}
}
if (bigendian_p != BIGENDIAN_P()) {
for (i = 0; i < num_longs; i++)
v.i[i] = swapl(v.i[i]);
}
rb_str_buf_cat(res,
bigendian_p ?
v.a + sizeof(long)*num_longs - integer_size :
v.a,
integer_size);
} }
break; break;
} }