Changeset 533e2d7 in mainline for uspace/lib/c/generic/mem.c

Timestamp:

2013-06-03T07:55:35Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

797d4d19

Parents:

ea15a89a (diff), 6db5d4b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• uspace/lib/c/generic/mem.c (modified) (1 diff)

uspace/lib/c/generic/mem.c

@@ -224 +224 @@
  * @param s1  Pointer to the first area to compare.
  * @param s2  Pointer to the second area to compare.
- * @param len Size of the first area in bytes. Both areas must have
- *            the same length.
- *
- * @return If len is 0, return zero. If the areas match, return
- *         zero. Otherwise return non-zero.
- *
- */
-int bcmp(const void *s1, const void *s2, size_t len)
+ * @param len Size of the areas in bytes.
+ *
+ * @return Zero if areas have the same contents. If they differ,
+ *         the sign of the result is the same as the sign of the
+ *         difference of the first pair of different bytes.
+ *
+ */
+int memcmp(const void *s1, const void *s2, size_t len)
 {
         uint8_t *u1 = (uint8_t *) s1;
         uint8_t *u2 = (uint8_t *) s2;
-        
-        for (; (len != 0) && (*u1++ == *u2++); len--);
-        
-        return len;
+        size_t i;
+
+        for (i = 0; i < len; i++) {
+                if (*u1 != *u2)
+                        return (int)(*u1) - (int)(*u2);
+                ++u1;
+                ++u2;
+        }
+
+        return 0;
 }