CVS commit: src

[Antti Kantee]

Module Name:    src
Committed By:   pooka
Date:           Fri May 15 15:54:03 UTC 2009

Modified Files:
        src/lib/libukfs: ukfs.c
        src/tests/syscall: t_cmsg.c

Log Message:
Fix calls to rump syscalls now that the padding argument is no
longer advertised.


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/lib/libukfs/ukfs.c
cvs rdiff -u -r1.6 -r1.7 src/tests/syscall/t_cmsg.c

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


Modified files:

Index: src/lib/libukfs/ukfs.c
diff -u src/lib/libukfs/ukfs.c:1.26 src/lib/libukfs/ukfs.c:1.27
--- src/lib/libukfs/ukfs.c:1.26	Sat May  2 15:20:08 2009
+++ src/lib/libukfs/ukfs.c	Fri May 15 15:54:03 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: ukfs.c,v 1.26 2009/05/02 15:20:08 pooka Exp $	*/
+/*	$NetBSD: ukfs.c,v 1.27 2009/05/15 15:54:03 pooka Exp $	*/
 
 /*
  * Copyright (c) 2007, 2008  Antti Kantee.  All Rights Reserved.
@@ -414,7 +414,7 @@
 	if (fd == -1)
 		goto out;
 
-	xfer = rump_sys_pread(fd, buf, bufsize, 0, off);
+	xfer = rump_sys_pread(fd, buf, bufsize, off);
 	rump_sys_close(fd);
 
  out:
@@ -430,7 +430,7 @@
 ukfs_read_fd(struct ukfs *ukfs, int fd, off_t off, uint8_t *buf, size_t buflen)
 {
 
-	return rump_sys_pread(fd, buf, buflen, 0, off);
+	return rump_sys_pread(fd, buf, buflen, off);
 }
 
 ssize_t
@@ -446,7 +446,7 @@
 		goto out;
 
 	/* write and commit */
-	xfer = rump_sys_pwrite(fd, buf, bufsize, 0, off);
+	xfer = rump_sys_pwrite(fd, buf, bufsize, off);
 	if (xfer > 0)
 		rump_sys_fsync(fd);
 
@@ -467,7 +467,7 @@
 {
 	ssize_t xfer;
 
-	xfer = rump_sys_pwrite(fd, buf, buflen, 0, off);
+	xfer = rump_sys_pwrite(fd, buf, buflen, off);
 	if (xfer > 0 && dosync)
 		rump_sys_fsync(fd);
 

Index: src/tests/syscall/t_cmsg.c
diff -u src/tests/syscall/t_cmsg.c:1.6 src/tests/syscall/t_cmsg.c:1.7
--- src/tests/syscall/t_cmsg.c:1.6	Fri May  8 13:03:46 2009
+++ src/tests/syscall/t_cmsg.c	Fri May 15 15:54:03 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_cmsg.c,v 1.6 2009/05/08 13:03:46 pooka Exp $	*/
+/*	$NetBSD: t_cmsg.c,v 1.7 2009/05/15 15:54:03 pooka Exp $	*/
 
 #include <sys/types.h>
 #include <sys/mount.h>
@@ -142,7 +142,7 @@
 	    sizeof(MAGICSTRING))
 		atf_tc_fail_errno("file write"); /* XXX: errno */
 	/* reset offset */
-	rump_sys_lseek(fd, 0, 0, SEEK_SET);
+	rump_sys_lseek(fd, 0, SEEK_SET);
 
 	cmp = malloc(CMSG_LEN(sizeof(int)));