Changeset 44ecf89 in mainline for uspace/lib

Timestamp:

2013-05-18T21:11:29Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

acdb5bac

Parents:

eef14771

Message:

Replace deprecated function bcmp() with memcmp().

Location:

uspace/lib

Files:

• bithenge/src/blob.c (modified) (1 diff)
• c/generic/mem.c (modified) (1 diff)
• c/include/mem.h (modified) (1 diff)
• ext4/libext4_directory.c (modified) (1 diff)
• nic/src/nic_addr_db.c (modified) (1 diff)
• posix/source/strings.c (modified) (1 diff)

uspace/lib/bithenge/src/blob.c

@@ -477 +477 @@
                 if (rc != EOK)
                         return rc;
-                if (size_a != size_b || bcmp(buffer_a, buffer_b, size_a)) {
+                if (size_a != size_b || memcmp(buffer_a, buffer_b, size_a) != 0) {
                         *out = false;
                         return EOK;

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;
 }
 

uspace/lib/c/include/mem.h

@@ -45 +45 @@
     __attribute__ ((optimize("-fno-tree-loop-distribute-patterns")));
 extern void *memmove(void *, const void *, size_t);
-
-extern int bcmp(const void *, const void *, size_t);
+extern int memcmp(const void *, const void *, size_t);
 
 #endif

uspace/lib/ext4/libext4_directory.c

@@ -725 +725 @@
                             name_len) {
                                 /* Compare names */
-                                if (bcmp((uint8_t *) name, dentry->name, name_len) == 0) {
+                                if (memcmp((uint8_t *) name, dentry->name, name_len) == 0) {
                                         *res_entry = dentry;
                                         return EOK;

uspace/lib/nic/src/nic_addr_db.c

@@ -70 +70 @@
         nic_addr_entry_t *entry = member_to_inst(item, nic_addr_entry_t, link);
         
-        return 0 == bcmp(entry->addr, key->addr, entry->len);
+        return memcmp(entry->addr, key->addr, entry->len) == 0;
 }
 

uspace/lib/posix/source/strings.c

@@ -131 +131 @@
 int posix_bcmp(const void *mem1, const void *mem2, size_t n)
 {
-        return bcmp(mem1, mem2, n);
+        return memcmp(mem1, mem2, n);
 }