[前][次][番号順一覧][スレッド一覧]

ruby-changes:14919

From: takano32 <ko1@a...>
Date: Mon, 1 Mar 2010 20:11:27 +0900 (JST)
Subject: [ruby-changes:14919] Ruby:r26789 (trunk): * ext/zlib/zlib.c (zstream_expand_buffer_into): remove compare different type values warning.

takano32	2010-03-01 20:11:08 +0900 (Mon, 01 Mar 2010)

  New Revision: 26789

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

  Log:
    * ext/zlib/zlib.c (zstream_expand_buffer_into): remove compare different type values warning.

  Modified files:
    trunk/ChangeLog
    trunk/ext/zlib/zlib.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 26788)
+++ ChangeLog	(revision 26789)
@@ -1,3 +1,7 @@
+Mon Mar  1 20:07:06 2010  TAKANO Mitsuhiro (takano32)  <tak@n...>
+
+	* ext/zlib/zlib.c (zstream_expand_buffer_into): remove compare different type values warning.
+
 Mon Mar  1 17:42:45 2010  wanabe  <s.wanabe@g...>
 
 	* configure.in (mingw): do not detect snprintf/vsnprintf.
Index: ext/zlib/zlib.c
===================================================================
--- ext/zlib/zlib.c	(revision 26788)
+++ ext/zlib/zlib.c	(revision 26789)
@@ -59,7 +59,7 @@
 struct zstream_funcs;
 static void zstream_init(struct zstream*, const struct zstream_funcs*);
 static void zstream_expand_buffer(struct zstream*);
-static void zstream_expand_buffer_into(struct zstream*, int);
+static void zstream_expand_buffer_into(struct zstream*, unsigned int);
 static void zstream_append_buffer(struct zstream*, const Bytef*, int);
 static VALUE zstream_detach_buffer(struct zstream*);
 static VALUE zstream_shift_buffer(struct zstream*, int);
@@ -518,7 +518,7 @@
 }
 
 static void
-zstream_expand_buffer_into(struct zstream *z, int size)
+zstream_expand_buffer_into(struct zstream *z, unsigned int size)
 {
     if (NIL_P(z->buf)) {
 	/* I uses rb_str_new here not rb_str_buf_new because
@@ -2591,7 +2591,7 @@
     }
     else {
 	val = rb_Integer(mtime);
-	gz->mtime = FIXNUM_P(val) ? FIX2INT(val) : rb_big2ulong(val);
+	gz->mtime = FIXNUM_P(val) ? FIX2UINT(val) : rb_big2ulong(val);
     }
     return mtime;
 }

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

[前][次][番号順一覧][スレッド一覧]