Changeset 7 in libcf++ for trunk/src/bin.cpp

Timestamp:

03/29/15 16:30:07 (9 years ago)

Author:

cheese

Message:

#1 fix and add interfaces

File:

• trunk/src/bin.cpp (modified) (3 diffs)

trunk/src/bin.cpp

@@ -10 +10 @@
 
 cf::bin::bin(const cf::uint8_t * in,
-             const cf::size_t size)
+             const cf::size_t length)
 {
-    set(in, size);
+    set(in, length);
 }
 
@@ -55 +55 @@
 
 cf::void_t cf::bin::set(const cf::uint8_t * in,
-                        const cf::size_t size)
+                        const cf::size_t length)
 {
     if (!in)
         return;
 
-    resize(size);
-    memcpy(buffer(), in, size);
+    resize(length);
+    memcpy(buffer(), in, length);
 }
 
@@ -123 +123 @@
 
 cf::size_t cf::bin::find(const cf::uint8_t * in,
-                         const cf::size_t size) const
+                         const cf::size_t length) const
 {
-    cf::size_t limit = this->size() - size;
+    cf::size_t limit = size() - length;
 
     if (limit < 0 || !in)
         return -1;
 
-    for (cf::size_t iter = 0, iterIn = 0 ; iter <= limit ; iter++)
+    for (cf::size_t iter = 0 ; iter <= limit ; iter++)
     {
-        for (iterIn = 0 ; iterIn < size ; iterIn++)
-        {
-            if (*((buffer() + iter) + iterIn) != *(in + iterIn))
-                break;
-        }
-
-        if (iterIn == size)
+        if (!memcmp(buffer() + iter, in, length))
             return iter;
     }