Changeset 0773396 in mainline for uspace/lib/c/generic/pio_trace.c

Timestamp:

2013-12-25T13:05:25Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

bc54126c

Parents:

f4a47e52 (diff), 6946f23 (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/c/generic/pio_trace.c (modified) (2 diffs)

uspace/lib/c/generic/pio_trace.c

@@ -95 +95 @@
         pio_regions_t *regions = get_regions();
         fibril_rwlock_read_lock(&regions->guard);
-        list_foreach(regions->list, it) {
-                assert(it);
-                region_t *reg = region_instance(it);
-                assert(reg);
+        list_foreach(regions->list, link, region_t, reg) {
                 if ((r >= reg->base) && (r < reg->base + reg->size)) {
                         if (reg->log)
@@ -131 +128 @@
         fibril_rwlock_write_lock(&regions->guard);
         list_foreach_safe(regions->list, it, next) {
-                assert(it);
                 region_t *reg = region_instance(it);
-                assert(reg);
                 if (r >= reg->base && (r < reg->base + reg->size)) {
-                                list_remove(&reg->link);
-                                region_destroy(reg);
+                        list_remove(&reg->link);
+                        region_destroy(reg);
                 }
         }