diff options
| -rw-r--r-- | winsup/cygwin/ChangeLog | 6 | ||||
| -rwxr-xr-x | winsup/cygwin/cygserver_transport_sockets.cc | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index a5156f73ffe..0ee7ca67cbe 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,9 @@ +2002-06-30 Conrad Scott <conrad.scott@dsl.pipex.com> + + * cygserver_transport_sockets.cc + (transport_layer_sockets::accept): Rename local variable + `accept_fd' to avoid shadowing the `fd' field. + 2002-06-29 Pierre Humblet <pierre.humblet@ieee.org> * security.cc (extract_nt_dom_user): Check for all buffer overflows. diff --git a/winsup/cygwin/cygserver_transport_sockets.cc b/winsup/cygwin/cygserver_transport_sockets.cc index 3e8f9b35399..78fceb1b518 100755 --- a/winsup/cygwin/cygserver_transport_sockets.cc +++ b/winsup/cygwin/cygserver_transport_sockets.cc @@ -89,9 +89,9 @@ class transport_layer_sockets * transport_layer_sockets::accept (bool * const recoverable) { /* FIXME: check we have listened */ - const int fd = cygwin_accept(fd, &sockdetails, &sdlen); + const int accept_fd = cygwin_accept(fd, &sockdetails, &sdlen); - if (fd == -1) + if (accept_fd == -1) { system_printf ("Nup, couldn't accept. %d", errno); switch (errno) @@ -112,7 +112,7 @@ transport_layer_sockets::accept (bool * const recoverable) return NULL; } - return new transport_layer_sockets (fd); + return new transport_layer_sockets (accept_fd); } #endif /* !__INSIDE_CYGWIN__ */ |