Changeset 533e2d7 in mainline for uspace/lib/nic/src/nic_impl.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/nic/src/nic_impl.c (modified) (2 diffs)

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