Changeset ab936440 in mainline for uspace/drv/test/test2/test2.c

Timestamp:

2019-02-12T20:42:42Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Branches:

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

Children:

f31ca47

Parents:

7f7817a9 (diff), 4805495 (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.

git-author:

Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:26:18)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:42:42)

Message:

Merge branch 'master' into bdsh_alias

Conflicts:

uspace/app/bdsh/Makefile
uspace/app/bdsh/cmds/modules/modules.h

Ccheck correction and removing header which includes itself

File:

• uspace/drv/test/test2/test2.c (modified) (2 diffs)

uspace/drv/test/test2/test2.c

@@ -31 +31 @@
 
 #include <assert.h>
-#include <async.h>
 #include <stdio.h>
 #include <errno.h>
+#include <fibril.h>
 #include <str.h>
 #include <str_error.h>
@@ -140 +140 @@
         rc = ddf_fun_bind(fun_a);
         if (rc != EOK) {
+                ddf_fun_destroy(fun_a);
                 ddf_msg(LVL_ERROR, "Failed binding function 'a'.");
                 return rc;
         }
 
-        ddf_fun_add_to_category(fun_a, "virtual");
+        rc = ddf_fun_add_to_category(fun_a, "virtual");
+        if (rc != EOK) {
+                ddf_fun_unbind(fun_a);
+                ddf_fun_destroy(fun_a);
+                ddf_msg(LVL_ERROR, "Failed adding function 'a' to category "
+                    "'virtual'.");
+                return rc;
+        }
+
         test2->fun_a = fun_a;