[Boost-commit] svn:boost r66008 - trunk/boost/asio/detail/impl

Subject: [Boost-commit] svn:boost r66008 - trunk/boost/asio/detail/impl
From: chris_at_[hidden]
Date: 2010-10-16 05:47:17

Author: chris_kohlhoff
Date: 2010-10-16 05:47:11 EDT (Sat, 16 Oct 2010)
New Revision: 66008
URL: http://svn.boost.org/trac/boost/changeset/66008

Log:
Ensure close()/closesocket() failures are correctly propagated. Refs #4573.

Text files modified: 
   trunk/boost/asio/detail/impl/socket_ops.ipp |     8 ++++----                                
   1 files changed, 4 insertions(+), 4 deletions(-)

Modified: trunk/boost/asio/detail/impl/socket_ops.ipp
==============================================================================
--- trunk/boost/asio/detail/impl/socket_ops.ipp	(original)
+++ trunk/boost/asio/detail/impl/socket_ops.ipp	2010-10-16 05:47:11 EDT (Sat, 16 Oct 2010)
@@ -312,14 +312,14 @@
 
     clear_last_error();
 #if defined(BOOST_WINDOWS) || defined(__CYGWIN__)
-    int result = error_wrapper(::closesocket(s), ec);
+    result = error_wrapper(::closesocket(s), ec);
 #else // defined(BOOST_WINDOWS) || defined(__CYGWIN__)
-    int result = error_wrapper(::close(s), ec);
+    result = error_wrapper(::close(s), ec);
 #endif // defined(BOOST_WINDOWS) || defined(__CYGWIN__)
-    if (result == 0)
-      ec = boost::system::error_code();
   }
 
+  if (result == 0)
+    ec = boost::system::error_code();
   return result;
 }