Changeset 6e8ed225 in mainline for uspace/lib/nic/src

Timestamp:

2013-05-20T18:43:13Z (12 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/nic/src

Files:

• nic_addr_db.c (modified) (1 diff)
• nic_driver.c (modified) (1 diff)
• nic_impl.c (modified) (2 diffs)
• nic_rx_control.c (modified) (1 diff)
• nic_wol_virtues.c (modified) (1 diff)

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;