Changeset 15 in libcf++

Timestamp:

06/14/15 03:03:32 (9 years ago)

Author:

cheese

Message:

#1 remove unused interface

Location:

trunk

Files:

• include/cf/bin.h (modified) (1 diff)
• include/cf/network.h (modified) (1 diff)
• include/cf/task.h (modified) (4 diffs)
• src/bin.cpp (modified) (1 diff)
• src/codec.cpp (modified) (2 diffs)
• src/logger.cpp (modified) (2 diffs)
• src/network.cpp (modified) (2 diffs)
• src/task.cpp (modified) (2 diffs)
• test/makefile (modified) (1 diff)

trunk/include/cf/bin.h

@@ -63 +63 @@
          */
         cf::size_t size() const;
-
-        /**
-         * is empty
-         * @return is empty ?
-         */
-        cf::bool_t empty() const;
 
         /**

trunk/include/cf/network.h

@@ -50 +50 @@
              */
             cf::uint16_t port() const;
-
-            /**
-             * is empty ?
-             * @return true; false
-             */
-            cf::bool_t empty() const;
         };
 

trunk/include/cf/task.h

@@ -9 +9 @@
 #include "cf/exception.h"
 
-#define SYNCHRONIZED(_s)    for (cf::task::scopedLock _sl(&_s) ; _sl.locked() ; _sl.unlock())
+#define SYNCHRONIZED(_s)    for (cf::task::scopedLock _sl(&_s) ; _sl.isLocked() ; _sl.unlock())
 
 namespace cf
@@ -40 +40 @@
              * @return true; false
              */
-            virtual cf::bool_t locked() const = 0;
+            virtual cf::bool_t isLocked() const = 0;
         };
 
@@ -90 +90 @@
              * @return true; false
              */
-            cf::bool_t locked() const;
+            cf::bool_t isLocked() const;
         };
 
@@ -119 +119 @@
              * @return true; false
              */
-            cf::bool_t locked() const;
+            cf::bool_t isLocked() const;
 
             /**

trunk/src/bin.cpp

@@ -38 +38 @@
 {
     return mBin.size();
-}
-
-cf::bool_t cf::bin::empty() const
-{
-    return mBin.empty();
 }
 

trunk/src/codec.cpp

@@ -19 +19 @@
     throw (cf::exception)
 {
-    if (in.empty())
+    if (in.size() == 0)
         THROW_EXCEPTION("input is empty");
 
@@ -182 +182 @@
     throw (cf::exception)
 {
-    if (in.empty())
+    if (in.size() == 0)
         THROW_EXCEPTION("input is empty");
 

trunk/src/logger.cpp

@@ -169 +169 @@
         if (!mOpenMutex.trylock())
         {
-            while (mOpenMutex.locked())
+            while (mOpenMutex.isLocked())
                 /* waiting */;
 
@@ -211 +211 @@
         if (!mRenameMutex.trylock())
         {
-            while (mRenameMutex.locked())
+            while (mRenameMutex.isLocked())
                 /* waiting */;
 

trunk/src/network.cpp

@@ -153 +153 @@
 }
 
-cf::bool_t cf::network::host::empty() const
-{
-    return (address().empty() || port() == 0) ? true : false;
-}
-
 cf::network::tcp::tcp(const cf::socket_t attachedSocket)
     throw (cf::exception)
@@ -351 +346 @@
     throw (cf::exception)
 {
-    if (in.empty())
-        THROW_EXCEPTION("send data is null or zero-bytes");
+    if (in.size() == 0)
+        THROW_EXCEPTION("send data is zero-bytes");
 
     cf::char_t * buf = reinterpret_cast<cf::char_t *>(in.buffer());

trunk/src/task.cpp

@@ -136 +136 @@
 }
 
-cf::bool_t cf::task::mutex::locked() const
+cf::bool_t cf::task::mutex::isLocked() const
 {
     return mIsLocked;
@@ -162 +162 @@
 }
 
-cf::bool_t cf::task::scopedLock::locked() const
-{
-    return mSynchronizer->locked();
+cf::bool_t cf::task::scopedLock::isLocked() const
+{
+    return mSynchronizer->isLocked();
 }
 

trunk/test/makefile

@@ -22 +22 @@
 LIB_NAME        = cf++
 
-INCLUDES        = -I../include -I../src
+INCLUDES        = -I../include
 LIBRARIES       = -L$(BUILD_PATH) -l$(LIB_NAME) $(LIBS)
 LIBRARY_PATH    = .