Changes in uspace/drv/test/test3/test3.c [267f235:b7fd2a0] in mainline

File:

• uspace/drv/test/test3/test3.c (modified) (7 diffs)

uspace/drv/test/test3/test3.c

@@ -41 +41 @@
 #define NUM_FUNCS 20
 
-static int test3_dev_add(ddf_dev_t *dev);
-static int test3_dev_remove(ddf_dev_t *dev);
-static int test3_fun_online(ddf_fun_t *fun);
-static int test3_fun_offline(ddf_fun_t *fun);
+static errno_t test3_dev_add(ddf_dev_t *dev);
+static errno_t test3_dev_remove(ddf_dev_t *dev);
+static errno_t test3_fun_online(ddf_fun_t *fun);
+static errno_t test3_fun_offline(ddf_fun_t *fun);
 
 static driver_ops_t driver_ops = {
@@ -63 +63 @@
 } test3_t;
 
-static int register_fun_and_add_to_category(ddf_dev_t *parent,
+static errno_t register_fun_and_add_to_category(ddf_dev_t *parent,
     const char *base_name, size_t index, const char *class_name,
     ddf_fun_t **pfun)
 {
         ddf_fun_t *fun = NULL;
-        int rc;
+        errno_t rc;
         char *fun_name = NULL;
         
-        rc = asprintf(&fun_name, "%s%zu", base_name, index);
-        if (rc < 0) {
-                ddf_msg(LVL_ERROR, "Failed to format string: %s", str_error(rc));
+        if (asprintf(&fun_name, "%s%zu", base_name, index) < 0) {
+                ddf_msg(LVL_ERROR, "Failed to format string: No memory");
+                rc = ENOMEM;
                 goto leave;
         }
@@ -106 +106 @@
 }
 
-static int fun_remove(ddf_fun_t *fun, const char *name)
+static errno_t fun_remove(ddf_fun_t *fun, const char *name)
 {
-        int rc;
+        errno_t rc;
 
         ddf_msg(LVL_DEBUG, "fun_remove(%p, '%s')", fun, name);
@@ -127 +127 @@
 }
 
-static int test3_dev_add(ddf_dev_t *dev)
+static errno_t test3_dev_add(ddf_dev_t *dev)
 {
-        int rc = EOK;
+        errno_t rc = EOK;
         test3_t *test3;
 
@@ -153 +153 @@
 }
 
-static int test3_dev_remove(ddf_dev_t *dev)
+static errno_t test3_dev_remove(ddf_dev_t *dev)
 {
         test3_t *test3 = (test3_t *)ddf_dev_data_get(dev);
         char *fun_name;
-        int rc;
+        errno_t rc;
         size_t i;
 
         for (i = 0; i < NUM_FUNCS; i++) {
-                rc = asprintf(&fun_name, "test3_%zu", i);
-                if (rc < 0) {
-                        ddf_msg(LVL_ERROR, "Failed to format string: %s", str_error(rc));
+                if (asprintf(&fun_name, "test3_%zu", i) < 0) {
+                        ddf_msg(LVL_ERROR, "Failed to format string: No memory");
                         return ENOMEM;
                 }
@@ -177 +176 @@
 }
 
-static int test3_fun_online(ddf_fun_t *fun)
+static errno_t test3_fun_online(ddf_fun_t *fun)
 {
         ddf_msg(LVL_DEBUG, "test3_fun_online()");
@@ -183 +182 @@
 }
 
-static int test3_fun_offline(ddf_fun_t *fun)
+static errno_t test3_fun_offline(ddf_fun_t *fun)
 {
         ddf_msg(LVL_DEBUG, "test3_fun_offline()");