Changeset 6e8ed225 in mainline for uspace/lib/c

Timestamp:

2013-05-20T18:43:13Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

4a5a18be

Parents:

d242cb6 (diff), acdb5bac (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: Replacement of BSD functions bzero, bcmp with C standard memset, memcmp.

Location:

uspace/lib/c

Files:

• generic/device/hw_res_parsed.c (modified) (1 diff)
• generic/mem.c (modified) (1 diff)
• generic/net/inet.c (modified) (2 diffs)
• generic/net/socket_client.c (modified) (2 diffs)
• include/device/hw_res_parsed.h (modified) (2 diffs)
• include/mem.h (modified) (2 diffs)

uspace/lib/c/generic/device/hw_res_parsed.c

@@ -188 +188 @@
         hw_resource_list_t hw_resources;
         hw_res_list_parsed_clean(hw_res_parsed);
-        bzero(&hw_resources, sizeof(hw_resource_list_t));
+        memset(&hw_resources, 0, sizeof(hw_resource_list_t));
         
         int rc = hw_res_get_resource_list(sess, &hw_resources);

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/generic/net/inet.c

@@ -144 +144 @@
         /* Erase if no address */
         if (!address) {
-                bzero(data, count);
+                memset(data, 0, count);
                 return ENOENT;
         }
@@ -181 +181 @@
                 } else {
                         /* Erase the rest of the address */
-                        bzero(data + index, count - index);
+                        memset(data + index, 0, count - index);
                         return EOK;
                 }

uspace/lib/c/generic/net/socket_client.c

@@ -446 +446 @@
                 return ENOMEM;
 
-        bzero(socket, sizeof(*socket));
+        memset(socket, 0, sizeof(*socket));
         fibril_rwlock_write_lock(&socket_globals.lock);
 
@@ -657 +657 @@
                 return ENOMEM;
         }
-        bzero(new_socket, sizeof(*new_socket));
+        memset(new_socket, 0, sizeof(*new_socket));
         socket_id = socket_generate_new_id();
         if (socket_id <= 0) {

uspace/lib/c/include/device/hw_res_parsed.h

@@ -127 +127 @@
         free(list->dma_channels.channels);
         
-        bzero(list, sizeof(hw_res_list_parsed_t));
+        memset(list, 0, sizeof(hw_res_list_parsed_t));
 }
 
@@ -136 +136 @@
 static inline void hw_res_list_parsed_init(hw_res_list_parsed_t *list)
 {
-        bzero(list, sizeof(hw_res_list_parsed_t));
+        memset(list, 0, sizeof(hw_res_list_parsed_t));
 }
 

uspace/lib/c/include/mem.h

@@ -38 +38 @@
 #include <sys/types.h>
 
-#define bzero(ptr, len)  memset((ptr), 0, (len))
-
 extern void *memset(void *, int, size_t)
     __attribute__ ((optimize("-fno-tree-loop-distribute-patterns")));
@@ -45 +43 @@
     __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