nobu	2008-07-21 15:29:35 +0900 (Mon, 21 Jul 2008)

  New Revision: 18142

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

  Log:
    * missing/vsnprintf.c (struct __sbuf, FILE): use size_t.
    
    * sprintf.c (ruby__sfvwrite): ditto.

  Modified files:
    trunk/ChangeLog
    trunk/missing/vsnprintf.c
    trunk/sprintf.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 18141)
+++ ChangeLog	(revision 18142)
@@ -1,3 +1,9 @@
+Mon Jul 21 15:29:32 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* missing/vsnprintf.c (struct __sbuf, FILE): use size_t.
+
+	* sprintf.c (ruby__sfvwrite): ditto.
+
 Mon Jul 21 13:55:37 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* README.EXT, README.EXT.ja (1.5 Manipulating Ruby data): mentioned
Index: sprintf.c
===================================================================
--- sprintf.c	(revision 18141)
+++ sprintf.c	(revision 18142)
@@ -1043,7 +1043,7 @@
     VALUE result = (VALUE)fp->_bf._base;
     char *buf = (char*)fp->_p;
     size_t len, n;
-    int blen = buf - RSTRING_PTR(result), bsiz = fp->_w;
+    size_t blen = buf - RSTRING_PTR(result), bsiz = fp->_w;
 
     if (RBASIC(result)->klass) {
 	rb_raise(rb_eRuntimeError, "rb_vsprintf reentered");
Index: missing/vsnprintf.c
===================================================================
--- missing/vsnprintf.c	(revision 18141)
+++ missing/vsnprintf.c	(revision 18142)
@@ -132,7 +132,7 @@
 /* stdio buffers */
 struct __sbuf {
 	unsigned char *_base;
-	int	_size;
+	size_t	_size;
 };
 
 
@@ -165,13 +165,13 @@
 typedef	struct __sFILE {
 	unsigned char *_p;	/* current position in (some) buffer */
 #if 0
-	int	_r;		/* read space left for getc() */
+	size_t	_r;		/* read space left for getc() */
 #endif
-	int	_w;		/* write space left for putc() */
+	size_t	_w;		/* write space left for putc() */
 	short	_flags;		/* flags, below; this FILE is free if 0 */
 	short	_file;		/* fileno, if Unix descriptor, else -1 */
 	struct	__sbuf _bf;	/* the buffer (at least 1 byte, if !NULL) */
-	int	_lbfsize;	/* 0 or -_bf._size, for inline putc */
+	size_t	_lbfsize;	/* 0 or -_bf._size, for inline putc */
 	int	(*vwrite)(/* struct __sFILE*, struct __suio * */);
 } FILE;
 
@@ -622,6 +622,7 @@
 	uio.uio_resid = 0;
 	uio.uio_iovcnt = 0;
 	ret = 0;
+	xdigs = 0;
 
 	/*
 	 * Scan the format for conversions (`%' character).

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