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

* pack.c (pack_pack, pack_unpack): suppressed warnings.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26765 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2010-02-26 05:17:13 +00:00
parent 59e4e93ef7
commit aec58680ec
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Fri Feb 26 14:17:09 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* pack.c (pack_pack, pack_unpack): suppressed warnings.
Fri Feb 26 07:44:51 2010 NARUSE, Yui <naruse@ruby-lang.org> Fri Feb 26 07:44:51 2010 NARUSE, Yui <naruse@ruby-lang.org>
* ext/dl: revert dl with libffi because it can't run on mswin now. * ext/dl: revert dl with libffi because it can't run on mswin now.

25
pack.c
View File

@ -647,13 +647,13 @@ pack_pack(VALUE ary, VALUE fmt)
case 'i': /* signed int */ case 'i': /* signed int */
signed_p = 1; signed_p = 1;
integer_size = sizeof(int); integer_size = (int)sizeof(int);
bigendian_p = BIGENDIAN_P(); bigendian_p = BIGENDIAN_P();
goto pack_integer; goto pack_integer;
case 'I': /* unsigned int */ case 'I': /* unsigned int */
signed_p = 0; signed_p = 0;
integer_size = sizeof(int); integer_size = (int)sizeof(int);
bigendian_p = BIGENDIAN_P(); bigendian_p = BIGENDIAN_P();
goto pack_integer; goto pack_integer;
@ -1139,16 +1139,19 @@ hex2num(char c)
} }
#define PACK_LENGTH_ADJUST_SIZE(sz) do { \ #define PACK_LENGTH_ADJUST_SIZE(sz) do { \
tmp = 0; \ tmp_len = 0; \
if (len > (long)((send-s)/sz)) { \ if (len > (long)((send-s)/sz)) { \
if (!star) { \ if (!star) { \
tmp = len-(send-s)/sz; \ tmp_len = len-(send-s)/sz; \
} \ } \
len = (send-s)/sz; \ len = (send-s)/sz; \
} \ } \
} while (0) } while (0)
#define PACK_ITEM_ADJUST() while (tmp--) rb_ary_push(ary, Qnil) #define PACK_ITEM_ADJUST() do { \
if (tmp_len > 0) \
rb_ary_store(ary, RARRAY_LEN(ary)+tmp_len-1, Qnil); \
} while (0)
static VALUE static VALUE
infected_str_new(const char *ptr, long len, VALUE str) infected_str_new(const char *ptr, long len, VALUE str)
@ -1260,8 +1263,8 @@ pack_unpack(VALUE str, VALUE fmt)
char *p, *pend; char *p, *pend;
VALUE ary; VALUE ary;
char type; char type;
long len; long len, tmp_len;
int tmp, star; int star;
#ifdef NATINT_PACK #ifdef NATINT_PACK
int natint; /* native integer */ int natint; /* native integer */
#endif #endif
@ -1485,13 +1488,13 @@ pack_unpack(VALUE str, VALUE fmt)
case 'i': case 'i':
signed_p = 1; signed_p = 1;
integer_size = sizeof(int); integer_size = (int)sizeof(int);
bigendian_p = BIGENDIAN_P(); bigendian_p = BIGENDIAN_P();
goto unpack_integer; goto unpack_integer;
case 'I': case 'I':
signed_p = 0; signed_p = 0;
integer_size = sizeof(int); integer_size = (int)sizeof(int);
bigendian_p = BIGENDIAN_P(); bigendian_p = BIGENDIAN_P();
goto unpack_integer; goto unpack_integer;
@ -1955,7 +1958,7 @@ pack_unpack(VALUE str, VALUE fmt)
break; break;
case 'P': case 'P':
if (sizeof(char *) <= send - s) { if (sizeof(char *) <= (size_t)(send - s)) {
VALUE tmp = Qnil; VALUE tmp = Qnil;
char *t; char *t;
@ -1995,7 +1998,7 @@ pack_unpack(VALUE str, VALUE fmt)
if (len > (long)((send - s) / sizeof(char *))) if (len > (long)((send - s) / sizeof(char *)))
len = (send - s) / sizeof(char *); len = (send - s) / sizeof(char *);
while (len-- > 0) { while (len-- > 0) {
if (send - s < sizeof(char *)) if ((size_t)(send - s) < sizeof(char *))
break; break;
else { else {
VALUE tmp = Qnil; VALUE tmp = Qnil;