apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r1086692 - /apr/apr/trunk/poll/unix/epoll.c
Date Tue, 29 Mar 2011 19:25:28 GMT
Author: trawick
Date: Tue Mar 29 19:25:28 2011
New Revision: 1086692

URL: http://svn.apache.org/viewvc?rev=1086692&view=rev
Log:
don't override parameter 'flags' within a block
(icc complains, I sympathize)

Modified:
    apr/apr/trunk/poll/unix/epoll.c

Modified: apr/apr/trunk/poll/unix/epoll.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/poll/unix/epoll.c?rev=1086692&r1=1086691&r2=1086692&view=diff
==============================================================================
--- apr/apr/trunk/poll/unix/epoll.c (original)
+++ apr/apr/trunk/poll/unix/epoll.c Tue Mar 29 19:25:28 2011
@@ -104,13 +104,13 @@ static apr_status_t impl_pollset_create(
 
 #ifndef HAVE_EPOLL_CREATE1
     {
-        int flags;
+        int fd_flags;
 
-        if ((flags = fcntl(fd, F_GETFD)) == -1)
+        if ((fd_flags = fcntl(fd, F_GETFD)) == -1)
             return errno;
 
-        flags |= FD_CLOEXEC;
-        if (fcntl(fd, F_SETFD, flags) == -1)
+        fd_flags |= FD_CLOEXEC;
+        if (fcntl(fd, F_SETFD, fd_flags) == -1)
             return errno;
     }
 #endif
@@ -346,13 +346,13 @@ static apr_status_t impl_pollcb_create(a
 
 #ifndef HAVE_EPOLL_CREATE1
     {
-        int flags;
+        int fd_flags;
 
-        if ((flags = fcntl(fd, F_GETFD)) == -1)
+        if ((fd_flags = fcntl(fd, F_GETFD)) == -1)
             return errno;
 
-        flags |= FD_CLOEXEC;
-        if (fcntl(fd, F_SETFD, flags) == -1)
+        fd_flags |= FD_CLOEXEC;
+        if (fcntl(fd, F_SETFD, fd_flags) == -1)
             return errno;
     }
 #endif



Mime
View raw message