summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--io.c8
2 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 2460234c88..78c9be9628 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Dec 1 22:31:16 2011 Tanaka Akira <akr@fsij.org>
+
+ * io.c (linux_get_maxfd): change local variable name.
+
Thu Dec 1 20:33:22 2011 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
* proc.c (rb_proc_arity): Fix Proc#arity in case of optional
diff --git a/io.c b/io.c
index 07eddd3146..986e4dc084 100644
--- a/io.c
+++ b/io.c
@@ -5162,7 +5162,7 @@ static int
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 @@ linux_get_maxfd(void)
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 */