akr	2011-12-01 22:31:58 +0900 (Thu, 01 Dec 2011)

  New Revision: 33922

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

  Log:
    * io.c (linux_get_maxfd): change local variable name.

  Modified files:
    trunk/ChangeLog
    trunk/io.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 33921)
+++ ChangeLog	(revision 33922)
@@ -1,3 +1,7 @@
+Thu Dec  1 22:31:16 2011  Tanaka Akira  <akr@f...>
+
+	* io.c (linux_get_maxfd): change local variable name.
+
 Thu Dec  1 20:33:22 2011  Marc-Andre Lafortune  <ruby-core@m...>
 
 	* proc.c (rb_proc_arity): Fix Proc#arity in case of optional
Index: io.c
===================================================================
--- io.c	(revision 33921)
+++ io.c	(revision 33922)
@@ -5162,7 +5162,7 @@
 linux_get_maxfd(void)
 {
     int fd;
-    char buf[4096], *p, *n, *e;
+    char buf[4096], *p, *np, *e;
     ssize_t ss;
     fd = rb_cloexec_open("/proc/self/status", O_RDONLY|O_NOCTTY, 0);
     if (fd == -1) return -1;
@@ -5171,16 +5171,16 @@
     p = buf;
     e = buf + ss;
     while ((int)sizeof("FDSize:\t0\n")-1 <= e-p &&
-           (n = memchr(p, '\n', e-p)) != NULL) {
+           (np = memchr(p, '\n', e-p)) != NULL) {
         if (memcmp(p, "FDSize:", sizeof("FDSize:")-1) == 0) {
             int fdsize;
             p += sizeof("FDSize:")-1;
-            *n = '\0';
+            *np = '\0';
             fdsize = (int)ruby_strtoul(p, (char **)NULL, 10);
             close(fd);
             return fdsize;
         }
-        p = n+1;
+        p = np+1;
     }
     /* fall through */
 

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