Changeset 4f87a85a in mainline for uspace/drv/test

Timestamp:

2018-12-10T14:29:35Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

ca4c5596

Parents:

433d52f

git-author:

Jiri Svoboda <jiri@…> (2018-12-10 07:39:07)

git-committer:

Jiri Svoboda <jiri@…> (2018-12-10 14:29:35)

Message:

Check return code from ddf_add_fun_to_category

Location:

uspace/drv/test

Files:

• test1/test1.c (modified) (1 diff)
• test2/test2.c (modified) (1 diff)
• test3/test3.c (modified) (3 diffs)

uspace/drv/test/test1/test1.c

@@ -176 +176 @@
         }
 
-        ddf_fun_add_to_category(fun_a, "virtual");
+        rc = ddf_fun_add_to_category(fun_a, "virtual");
+        if (rc != EOK) {
+                ddf_msg(LVL_ERROR, "Failed adding function 'a' to category "
+                    "'virtual'.");
+                ddf_fun_unbind(fun_a);
+                ddf_fun_destroy(fun_a);
+                goto error;
+        }
 
         if (str_cmp(dev_name, "test1") == 0) {

uspace/drv/test/test2/test2.c

@@ -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;
 

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);