Changeset 132ab5d1 in mainline for uspace/lib/c/generic/as.c

Timestamp:

2018-01-30T03:20:45Z (7 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/as.c (modified) (4 diffs)

uspace/lib/c/generic/as.c

@@ -40 +40 @@
 #include <stdint.h>
 #include <bitops.h>
-#include <malloc.h>
 #include "private/libc.h"
 
@@ -77 +76 @@
 int as_area_resize(void *address, size_t size, unsigned int flags)
 {
-        return __SYSCALL3(SYS_AS_AREA_RESIZE, (sysarg_t) address,
+        return (int) __SYSCALL3(SYS_AS_AREA_RESIZE, (sysarg_t) address,
             (sysarg_t) size, (sysarg_t) flags);
 }
@@ -91 +90 @@
 int as_area_destroy(void *address)
 {
-        return __SYSCALL1(SYS_AS_AREA_DESTROY, (sysarg_t) address);
+        return (int) __SYSCALL1(SYS_AS_AREA_DESTROY, (sysarg_t) address);
 }
 
@@ -105 +104 @@
 int as_area_change_flags(void *address, unsigned int flags)
 {
-        return __SYSCALL2(SYS_AS_AREA_CHANGE_FLAGS, (sysarg_t) address,
+        return (int) __SYSCALL2(SYS_AS_AREA_CHANGE_FLAGS, (sysarg_t) address,
             (sysarg_t) flags);
 }