1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

init.c: declaration-after-statement

Browse Source 
* ext/socket/init.c (cloexec_accept): fix declaration-after-statement.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39040 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-02-04 06:19:40 +00:00
parent 523292d612
commit a9cbe8c721
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ext/socket/init.c
View File

@ -482,9 +482,11 @@ cloexec_accept(int socket, struct sockaddr *address, socklen_t *address_len)
{ {
int ret; int ret;
socklen_t len0 = 0; socklen_t len0 = 0;
if (address_len) len0 = *address_len;
#ifdef HAVE_ACCEPT4 #ifdef HAVE_ACCEPT4
static int try_accept4 = 1; static int try_accept4 = 1;
#endif
if (address_len) len0 = *address_len;
#ifdef HAVE_ACCEPT4
if (try_accept4) { if (try_accept4) {
ret = accept4(socket, address, address_len, SOCK_CLOEXEC); ret = accept4(socket, address, address_len, SOCK_CLOEXEC);
/* accept4 is available since Linux 2.6.28, glibc 2.10. */ /* accept4 is available since Linux 2.6.28, glibc 2.10. */
@ -494,17 +496,13 @@ cloexec_accept(int socket, struct sockaddr *address, socklen_t *address_len)
if (address_len && len0 < *address_len) *address_len = len0; if (address_len && len0 < *address_len) *address_len = len0;
return ret; return ret;
} }
if (errno == ENOSYS) { if (errno != ENOSYS) {
try_accept4 = 0; return -1;
ret = accept(socket, address, address_len);
} }
try_accept4 = 0;
} }
else {
ret = accept(socket, address, address_len);
}
#else
ret = accept(socket, address, address_len);
#endif #endif
ret = accept(socket, address, address_len);
if (ret == -1) return -1; if (ret == -1) return -1;
if (address_len && len0 < *address_len) *address_len = len0; if (address_len && len0 < *address_len) *address_len = len0;
rb_maygvl_fd_fix_cloexec(ret); rb_maygvl_fd_fix_cloexec(ret);