Changeset 132ab5d1 in mainline for uspace/lib/c/generic/sysinfo.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/lib/c/generic/sysinfo.c (modified) (3 diffs)

uspace/lib/c/generic/sysinfo.c

@@ -37 +37 @@
 #include <str.h>
 #include <errno.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <stdbool.h>
 #include <stddef.h>
@@ -92 +92 @@
         /* Get the data */
         size_t sz;
-        ret = __SYSCALL5(SYS_SYSINFO_GET_KEYS, (sysarg_t) path,
+        ret = (int) __SYSCALL5(SYS_SYSINFO_GET_KEYS, (sysarg_t) path,
             (sysarg_t) str_size(path), (sysarg_t) data, (sysarg_t) *size,
             (sysarg_t) &sz);
@@ -186 +186 @@
         /* Get the data */
         size_t sz;
-        ret = __SYSCALL5(SYS_SYSINFO_GET_DATA, (sysarg_t) path,
+        ret = (int) __SYSCALL5(SYS_SYSINFO_GET_DATA, (sysarg_t) path,
             (sysarg_t) str_size(path), (sysarg_t) data, (sysarg_t) *size,
             (sysarg_t) &sz);