Changeset 6a44ee4 in mainline for uspace/drv/test/test1/test1.c

Timestamp:

2011-07-20T15:26:21Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

efcebe1

Parents:

25bef0ff (diff), a701812 (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/drv/test/test1/test1.c (moved) (moved from uspace/drv/test1/test1.c ) (1 diff)

uspace/drv/test/test1/test1.c

@@ -74 +74 @@
         }
 
-        rc = ddf_fun_add_match_id(fun, str_dup(match_id), match_score);
+        rc = ddf_fun_add_match_id(fun, match_id, match_score);
         if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Failed adding match IDs to function %s",