Changeset dd0c8a0 in mainline for uspace/app/tester/mm/common.c

Timestamp:

2013-09-29T06:56:33Z (12 years ago)

Author:

Beniamino Galvani <b.galvani@…>

Branches:

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

Children:

a9bd960d

Parents:

3deb0155 (diff), 13be2583 (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/app/tester/mm/common.c (modified) (2 diffs)

uspace/app/tester/mm/common.c

@@ -84 +84 @@
 }
 
-static bool overlap_match(link_t *link, void *addr, size_t size)
-{
-        mem_block_t *block = list_get_instance(link, mem_block_t, link);
-        
+static bool overlap_match(mem_block_t *block, void *addr, size_t size)
+{
         /* Entry block control structure <mbeg, mend) */
         uint8_t *mbeg = (uint8_t *) block;
@@ -125 +123 @@
         bool fnd = false;
         
-        list_foreach(mem_blocks, link) {
-                if (overlap_match(link, addr, size)) {
+        list_foreach(mem_blocks, link, mem_block_t, block) {
+                if (overlap_match(block, addr, size)) {
                         fnd = true;
                         break;