Changeset ab936440 in mainline for uspace/drv/test/test3/test3.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/test3/test3.c (modified) (3 diffs)

uspace/drv/test/test3/test3.c

@@ -70 +70 @@
         errno_t rc;
         char *fun_name = NULL;
+        bool bound = false;
 
         if (asprintf(&fun_name, "%s%zu", base_name, index) < 0) {
@@ -91 +92 @@
         }
 
-        ddf_fun_add_to_category(fun, class_name);
+        bound = true;
+
+        rc = ddf_fun_add_to_category(fun, class_name);
+        if (rc != EOK) {
+                ddf_msg(LVL_ERROR, "Failed addning function %s to category %s: "
+                    "%s", fun_name, class_name, str_error(rc));
+                goto leave;
+        }
 
         ddf_msg(LVL_NOTE, "Registered exposed function `%s'.", fun_name);
@@ -98 +106 @@
         free(fun_name);
 
+        if (bound)
+                ddf_fun_unbind(fun);
         if ((rc != EOK) && (fun != NULL)) {
                 ddf_fun_destroy(fun);