Changeset 18 in libcf++ for trunk/src/network.cpp

Timestamp:

08/12/15 23:51:04 (9 years ago)

Author:

cheese

Message:

#1 unify descriptor for initializing

File:

• trunk/src/network.cpp (modified) (5 diffs)

trunk/src/network.cpp

@@ -84 +84 @@
     tv.tv_usec = 0;
 
-    result = select(sock + 1, &rfds, wfdsPtr, NULL, &tv);
+    result = select(static_cast<int>(sock) + 1, &rfds, wfdsPtr, NULL, &tv);
     if (result < 0)
         THROW_EXCEPTION("select error");
@@ -173 +173 @@
     }
 
-    if (mSocket == UNUSED_SOCKET)
+    if (mSocket == cf::nodesc)
         mSocket = ::socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
 
@@ -192 +192 @@
 cf::void_t cf::network::tcp::close()
 {
-    if (mSocket == UNUSED_SOCKET)
+    if (mSocket == cf::nodesc)
         return;
 
     closesocket(mSocket);
 
-    mSocket = UNUSED_SOCKET;
+    mSocket = cf::nodesc;
 }
 
@@ -324 +324 @@
     throw (exception)
 {
-    if (sock == UNUSED_SOCKET)
+    if (sock == cf::nodesc)
         THROW_EXCEPTION("has invalid socket");
 
@@ -333 +333 @@
     throw (exception)
 {
-    if (mSocket == UNUSED_SOCKET)
+    if (mSocket == cf::nodesc)
         THROW_EXCEPTION("has invalid socket");
 
     cf::socket_t sock = mSocket;
 
-    mSocket = UNUSED_SOCKET;
+    mSocket = cf::nodesc;
 
     return sock;