Module Name:    src
Committed By:   christos
Date:           Wed Feb 25 13:20:05 UTC 2015

Modified Files:
        src/sys/rump/librump/rumpkern: rump_syscalls.c

Log Message:
belated regen (posix_fallocate, readlinkat)


To generate a diff of this commit:
cvs rdiff -u -r1.104 -r1.105 src/sys/rump/librump/rumpkern/rump_syscalls.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/rump/librump/rumpkern/rump_syscalls.c
diff -u src/sys/rump/librump/rumpkern/rump_syscalls.c:1.104 src/sys/rump/librump/rumpkern/rump_syscalls.c:1.105
--- src/sys/rump/librump/rumpkern/rump_syscalls.c:1.104	Fri Jul 25 04:27:36 2014
+++ src/sys/rump/librump/rumpkern/rump_syscalls.c	Wed Feb 25 08:20:05 2015
@@ -1,10 +1,10 @@
-/* $NetBSD: rump_syscalls.c,v 1.104 2014/07/25 08:27:36 dholland Exp $ */
+/* $NetBSD: rump_syscalls.c,v 1.105 2015/02/25 13:20:05 christos Exp $ */
 
 /*
  * System call vector and marshalling for rump.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.270 2014/07/25 08:25:47 dholland Exp
+ * created from	NetBSD: syscalls.master,v 1.272 2015/02/22 00:50:30 christos Exp
  */
 
 #ifdef RUMP_CLIENT
@@ -15,7 +15,7 @@
 
 #ifdef __NetBSD__
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rump_syscalls.c,v 1.104 2014/07/25 08:27:36 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump_syscalls.c,v 1.105 2015/02/25 13:20:05 christos Exp $");
 
 #include <sys/fstypes.h>
 #include <sys/proc.h>
@@ -6072,13 +6072,13 @@ __weak_alias(_openat,rump___sysimpl_open
 __strong_alias(_sys_openat,rump___sysimpl_openat);
 #endif /* RUMP_KERNEL_IS_LIBC */
 
-int rump___sysimpl_readlinkat(int, const char *, char *, size_t);
-int
+ssize_t rump___sysimpl_readlinkat(int, const char *, char *, size_t);
+ssize_t
 rump___sysimpl_readlinkat(int fd, const char * path, char * buf, size_t bufsize)
 {
 	register_t retval[2];
 	int error = 0;
-	int rv = -1;
+	ssize_t rv = -1;
 	struct sys_readlinkat_args callarg;
 
 	memset(&callarg, 0, sizeof(callarg));
@@ -6090,8 +6090,8 @@ rump___sysimpl_readlinkat(int fd, const 
 	error = rsys_syscall(SYS_readlinkat, &callarg, sizeof(callarg), retval);
 	rsys_seterrno(error);
 	if (error == 0) {
-		if (sizeof(int) > sizeof(register_t))
-			rv = *(int *)retval;
+		if (sizeof(ssize_t) > sizeof(register_t))
+			rv = *(ssize_t *)retval;
 		else
 			rv = *retval;
 	}
@@ -6320,7 +6320,6 @@ int
 rump___sysimpl_posix_fallocate(int fd, off_t pos, off_t len)
 {
 	register_t retval[2];
-	int error = 0;
 	int rv = -1;
 	struct sys_posix_fallocate_args callarg;
 
@@ -6330,14 +6329,11 @@ rump___sysimpl_posix_fallocate(int fd, o
 	SPARG(&callarg, pos) = pos;
 	SPARG(&callarg, len) = len;
 
-	error = rsys_syscall(SYS_posix_fallocate, &callarg, sizeof(callarg), retval);
-	rsys_seterrno(error);
-	if (error == 0) {
-		if (sizeof(int) > sizeof(register_t))
-			rv = *(int *)retval;
-		else
-			rv = *retval;
-	}
+	rsys_syscall(SYS_posix_fallocate, &callarg, sizeof(callarg), retval);
+	if (sizeof(int) > sizeof(register_t))
+		rv = *(int *)retval;
+	else
+		rv = *retval;
 	return rv;
 }
 #ifdef RUMP_KERNEL_IS_LIBC

Reply via email to