diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | missing/vsnprintf.c | 9 | ||||
| -rw-r--r-- | sprintf.c | 2 |
3 files changed, 12 insertions, 5 deletions
@@ -1,3 +1,9 @@ +Mon Jul 21 15:29:32 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * missing/vsnprintf.c (struct __sbuf, FILE): use size_t. + + * sprintf.c (ruby__sfvwrite): ditto. + Mon Jul 21 13:55:37 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> * README.EXT, README.EXT.ja (1.5 Manipulating Ruby data): mentioned diff --git a/missing/vsnprintf.c b/missing/vsnprintf.c index c1f1eca09..af9d516f6 100644 --- a/missing/vsnprintf.c +++ b/missing/vsnprintf.c @@ -132,7 +132,7 @@ /* stdio buffers */ struct __sbuf { unsigned char *_base; - int _size; + size_t _size; }; @@ -165,13 +165,13 @@ struct __sbuf { 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 @@ BSD_vfprintf(FILE *fp, const char *fmt0, va_list ap) uio.uio_resid = 0; uio.uio_iovcnt = 0; ret = 0; + xdigs = 0; /* * Scan the format for conversions (`%' character). @@ -1043,7 +1043,7 @@ ruby__sfvwrite(register rb_printf_buffer *fp, register struct __suio *uio) 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"); |