nobu	2010-07-16 16:40:37 +0900 (Fri, 16 Jul 2010)

  New Revision: 28656

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=28656

  Log:
    * ext/dbm/dbm.c (struct dbmdata, fdbm_key, fdbm_delete_if): fixed
      type warnings.
    
    * time.c (calc_tm_yday): ditto.

  Modified files:
    trunk/ext/dbm/dbm.c
    trunk/time.c

Index: time.c
===================================================================
--- time.c	(revision 28655)
+++ time.c	(revision 28656)
@@ -963,11 +963,9 @@
 static int
 calc_tm_yday(long tm_year, int tm_mon, int tm_mday)
 {
-    int tm_year_mod400;
+    int tm_year_mod400 = (int)MOD(tm_year, 400);
     int tm_yday = tm_mday;
 
-    tm_year_mod400 = MOD(tm_year, 400);
-
     if (leap_year_p(tm_year_mod400 + 1900))
 	tm_yday += leap_year_yday_offset[tm_mon];
     else
Index: ext/dbm/dbm.c
===================================================================
--- ext/dbm/dbm.c	(revision 28655)
+++ ext/dbm/dbm.c	(revision 28656)
@@ -26,7 +26,7 @@
 #define RUBY_DBM_RW_BIT 0x20000000
 
 struct dbmdata {
-    int  di_size;
+    long di_size;
     DBM *di_dbm;
 };
 
@@ -212,7 +212,7 @@
     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 ((long)val.dsize == RSTRING_LEN(valstr) &&
 	    memcmp(val.dptr, RSTRING_PTR(valstr), val.dsize) == 0) {
 	    return rb_tainted_str_new(key.dptr, key.dsize);
 	}
@@ -335,7 +335,8 @@
     DBM *dbm;
     VALUE keystr, valstr;
     VALUE ret, ary = rb_ary_new();
-    int i, status = 0, n;
+    int i, status = 0;
+    long n;
 
     fdbm_modify(obj);
     GetDBM2(obj, dbmp, dbm);

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/