Reviewed bug 3601, minor transceiver cleanup

5 files changed, 4 insertions, 26 deletions

diff --git a/cpp/src/Ice/PluginManagerI.cpp b/cpp/src/Ice/PluginManagerI.cpp
index 0b114402ac8..6e1e2f99449 100644
--- a/cpp/src/Ice/PluginManagerI.cpp
+++ b/cpp/src/Ice/PluginManagerI.cpp
@@ -131,25 +131,22 @@ Ice::PluginManagerI::destroy()
                 catch(const std::exception& ex)
                 {
                     Warning out(getProcessLogger());
-                    out << "unexpected exception raised by plug-in '" << r->first << "' destruction.\n";
-                    out << "exception: " << ex.what();
+                    out << "unexpected exception raised by plug-in `" << r->first << "' destruction:\n" << ex.what();
                 }
                 catch(const std::string& str)
                 {
                     Warning out(getProcessLogger());
-                    out << "unexpected exception raised by plug-in '" << r->first << "' destruction.\n";
-                    out << "exception: " << str;
+                    out << "unexpected exception raised by plug-in `" << r->first << "' destruction:\n" << str;
                 }
                 catch(const char* msg)
                 {
                     Warning out(getProcessLogger());
-                    out << "unexpected exception raised by plug-in '" << r->first << "' destruction.\n";
-                    out << "exception: " << msg;
+                    out << "unexpected exception raised by plug-in `" << r->first << "' destruction:\n" << msg;
                 }
                 catch(...)
                 {
                     Warning out(getProcessLogger());
-                    out << "unexpected exception raised by plug-in '"    << r->first << "' destruction.";
+                    out << "unexpected exception raised by plug-in `"    << r->first << "' destruction";
                 }
             }
         }
diff --git a/cpp/src/Ice/TcpTransceiver.cpp b/cpp/src/Ice/TcpTransceiver.cpp
index 43d715d6314..17564a93bd3 100644
--- a/cpp/src/Ice/TcpTransceiver.cpp
+++ b/cpp/src/Ice/TcpTransceiver.cpp
@@ -287,9 +287,6 @@ IceInternal::TcpTransceiver::TcpTransceiver(const InstancePtr& instance, SOCKET
     _state(connected ? StateConnected : StateNeedConnect),
     _desc(fdToString(_fd))
 {
-    FD_ZERO(&_rFdSet);
-    FD_ZERO(&_wFdSet);
-
 #ifdef _WIN32
     //
     // On Windows, limiting the buffer size is important to prevent
diff --git a/cpp/src/Ice/TcpTransceiver.h b/cpp/src/Ice/TcpTransceiver.h
index 7e09891f09b..36077057d7b 100644
--- a/cpp/src/Ice/TcpTransceiver.h
+++ b/cpp/src/Ice/TcpTransceiver.h
@@ -54,8 +54,6 @@ private:
     const Ice::StatsPtr _stats;
     
     SOCKET _fd;
-    fd_set _rFdSet;
-    fd_set _wFdSet;
     State _state;
     std::string _desc;
 #ifdef _WIN32
diff --git a/cpp/src/Ice/UdpTransceiver.cpp b/cpp/src/Ice/UdpTransceiver.cpp
index 731de9ce9e8..9eee012ff94 100644
--- a/cpp/src/Ice/UdpTransceiver.cpp
+++ b/cpp/src/Ice/UdpTransceiver.cpp
@@ -327,11 +327,6 @@ IceInternal::UdpTransceiver::UdpTransceiver(const InstancePtr& instance, const s
         _fd = INVALID_SOCKET;
         throw;
     }
-
-#ifdef _WIN32
-    FD_ZERO(&_rFdSet);
-    FD_ZERO(&_wFdSet);
-#endif
 }
 
 IceInternal::UdpTransceiver::UdpTransceiver(const InstancePtr& instance, const string& host, int port,
@@ -406,11 +401,6 @@ IceInternal::UdpTransceiver::UdpTransceiver(const InstancePtr& instance, const s
         _fd = INVALID_SOCKET;
         throw;
     }
-
-#ifdef _WIN32
-    FD_ZERO(&_rFdSet);
-    FD_ZERO(&_wFdSet);
-#endif
 }
 
 IceInternal::UdpTransceiver::~UdpTransceiver()
diff --git a/cpp/src/Ice/UdpTransceiver.h b/cpp/src/Ice/UdpTransceiver.h
index a5ee375460c..79f74dee203 100644
--- a/cpp/src/Ice/UdpTransceiver.h
+++ b/cpp/src/Ice/UdpTransceiver.h
@@ -66,10 +66,6 @@ private:
     SOCKET _fd;
     struct sockaddr_storage _addr;
     struct sockaddr_storage _mcastAddr;
-#ifdef _WIN32
-    fd_set _rFdSet;
-    fd_set _wFdSet;
-#endif
     bool _connect;
     int _rcvSize;
     int _sndSize;