Changeset b8e72fd1 in mainline for uspace/lib

Timestamp:

2013-05-30T17:13:02Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

98abd40

Parents:

be2bb4f (diff), 94dfb92 (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

Location:

uspace/lib

Files:

• bithenge/src/blob.c (modified) (1 diff)
• c/Makefile (modified) (3 diffs)
• c/arch/amd64/Makefile.common (modified) (1 diff)
• c/arch/ia32/Makefile.common (modified) (2 diffs)
• c/generic/device/hw_res_parsed.c (modified) (1 diff)
• c/generic/dnsr.c (added)
• c/generic/inet/addr.c (added)
• c/generic/mem.c (modified) (1 diff)
• c/generic/net/inet.c (modified) (2 diffs)
• c/generic/net/socket_client.c (modified) (2 diffs)
• c/include/device/hw_res_parsed.h (modified) (2 diffs)
• c/include/inet/addr.h (added)
• c/include/inet/dnsr.h (added)
• c/include/inet/inet.h (modified) (1 diff)
• c/include/inet/inetcfg.h (modified) (1 diff)
• c/include/io/verify.h (modified) (1 diff)
• c/include/ipc/dnsr.h (added)
• c/include/ipc/services.h (modified) (1 diff)
• c/include/mem.h (modified) (2 diffs)
• drv/generic/remote_nic.c (modified) (10 diffs)
• ext4/libext4_directory.c (modified) (1 diff)
• nic/src/nic_addr_db.c (modified) (1 diff)
• nic/src/nic_driver.c (modified) (1 diff)
• nic/src/nic_impl.c (modified) (2 diffs)
• nic/src/nic_rx_control.c (modified) (1 diff)
• nic/src/nic_wol_virtues.c (modified) (1 diff)
• posix/source/strings.c (modified) (2 diffs)
• usb/src/debug.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/Makefile

@@ -75 +75 @@
         generic/device/pci.c \
         generic/device/ahci.c \
+        generic/dnsr.c \
         generic/dlfcn.c \
         generic/elf/elf_load.c \
@@ -92 +93 @@
         generic/task.c \
         generic/futex.c \
+        generic/inet/addr.c \
         generic/inet.c \
         generic/inetcfg.c \
@@ -162 +164 @@
 
 $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld: $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld.in
-        $(GCC) $(DEFS) $(CFLAGS) -DLIBC_PATH=$(CURDIR) -E -x c $< | grep -v "^\#" > $@
+        $(CC) $(DEFS) $(CFLAGS) -DLIBC_PATH=$(CURDIR) -E -x c $< | grep -v "^\#" > $@
 
 $(LIBC_PREFIX)/arch/$(UARCH)/_link-loader.ld: $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld.in
-        $(GCC) $(DEFS) $(CFLAGS) -DLIBC_PATH=$(CURDIR) -DLOADER -E -x c $< | grep -v "^\#" > $@
+        $(CC) $(DEFS) $(CFLAGS) -DLIBC_PATH=$(CURDIR) -DLOADER -E -x c $< | grep -v "^\#" > $@
 
 $(LIBC_PREFIX)/arch/$(UARCH)/_link-shlib.ld: $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld.in
-        $(GCC) $(DEFS) $(CFLAGS) -DLIBC_PATH=$(CURDIR) -DSHLIB -E -x c $< | grep -v "^\#" > $@
+        $(CC) $(DEFS) $(CFLAGS) -DLIBC_PATH=$(CURDIR) -DSHLIB -E -x c $< | grep -v "^\#" > $@
 
 $(LIBC_PREFIX)/arch/$(UARCH)/_link-dlexe.ld: $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld.in
-        $(GCC) $(DEFS) $(CFLAGS) -DLIBC_PATH=$(CURDIR) -DDLEXE -E -x c $< | grep -v "^\#" > $@
+        $(CC) $(DEFS) $(CFLAGS) -DLIBC_PATH=$(CURDIR) -DDLEXE -E -x c $< | grep -v "^\#" > $@
 
 $(COMMON_HEADER_ARCH): $(COMMON_HEADER)

uspace/lib/c/arch/amd64/Makefile.common

@@ -28 +28 @@
 
 CLANG_ARCH = x86_64
+CLANG_TARGET = x86_64-unknown-linux
 GCC_CFLAGS += -fno-omit-frame-pointer
+CLANG_CFLAGS += -fno-omit-frame-pointer
 
 ENDIANESS = LE

uspace/lib/c/arch/ia32/Makefile.common

@@ -28 +28 @@
 
 CLANG_ARCH = i386
+CLANG_TARGET = i386-unknown-linux
 
 ifeq ($(PROCESSOR),i486)
@@ -34 +35 @@
         GCC_CFLAGS += -march=pentium -fno-omit-frame-pointer
 endif
+CLANG_CFLAGS += -fno-omit-frame-pointer
 
 ENDIANESS = LE

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/inet/inet.h

@@ -36 +36 @@
 #define LIBC_INET_INET_H_
 
+#include <inet/addr.h>
 #include <sys/types.h>
 
 #define INET_TTL_MAX 255
-
-typedef struct {
-        uint32_t ipv4;
-} inet_addr_t;
 
 typedef struct {

uspace/lib/c/include/inet/inetcfg.h

@@ -38 +38 @@
 #include <inet/inet.h>
 #include <sys/types.h>
-
-/** Network address */
-typedef struct {
-        /** Address */
-        uint32_t ipv4;
-        /** Number of valid bits in @c ipv4 */
-        int bits;
-} inet_naddr_t;
 
 /** Address object info */

uspace/lib/c/include/io/verify.h

@@ -38 +38 @@
 #ifndef NVERIFY_PRINTF
 
+#ifdef __clang__
+#define PRINTF_ATTRIBUTE(start, end) \
+        __attribute__((format(__printf__, start, end)))
+#else
 #define PRINTF_ATTRIBUTE(start, end) \
         __attribute__((format(gnu_printf, start, end)))
+#endif
 
 #else /* NVERIFY_PRINTF */

uspace/lib/c/include/ipc/services.h

@@ -53 +53 @@
 } services_t;
 
+#define SERVICE_NAME_DNSR     "net/dnsr"
 #define SERVICE_NAME_INET     "net/inet"
 #define SERVICE_NAME_INETCFG  "net/inetcfg"

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

uspace/lib/drv/generic/remote_nic.c

@@ -104 +104 @@
         
         nic_address_t address;
-        bzero(&address, sizeof(nic_address_t));
+        memset(&address, 0, sizeof(nic_address_t));
         
         int rc = nic_iface->get_address(dev, &address);
@@ -173 +173 @@
         
         nic_device_stats_t stats;
-        bzero(&stats, sizeof(nic_device_stats_t));
+        memset(&stats, 0, sizeof(nic_device_stats_t));
         
         int rc = nic_iface->get_stats(dev, &stats);
@@ -208 +208 @@
         
         nic_device_info_t info;
-        bzero(&info, sizeof(nic_device_info_t));
+        memset(&info, 0, sizeof(nic_device_info_t));
         
         int rc = nic_iface->get_device_info(dev, &info);
@@ -399 +399 @@
         }
         
-        bzero(address_list, max_count * sizeof(nic_address_t));
+        memset(address_list, 0, max_count * sizeof(nic_address_t));
         nic_unicast_mode_t mode = NIC_UNICAST_DEFAULT;
         size_t address_count = 0;
@@ -503 +503 @@
         }
         
-        bzero(address_list, max_count * sizeof(nic_address_t));
+        memset(address_list, 0, max_count * sizeof(nic_address_t));
         nic_multicast_mode_t mode = NIC_MULTICAST_BLOCKED;
         size_t address_count = 0;
@@ -667 +667 @@
         }
         
-        bzero(address_list, max_count * sizeof(nic_address_t));
+        memset(address_list, 0, max_count * sizeof(nic_address_t));
         size_t address_count = 0;
         
@@ -759 +759 @@
         
         nic_vlan_mask_t vlan_mask;
-        bzero(&vlan_mask, sizeof(nic_vlan_mask_t));
+        memset(&vlan_mask, 0, sizeof(nic_vlan_mask_t));
         
         int rc = nic_iface->vlan_get_mask(dev, &vlan_mask);
@@ -932 +932 @@
         }
         
-        bzero(data, max_length);
+        memset(data, 0, max_length);
         
         int rc = nic_iface->wol_virtue_probe(dev, id, &type, max_length,
@@ -982 +982 @@
         }
         
-        bzero(id_list, max_count * sizeof (nic_wv_id_t));
+        memset(id_list, 0, max_count * sizeof (nic_wv_id_t));
         
         int rc = nic_iface->wol_virtue_list(dev, type, max_count, id_list,
@@ -1047 +1047 @@
         }
         
-        bzero(data, max_length);
+        memset(data, 0, max_length);
         
         int rc = nic_iface->wol_load_info(dev, &type, max_length, data,

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/nic/src/nic_driver.c

@@ -682 +682 @@
         fibril_rwlock_initialize(&nic_data->wv_lock);
         
-        bzero(&nic_data->mac, sizeof(nic_address_t));
-        bzero(&nic_data->default_mac, sizeof(nic_address_t));
-        bzero(&nic_data->stats, sizeof(nic_device_stats_t));
+        memset(&nic_data->mac, 0, sizeof(nic_address_t));
+        memset(&nic_data->default_mac, 0, sizeof(nic_address_t));
+        memset(&nic_data->stats, 0, sizeof(nic_device_stats_t));
         
         return nic_data;

uspace/lib/nic/src/nic_impl.c

@@ -129 +129 @@
 
                 fibril_rwlock_write_lock(&nic_data->stats_lock);
-                bzero(&nic_data->stats, sizeof (nic_device_stats_t));
+                memset(&nic_data->stats, 0, sizeof(nic_device_stats_t));
                 fibril_rwlock_write_unlock(&nic_data->stats_lock);
 
@@ -535 +535 @@
                 return ENOMEM;
         }
-        bzero(virtue, sizeof (nic_wol_virtue_t));
+        memset(virtue, 0, sizeof(nic_wol_virtue_t));
         if (length != 0) {
                 virtue->data = malloc(length);

uspace/lib/nic/src/nic_rx_control.c

@@ -55 +55 @@
 int nic_rxc_init(nic_rxc_t *rxc)
 {
-        bzero(rxc, sizeof (nic_rxc_t));
+        memset(rxc, 0, sizeof(nic_rxc_t));
         int rc;
         rc = nic_addr_db_init(&rxc->blocked_sources, ETH_ADDR);

uspace/lib/nic/src/nic_wol_virtues.c

@@ -73 +73 @@
 int nic_wol_virtues_init(nic_wol_virtues_t *wvs)
 {
-        bzero(wvs, sizeof(nic_wol_virtues_t));
+        memset(wvs, 0, sizeof(nic_wol_virtues_t));
         wvs->table_operations.hash = nic_wv_hash;
         wvs->table_operations.key_hash = nic_wv_key_hash;

uspace/lib/posix/source/strings.c

@@ -132 +132 @@
 int posix_bcmp(const void *mem1, const void *mem2, size_t n)
 {
-        return bcmp(mem1, mem2, n);
+        return memcmp(mem1, mem2, n);
 }
 
@@ -156 +156 @@
 void posix_bzero(void *mem, size_t n)
 {
-        bzero(mem, n);
+        memset(mem, 0, n);
 }
 

uspace/lib/usb/src/debug.c

@@ -84 +84 @@
          * Remove previous string.
          */
-        bzero(buffer_dump[buffer_dump_index], BUFFER_DUMP_LEN);
+        memset(buffer_dump[buffer_dump_index], 0, BUFFER_DUMP_LEN);
 
         /* Do the actual dump. */