ruby-changes:19102
From: naruse <ko1@a...>
Date: Tue, 22 Mar 2011 09:22:52 +0900 (JST)
Subject: [ruby-changes:19102] Ruby:r31141 (trunk): * enc/utf_16le.c: surpress warning: shorten-64-to-32.
naruse 2011-03-22 06:23:42 +0900 (Tue, 22 Mar 2011) New Revision: 31141 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=31141 Log: * 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. Modified files: trunk/ChangeLog trunk/enc/utf_16le.c trunk/ext/dbm/dbm.c trunk/ext/gdbm/gdbm.c trunk/parse.y Index: ChangeLog =================================================================== --- ChangeLog (revision 31140) +++ ChangeLog (revision 31141) @@ -1,3 +1,14 @@ +Tue Mar 22 06:19:42 2011 NARUSE, Yui <naruse@r...> + + * 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@t...> * lib/test/unit.rb: Refactoring. Unified if and elsif. Index: enc/utf_16le.c =================================================================== --- enc/utf_16le.c (revision 31140) +++ enc/utf_16le.c (revision 31141) @@ -56,7 +56,7 @@ utf16le_mbc_enc_len(const UChar* p, const OnigUChar* e, OnigEncoding enc ARG_UNUSED) { - ptrdiff_t len = e - p; + int len = (int)(e - p); UChar byte; if (len < 2) return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(1); Index: parse.y =================================================================== --- parse.y (revision 31140) +++ parse.y (revision 31141) @@ -10741,7 +10741,7 @@ ripper_init_eventids1(Ripper); ripper_init_eventids2(Ripper); /* ensure existing in symbol table */ - rb_intern("||"); - rb_intern("&&"); + (void)rb_intern("||"); + (void)rb_intern("&&"); } #endif /* RIPPER */ Index: ext/dbm/dbm.c =================================================================== --- ext/dbm/dbm.c (revision 31140) +++ ext/dbm/dbm.c (revision 31141) @@ -200,7 +200,7 @@ ExportStringValue(keystr); key.dptr = RSTRING_PTR(keystr); - key.dsize = RSTRING_LEN(keystr); + key.dsize = (int)RSTRING_LEN(keystr); GetDBM2(obj, dbmp, dbm); value = dbm_fetch(dbm, key); @@ -261,12 +261,12 @@ ExportStringValue(valstr); val.dptr = RSTRING_PTR(valstr); - val.dsize = RSTRING_LEN(valstr); + val.dsize = (int)RSTRING_LEN(valstr); GetDBM2(obj, dbmp, dbm); for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) { 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) { return rb_tainted_str_new(key.dptr, key.dsize); } @@ -356,7 +356,7 @@ fdbm_modify(obj); ExportStringValue(keystr); key.dptr = RSTRING_PTR(keystr); - key.dsize = RSTRING_LEN(keystr); + key.dsize = (int)RSTRING_LEN(keystr); GetDBM2(obj, dbmp, dbm); @@ -447,7 +447,7 @@ keystr = RARRAY_PTR(ary)[i]; ExportStringValue(keystr); key.dptr = RSTRING_PTR(keystr); - key.dsize = RSTRING_LEN(keystr); + key.dsize = (int)RSTRING_LEN(keystr); if (dbm_delete(dbm, key)) { rb_raise(rb_eDBMError, "dbm_delete failed"); } @@ -574,10 +574,10 @@ valstr = rb_obj_as_string(valstr); key.dptr = RSTRING_PTR(keystr); - key.dsize = RSTRING_LEN(keystr); + key.dsize = (int)RSTRING_LEN(keystr); val.dptr = RSTRING_PTR(valstr); - val.dsize = RSTRING_LEN(valstr); + val.dsize = (int)RSTRING_LEN(valstr); GetDBM2(obj, dbmp, dbm); dbmp->di_size = -1; @@ -640,7 +640,7 @@ } } else { - i = dbmp->di_size; + i = (int)dbmp->di_size; } if (i == 0) return Qtrue; return Qfalse; @@ -786,7 +786,7 @@ ExportStringValue(keystr); key.dptr = RSTRING_PTR(keystr); - key.dsize = RSTRING_LEN(keystr); + key.dsize = (int)RSTRING_LEN(keystr); GetDBM2(obj, dbmp, dbm); val = dbm_fetch(dbm, key); @@ -810,12 +810,12 @@ ExportStringValue(valstr); val.dptr = RSTRING_PTR(valstr); - val.dsize = RSTRING_LEN(valstr); + val.dsize = (int)RSTRING_LEN(valstr); GetDBM2(obj, dbmp, dbm); for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) { 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) return Qtrue; } Index: ext/gdbm/gdbm.c =================================================================== --- ext/gdbm/gdbm.c (revision 31140) +++ ext/gdbm/gdbm.c (revision 31141) @@ -300,7 +300,7 @@ StringValue(keystr); key.dptr = RSTRING_PTR(keystr); - key.dsize = RSTRING_LEN(keystr); + key.dsize = (int)RSTRING_LEN(keystr); return rb_gdbm_fetch(dbm, key); } @@ -338,7 +338,7 @@ VALUE str; key.dptr = RSTRING_PTR(keystr); - key.dsize = RSTRING_LEN(keystr); + key.dsize = (int)RSTRING_LEN(keystr); key2 = gdbm_nextkey(dbm, key); if (key2.dptr == 0) return Qnil; @@ -416,9 +416,9 @@ valstr2 = rb_gdbm_fetch2(dbm, keystr); 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), - RSTRING_LEN(valstr)) == 0) { + (int)RSTRING_LEN(valstr)) == 0) { return keystr; } } @@ -499,7 +499,7 @@ rb_gdbm_modify(obj); StringValue(keystr); key.dptr = RSTRING_PTR(keystr); - key.dsize = RSTRING_LEN(keystr); + key.dsize = (int)RSTRING_LEN(keystr); GetDBM2(obj, dbmp, dbm); if (!gdbm_exists(dbm, key)) { @@ -591,7 +591,7 @@ for (i = 0; i < RARRAY_LEN(ary); i++) rb_gdbm_delete(obj, RARRAY_PTR(ary)[i]); 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; } @@ -683,10 +683,10 @@ StringValue(valstr); key.dptr = RSTRING_PTR(keystr); - key.dsize = RSTRING_LEN(keystr); + key.dsize = (int)RSTRING_LEN(keystr); val.dptr = RSTRING_PTR(valstr); - val.dsize = RSTRING_LEN(valstr); + val.dsize = (int)RSTRING_LEN(valstr); GetDBM2(obj, dbmp, dbm); dbmp->di_size = -1; @@ -942,7 +942,7 @@ StringValue(keystr); key.dptr = RSTRING_PTR(keystr); - key.dsize = RSTRING_LEN(keystr); + key.dsize = (int)RSTRING_LEN(keystr); GetDBM2(obj, dbmp, dbm); if (gdbm_exists(dbm, key)) @@ -973,9 +973,9 @@ valstr2 = rb_gdbm_fetch2(dbm, keystr); 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), - RSTRING_LEN(valstr)) == 0) { + (int)RSTRING_LEN(valstr)) == 0) { return Qtrue; } } -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/