From 78df33a0c14bc330f983f4a27c334c2cfbec9c2e Mon Sep 17 00:00:00 2001 From: naruse Date: Mon, 21 Mar 2011 21:23:42 +0000 Subject: * 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. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31141 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/dbm/dbm.c | 22 +++++++++++----------- ext/gdbm/gdbm.c | 22 +++++++++++----------- 2 files changed, 22 insertions(+), 22 deletions(-) (limited to 'ext') diff --git a/ext/dbm/dbm.c b/ext/dbm/dbm.c index 43f52cc774..6d5396066d 100644 --- a/ext/dbm/dbm.c +++ b/ext/dbm/dbm.c @@ -200,7 +200,7 @@ fdbm_fetch(VALUE obj, VALUE keystr, VALUE ifnone) 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 @@ fdbm_key(VALUE obj, VALUE valstr) 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_delete(VALUE obj, VALUE keystr) 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 @@ fdbm_delete_if(VALUE obj) 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 @@ fdbm_store(VALUE obj, VALUE keystr, VALUE valstr) 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 @@ fdbm_empty_p(VALUE obj) } } else { - i = dbmp->di_size; + i = (int)dbmp->di_size; } if (i == 0) return Qtrue; return Qfalse; @@ -786,7 +786,7 @@ fdbm_has_key(VALUE obj, VALUE keystr) 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 @@ fdbm_has_value(VALUE obj, VALUE valstr) 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; } diff --git a/ext/gdbm/gdbm.c b/ext/gdbm/gdbm.c index f2b9357aa9..6f0c14d664 100644 --- a/ext/gdbm/gdbm.c +++ b/ext/gdbm/gdbm.c @@ -300,7 +300,7 @@ rb_gdbm_fetch2(GDBM_FILE dbm, VALUE keystr) 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 @@ rb_gdbm_nextkey(GDBM_FILE dbm, VALUE keystr) 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 @@ fgdbm_key(VALUE obj, VALUE valstr) 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_delete(VALUE obj, VALUE keystr) 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 @@ fgdbm_delete_if(VALUE obj) 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 @@ fgdbm_store(VALUE obj, VALUE keystr, VALUE valstr) 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 @@ fgdbm_has_key(VALUE obj, VALUE keystr) 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 @@ fgdbm_has_value(VALUE obj, VALUE valstr) 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; } } -- cgit v1.2.3