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

* enc/utf_16le.c: surpress warning: shorten-64-to-32.

Browse Source 
* ext/dbm/dbm.c: ditto.

* ext/gdbm/gdbm.c: ditto.

* parse.y (Init_ripper): surpress warning: unused value.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31141 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2011-03-21 21:23:42 +00:00
parent 80b64d145a
commit 78df33a0c1
5 changed files with 36 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
Tue Mar 22 06:19:42 2011 NARUSE, Yui <naruse@ruby-lang.org>
* enc/utf_16le.c: surpress warning: shorten-64-to-32.
* ext/dbm/dbm.c: ditto.
* ext/gdbm/gdbm.c: ditto.
* parse.y (Init_ripper): surpress warning: unused value.
Mon Mar 21 11:21:32 2011 Shota Fukumori <sorah@tubusu.net> Mon Mar 21 11:21:32 2011 Shota Fukumori <sorah@tubusu.net>
* lib/test/unit.rb: Refactoring. Unified if and elsif. * lib/test/unit.rb: Refactoring. Unified if and elsif.

2
enc/utf_16le.c
View File

@ -56,7 +56,7 @@ static int
utf16le_mbc_enc_len(const UChar* p, const OnigUChar* e, utf16le_mbc_enc_len(const UChar* p, const OnigUChar* e,
OnigEncoding enc ARG_UNUSED) OnigEncoding enc ARG_UNUSED)
{ {
ptrdiff_t len = e - p; int len = (int)(e - p);
UChar byte; UChar byte;
if (len < 2) if (len < 2)
return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(1); return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(1);

22
ext/dbm/dbm.c
View File

@ -200,7 +200,7 @@ fdbm_fetch(VALUE obj, VALUE keystr, VALUE ifnone)
ExportStringValue(keystr); ExportStringValue(keystr);
key.dptr = RSTRING_PTR(keystr); key.dptr = RSTRING_PTR(keystr);
key.dsize = RSTRING_LEN(keystr); key.dsize = (int)RSTRING_LEN(keystr);
GetDBM2(obj, dbmp, dbm); GetDBM2(obj, dbmp, dbm);
value = dbm_fetch(dbm, key); value = dbm_fetch(dbm, key);
@ -261,12 +261,12 @@ fdbm_key(VALUE obj, VALUE valstr)
ExportStringValue(valstr); ExportStringValue(valstr);
val.dptr = RSTRING_PTR(valstr); val.dptr = RSTRING_PTR(valstr);
val.dsize = RSTRING_LEN(valstr); val.dsize = (int)RSTRING_LEN(valstr);
GetDBM2(obj, dbmp, dbm); GetDBM2(obj, dbmp, dbm);
for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) { for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
val = dbm_fetch(dbm, key); val = dbm_fetch(dbm, key);
if ((long)val.dsize == RSTRING_LEN(valstr) && if ((long)val.dsize == (int)RSTRING_LEN(valstr) &&
memcmp(val.dptr, RSTRING_PTR(valstr), val.dsize) == 0) { memcmp(val.dptr, RSTRING_PTR(valstr), val.dsize) == 0) {
return rb_tainted_str_new(key.dptr, key.dsize); return rb_tainted_str_new(key.dptr, key.dsize);
} }
@ -356,7 +356,7 @@ fdbm_delete(VALUE obj, VALUE keystr)
fdbm_modify(obj); fdbm_modify(obj);
ExportStringValue(keystr); ExportStringValue(keystr);
key.dptr = RSTRING_PTR(keystr); key.dptr = RSTRING_PTR(keystr);
key.dsize = RSTRING_LEN(keystr); key.dsize = (int)RSTRING_LEN(keystr);
GetDBM2(obj, dbmp, dbm); GetDBM2(obj, dbmp, dbm);
@ -447,7 +447,7 @@ fdbm_delete_if(VALUE obj)
keystr = RARRAY_PTR(ary)[i]; keystr = RARRAY_PTR(ary)[i];
ExportStringValue(keystr); ExportStringValue(keystr);
key.dptr = RSTRING_PTR(keystr); key.dptr = RSTRING_PTR(keystr);
key.dsize = RSTRING_LEN(keystr); key.dsize = (int)RSTRING_LEN(keystr);
if (dbm_delete(dbm, key)) { if (dbm_delete(dbm, key)) {
rb_raise(rb_eDBMError, "dbm_delete failed"); rb_raise(rb_eDBMError, "dbm_delete failed");
} }
@ -574,10 +574,10 @@ fdbm_store(VALUE obj, VALUE keystr, VALUE valstr)
valstr = rb_obj_as_string(valstr); valstr = rb_obj_as_string(valstr);
key.dptr = RSTRING_PTR(keystr); key.dptr = RSTRING_PTR(keystr);
key.dsize = RSTRING_LEN(keystr); key.dsize = (int)RSTRING_LEN(keystr);
val.dptr = RSTRING_PTR(valstr); val.dptr = RSTRING_PTR(valstr);
val.dsize = RSTRING_LEN(valstr); val.dsize = (int)RSTRING_LEN(valstr);
GetDBM2(obj, dbmp, dbm); GetDBM2(obj, dbmp, dbm);
dbmp->di_size = -1; dbmp->di_size = -1;
@ -640,7 +640,7 @@ fdbm_empty_p(VALUE obj)
} }
} }
else { else {
i = dbmp->di_size; i = (int)dbmp->di_size;
} }
if (i == 0) return Qtrue; if (i == 0) return Qtrue;
return Qfalse; return Qfalse;
@ -786,7 +786,7 @@ fdbm_has_key(VALUE obj, VALUE keystr)
ExportStringValue(keystr); ExportStringValue(keystr);
key.dptr = RSTRING_PTR(keystr); key.dptr = RSTRING_PTR(keystr);
key.dsize = RSTRING_LEN(keystr); key.dsize = (int)RSTRING_LEN(keystr);
GetDBM2(obj, dbmp, dbm); GetDBM2(obj, dbmp, dbm);
val = dbm_fetch(dbm, key); val = dbm_fetch(dbm, key);
@ -810,12 +810,12 @@ fdbm_has_value(VALUE obj, VALUE valstr)
ExportStringValue(valstr); ExportStringValue(valstr);
val.dptr = RSTRING_PTR(valstr); val.dptr = RSTRING_PTR(valstr);
val.dsize = RSTRING_LEN(valstr); val.dsize = (int)RSTRING_LEN(valstr);
GetDBM2(obj, dbmp, dbm); GetDBM2(obj, dbmp, dbm);
for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) { for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
val = dbm_fetch(dbm, key); val = dbm_fetch(dbm, key);
if (val.dsize == RSTRING_LEN(valstr) && if (val.dsize == (int)RSTRING_LEN(valstr) &&
memcmp(val.dptr, RSTRING_PTR(valstr), val.dsize) == 0) memcmp(val.dptr, RSTRING_PTR(valstr), val.dsize) == 0)
return Qtrue; return Qtrue;
} }

22
ext/gdbm/gdbm.c
View File

@ -300,7 +300,7 @@ rb_gdbm_fetch2(GDBM_FILE dbm, VALUE keystr)
StringValue(keystr); StringValue(keystr);
key.dptr = RSTRING_PTR(keystr); key.dptr = RSTRING_PTR(keystr);
key.dsize = RSTRING_LEN(keystr); key.dsize = (int)RSTRING_LEN(keystr);
return rb_gdbm_fetch(dbm, key); return rb_gdbm_fetch(dbm, key);
} }
@ -338,7 +338,7 @@ rb_gdbm_nextkey(GDBM_FILE dbm, VALUE keystr)
VALUE str; VALUE str;
key.dptr = RSTRING_PTR(keystr); key.dptr = RSTRING_PTR(keystr);
key.dsize = RSTRING_LEN(keystr); key.dsize = (int)RSTRING_LEN(keystr);
key2 = gdbm_nextkey(dbm, key); key2 = gdbm_nextkey(dbm, key);
if (key2.dptr == 0) if (key2.dptr == 0)
return Qnil; return Qnil;
@ -416,9 +416,9 @@ fgdbm_key(VALUE obj, VALUE valstr)
valstr2 = rb_gdbm_fetch2(dbm, keystr); valstr2 = rb_gdbm_fetch2(dbm, keystr);
if (!NIL_P(valstr2) && if (!NIL_P(valstr2) &&
RSTRING_LEN(valstr) == RSTRING_LEN(valstr2) && (int)RSTRING_LEN(valstr) == (int)RSTRING_LEN(valstr2) &&
memcmp(RSTRING_PTR(valstr), RSTRING_PTR(valstr2), memcmp(RSTRING_PTR(valstr), RSTRING_PTR(valstr2),
RSTRING_LEN(valstr)) == 0) { (int)RSTRING_LEN(valstr)) == 0) {
return keystr; return keystr;
} }
} }
@ -499,7 +499,7 @@ rb_gdbm_delete(VALUE obj, VALUE keystr)
rb_gdbm_modify(obj); rb_gdbm_modify(obj);
StringValue(keystr); StringValue(keystr);
key.dptr = RSTRING_PTR(keystr); key.dptr = RSTRING_PTR(keystr);
key.dsize = RSTRING_LEN(keystr); key.dsize = (int)RSTRING_LEN(keystr);
GetDBM2(obj, dbmp, dbm); GetDBM2(obj, dbmp, dbm);
if (!gdbm_exists(dbm, key)) { if (!gdbm_exists(dbm, key)) {
@ -591,7 +591,7 @@ fgdbm_delete_if(VALUE obj)
for (i = 0; i < RARRAY_LEN(ary); i++) for (i = 0; i < RARRAY_LEN(ary); i++)
rb_gdbm_delete(obj, RARRAY_PTR(ary)[i]); rb_gdbm_delete(obj, RARRAY_PTR(ary)[i]);
if (status) rb_jump_tag(status); if (status) rb_jump_tag(status);
if (n > 0) dbmp->di_size = n - RARRAY_LEN(ary); if (n > 0) dbmp->di_size = n - (int)RARRAY_LEN(ary);
return obj; return obj;
} }
@ -683,10 +683,10 @@ fgdbm_store(VALUE obj, VALUE keystr, VALUE valstr)
StringValue(valstr); StringValue(valstr);
key.dptr = RSTRING_PTR(keystr); key.dptr = RSTRING_PTR(keystr);
key.dsize = RSTRING_LEN(keystr); key.dsize = (int)RSTRING_LEN(keystr);
val.dptr = RSTRING_PTR(valstr); val.dptr = RSTRING_PTR(valstr);
val.dsize = RSTRING_LEN(valstr); val.dsize = (int)RSTRING_LEN(valstr);
GetDBM2(obj, dbmp, dbm); GetDBM2(obj, dbmp, dbm);
dbmp->di_size = -1; dbmp->di_size = -1;
@ -942,7 +942,7 @@ fgdbm_has_key(VALUE obj, VALUE keystr)
StringValue(keystr); StringValue(keystr);
key.dptr = RSTRING_PTR(keystr); key.dptr = RSTRING_PTR(keystr);
key.dsize = RSTRING_LEN(keystr); key.dsize = (int)RSTRING_LEN(keystr);
GetDBM2(obj, dbmp, dbm); GetDBM2(obj, dbmp, dbm);
if (gdbm_exists(dbm, key)) if (gdbm_exists(dbm, key))
@ -973,9 +973,9 @@ fgdbm_has_value(VALUE obj, VALUE valstr)
valstr2 = rb_gdbm_fetch2(dbm, keystr); valstr2 = rb_gdbm_fetch2(dbm, keystr);
if (!NIL_P(valstr2) && if (!NIL_P(valstr2) &&
RSTRING_LEN(valstr) == RSTRING_LEN(valstr2) && (int)RSTRING_LEN(valstr) == (int)RSTRING_LEN(valstr2) &&
memcmp(RSTRING_PTR(valstr), RSTRING_PTR(valstr2), memcmp(RSTRING_PTR(valstr), RSTRING_PTR(valstr2),
RSTRING_LEN(valstr)) == 0) { (int)RSTRING_LEN(valstr)) == 0) {
return Qtrue; return Qtrue;
} }
} }

4
parse.y
View File

@ -10741,7 +10741,7 @@ Init_ripper(void)
ripper_init_eventids1(Ripper); ripper_init_eventids1(Ripper);
ripper_init_eventids2(Ripper); ripper_init_eventids2(Ripper);
/* ensure existing in symbol table */ /* ensure existing in symbol table */
rb_intern("||"); (void)rb_intern("||");
rb_intern("&&"); (void)rb_intern("&&");
} }
#endif /* RIPPER */ #endif /* RIPPER */