nobu	2009-03-14 18:25:20 +0900 (Sat, 14 Mar 2009)

  New Revision: 22957

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

  Log:
    * util.c (ruby_scan_oct, ruby_scan_hex): use size_t.

  Modified files:
    trunk/ChangeLog
    trunk/include/ruby/util.h
    trunk/parse.y
    trunk/re.c
    trunk/ruby.c
    trunk/util.c

Index: include/ruby/util.h
===================================================================
--- include/ruby/util.h	(revision 22956)
+++ include/ruby/util.h	(revision 22957)
@@ -41,9 +41,9 @@
 #endif
 
 #define scan_oct ruby_scan_oct
-unsigned long ruby_scan_oct(const char *, int, int *);
+unsigned long ruby_scan_oct(const char *, size_t, size_t *);
 #define scan_hex ruby_scan_hex
-unsigned long ruby_scan_hex(const char *, int, int *);
+unsigned long ruby_scan_hex(const char *, size_t, size_t *);
 
 #if defined(__CYGWIN32__) || defined(_WIN32)
 void ruby_add_suffix(VALUE str, const char *suffix);
Index: re.c
===================================================================
--- re.c	(revision 22956)
+++ re.c	(revision 22957)
@@ -1842,7 +1842,7 @@
     const char *p = *pp;
     int code;
     int meta_prefix = 0, ctrl_prefix = 0;
-    int len;
+    size_t len;
     int retbyte;
 
     retbyte = -1;
@@ -2041,7 +2041,7 @@
     const char *p = *pp;
     int has_unicode = 0;
     unsigned long code;
-    int len;
+    size_t len;
 
     while (p < end && ISSPACE(*p)) p++;
 
@@ -2076,7 +2076,7 @@
         VALUE buf, rb_encoding **encp, onig_errmsg_buffer err)
 {
     const char *p = *pp;
-    int len;
+    size_t len;
     unsigned long code;
 
     if (end < p+4) {
@@ -2131,7 +2131,7 @@
               case '1': case '2': case '3':
               case '4': case '5': case '6': case '7': /* \O, \OO, \OOO or backref */
                 {
-                    int octlen;
+                    size_t octlen;
                     if (ruby_scan_oct(p-1, end-(p-1), &octlen) <= 0177) {
                         /* backref or 7bit octal.
                            no need to unescape anyway.
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 22956)
+++ ChangeLog	(revision 22957)
@@ -1,3 +1,7 @@
+Sat Mar 14 18:25:18 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* util.c (ruby_scan_oct, ruby_scan_hex): use size_t.
+
 Sat Mar 14 18:18:08 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* proc.c (rb_proc_call, rb_node_arity, bmcall, curry): checks
Index: parse.y
===================================================================
--- parse.y	(revision 22956)
+++ parse.y	(revision 22957)
@@ -5288,7 +5288,7 @@
 }
 
 static int
-parser_tok_hex(struct parser_params *parser, int *numlen)
+parser_tok_hex(struct parser_params *parser, size_t *numlen)
 {
     int c;
 
@@ -5315,7 +5315,7 @@
      */
 
     int codepoint;
-    int numlen;
+    size_t numlen;
 
     if (regexp_literal) { tokadd('\\'); tokadd('u'); }
 
@@ -5393,7 +5393,7 @@
 		   rb_encoding **encp)
 {
     int c;
-    int numlen;
+    size_t numlen;
 
     switch (c = nextc()) {
       case '\\':	/* Backslash */
@@ -5423,13 +5423,9 @@
       case '0': case '1': case '2': case '3': /* octal constant */
       case '4': case '5': case '6': case '7':
 	if (flags & (ESCAPE_CONTROL|ESCAPE_META)) goto eof;
-	{
-	    int numlen;
-
-	    pushback(c);
-	    c = scan_oct(lex_p, 3, &numlen);
-	    lex_p += numlen;
-	}
+	pushback(c);
+	c = scan_oct(lex_p, 3, &numlen);
+	lex_p += numlen;
 	return c;
 
       case 'x':	/* hex constant */
@@ -5505,7 +5501,7 @@
       case '4': case '5': case '6': case '7':
 	if (flags & (ESCAPE_CONTROL|ESCAPE_META)) goto eof;
 	{
-	    int numlen;
+	    size_t numlen;
 	    int oct;
 
 	    oct = scan_oct(--lex_p, 3, &numlen);
@@ -5518,7 +5514,7 @@
       case 'x':	/* hex constant */
 	if (flags & (ESCAPE_CONTROL|ESCAPE_META)) goto eof;
 	{
-	    int numlen;
+	    size_t numlen;
 	    int hex;
 
 	    hex = tok_hex(&numlen);
Index: util.c
===================================================================
--- util.c	(revision 22956)
+++ util.c	(revision 22957)
@@ -24,7 +24,7 @@
 #include "ruby/util.h"
 
 unsigned long
-ruby_scan_oct(const char *start, int len, int *retlen)
+ruby_scan_oct(const char *start, size_t len, size_t *retlen)
 {
     register const char *s = start;
     register unsigned long retval = 0;
@@ -38,7 +38,7 @@
 }
 
 unsigned long
-ruby_scan_hex(const char *start, int len, int *retlen)
+ruby_scan_hex(const char *start, size_t len, size_t *retlen)
 {
     static const char hexdigit[] = "0123456789abcdef0123456789ABCDEF";
     register const char *s = start;
Index: ruby.c
===================================================================
--- ruby.c	(revision 22956)
+++ ruby.c	(revision 22957)
@@ -699,7 +699,7 @@
 
 	  case 'W':
 	    {
-		int numlen;
+		size_t numlen;
 		int v = 2;	/* -W as -W2 */
 
 		if (*++s) {
@@ -861,7 +861,7 @@
 
 	  case 'T':
 	    {
-		int numlen;
+		size_t numlen;
 		int v = 1;
 
 		if (*++s) {
@@ -887,7 +887,7 @@
 	  case '0':
 	    if (envopt) goto noenvopt;
 	    {
-		int numlen;
+		size_t numlen;
 		int v;
 		char c;
 

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