Changeset 132ab5d1 in mainline for uspace/drv/test/test3/test3.c

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (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 commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

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

uspace/drv/test/test3/test3.c

@@ -71 +71 @@
         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;
         }
@@ -161 +161 @@
 
         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;
                 }