Changeset 132ab5d1 in mainline for uspace/srv/logger/logs.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/srv/logger/logs.c (modified) (3 diffs)

uspace/srv/logger/logs.c

@@ -31 +31 @@
  */
 #include <assert.h>
-#include <malloc.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <str.h>
-#include <stdio.h>
-#include <errno.h>
 #include "logger.h"
 
@@ -57 +57 @@
         if (result == NULL)
                 return ENOMEM;
-        int rc = asprintf(&result->filename, "/log/%s", name);
-        if (rc < 0) {
+        if (asprintf(&result->filename, "/log/%s", name) < 0) {
                 free(result);
                 return ENOMEM;
@@ -91 +90 @@
                         goto error;
         } else {
-                int rc = asprintf(&result->full_name, "%s/%s",
-                    parent->full_name, name);
-                if (rc < 0)
+                if (asprintf(&result->full_name, "%s/%s",
+                    parent->full_name, name) < 0)
                         goto error;
                 result->dest = parent->dest;