Changeset 18 in libcf++

Timestamp:

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

Author:

cheese

Message:

#1 unify descriptor for initializing

Location:

trunk

Files:

• include/cf/network.h (modified) (1 diff)
• include/cf/types.h (modified) (1 diff)
• src/bin.cpp (modified) (1 diff)
• src/codec.cpp (modified) (3 diffs)
• src/file.cpp (modified) (4 diffs)
• src/network.cpp (modified) (5 diffs)

trunk/include/cf/network.h

@@ -75 +75 @@
              * @throw cf::exception
              */
-            tcp(const cf::socket_t attachedSocket = UNUSED_SOCKET)
+            tcp(const cf::socket_t attachedSocket = cf::nodesc)
                 throw (cf::exception);
 

trunk/include/cf/types.h

@@ -48 +48 @@
     typedef int32_t             socket_t;
 #endif
+
+    const cf::int32_t           nodesc = -1;
 };
 

trunk/src/bin.cpp

@@ -37 +37 @@
 cf::size_t cf::bin::size() const
 {
-    return mBin.size();
+    return static_cast<cf::size_t>(mBin.size());
 }
 

trunk/src/codec.cpp

@@ -101 +101 @@
         cf::uint8_t * buf = NULL;
         cf::long_t outlen = 0;
-        cf::size_t memsize = in.size() / 4 * 3;
+        cf::size_t memsize = static_cast<cf::size_t>(in.size()) / 4 * 3;
         cf::memory mem(memsize);
 
@@ -137 +137 @@
             THROW_EXCEPTION("input string is not base64-encoded");
 
-        remain = ptr - src;
+        remain = static_cast<cf::long_t>(ptr - src);
         binlen = ((remain + 2/* max padding length */) / 4) * 3;
 
@@ -228 +228 @@
         cf::uint8_t * buf = NULL;
         cf::int32_t len = 0;
-        cf::size_t memsize = in.size() / 2;
+        cf::size_t memsize = static_cast<cf::size_t>(in.size()) / 2;
         cf::memory mem(memsize);
 

trunk/src/file.cpp

@@ -42 +42 @@
 #endif
 
-#define NO_FD           -1
-
 /*--------------------------------------------------------------*/
 
@@ -122 +120 @@
 cf::file::file(const cf::char_t * path)
     throw (cf::exception)
-    : mFD(NO_FD),
+    : mFD(cf::nodesc),
       mIsLocked(false)
 {
@@ -179 +177 @@
     {
         ::close(mFD);
-        mFD = NO_FD;
+        mFD = cf::nodesc;
     }
 
@@ -194 +192 @@
 cf::bool_t cf::file::isOpened()
 {
-    return mFD > NO_FD ? true : false;
+    return mFD > cf::nodesc ? true : false;
 }
 

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;