[PATCH] Adjust splice prototypes

[Jakub Jelinek]

Hi!

In
http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=529565dcb1581c9a1e3f6df1c1763ca3e0f0d512
splice changed prototype, but glibc side wasn't adjusted until now.

2006-08-30  Jakub Jelinek  <jakub@redhat.com>

	* sysdeps/unix/sysv/linux/alpha/bits/fcntl.h (splice): Add offin
	and offout arguments to the prototype.
	* sysdeps/unix/sysv/linux/s390/bits/fcntl.h (splice): Likewise.
	* sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h (splice): Likewise.
	* sysdeps/unix/sysv/linux/sparc/bits/fcntl.h (splice): Likewise.
	* sysdeps/unix/sysv/linux/sh/bits/fcntl.h (splice): Likewise.
	* sysdeps/unix/sysv/linux/i386/bits/fcntl.h (splice): Likewise.
	* sysdeps/unix/sysv/linux/ia64/bits/fcntl.h (splice): Likewise.
	* sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h (splice): Likewise.
	* sysdeps/unix/sysv/linux/syscalls.list (splice): Adjust args string.

--- libc/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h.jj	2006-08-03 19:36:26.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h	2006-08-30 16:23:40.000000000 +0200
@@ -216,7 +216,8 @@ extern int vmsplice (int __fdout, const 
 		     unsigned int __flags);
 
 /* Splice two files together.  */
-extern int splice (int __fdin, int __fdout, size_t __len, unsigned int __flags)
+extern int splice (int __fdin, __off64_t *__offin, int __fdout,
+		   __off64_t *__offout, size_t __len, unsigned int __flags)
     __THROW;
 
 /* In-kernel implementation of tee for pipe buffers.  */
--- libc/sysdeps/unix/sysv/linux/s390/bits/fcntl.h.jj	2006-08-03 19:36:26.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/s390/bits/fcntl.h	2006-08-30 16:24:04.000000000 +0200
@@ -244,7 +244,8 @@ extern int vmsplice (int __fdout, const 
 		     unsigned int __flags);
 
 /* Splice two files together.  */
-extern int splice (int __fdin, int __fdout, size_t __len, unsigned int __flags)
+extern int splice (int __fdin, __off64_t *__offin, int __fdout,
+		   __off64_t *__offout, size_t __len, unsigned int __flags)
     __THROW;
 
 /* In-kernel implementation of tee for pipe buffers.  */
--- libc/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h.jj	2006-08-03 19:36:26.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h	2006-08-30 16:24:13.000000000 +0200
@@ -224,7 +224,8 @@ extern int vmsplice (int __fdout, const 
 		     unsigned int __flags);
 
 /* Splice two files together.  */
-extern int splice (int __fdin, int __fdout, size_t __len, unsigned int __flags)
+extern int splice (int __fdin, __off64_t *__offin, int __fdout,
+		   __off64_t *__offout, size_t __len, unsigned int __flags)
     __THROW;
 
 /* In-kernel implementation of tee for pipe buffers.  */
--- libc/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h.jj	2006-08-03 19:36:26.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h	2006-08-30 16:24:21.000000000 +0200
@@ -243,7 +243,8 @@ extern int vmsplice (int __fdout, const 
 		     unsigned int __flags);
 
 /* Splice two files together.  */
-extern int splice (int __fdin, int __fdout, size_t __len, unsigned int __flags)
+extern int splice (int __fdin, __off64_t *__offin, int __fdout,
+		   __off64_t *__offout, size_t __len, unsigned int __flags)
     __THROW;
 
 /* In-kernel implementation of tee for pipe buffers.  */
--- libc/sysdeps/unix/sysv/linux/sh/bits/fcntl.h.jj	2006-08-03 19:36:26.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/sh/bits/fcntl.h	2006-08-30 16:24:30.000000000 +0200
@@ -224,7 +224,8 @@ extern int vmsplice (int __fdout, const 
 		     unsigned int __flags);
 
 /* Splice two files together.  */
-extern int splice (int __fdin, int __fdout, size_t __len, unsigned int __flags)
+extern int splice (int __fdin, __off64_t *__offin, int __fdout,
+		   __off64_t *__offout, size_t __len, unsigned int __flags)
     __THROW;
 
 /* In-kernel implementation of tee for pipe buffers.  */
--- libc/sysdeps/unix/sysv/linux/i386/bits/fcntl.h.jj	2006-08-03 19:36:26.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/i386/bits/fcntl.h	2006-08-30 16:24:41.000000000 +0200
@@ -224,7 +224,8 @@ extern int vmsplice (int __fdout, const 
 		     unsigned int __flags);
 
 /* Splice two files together.  */
-extern int splice (int __fdin, int __fdout, size_t __len, unsigned int __flags)
+extern int splice (int __fdin, __off64_t *__offin, int __fdout,
+		   __off64_t *__offout, size_t __len, unsigned int __flags)
     __THROW;
 
 /* In-kernel implementation of tee for pipe buffers.  */
--- libc/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h.jj	2006-08-10 13:16:30.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h	2006-08-30 16:24:50.000000000 +0200
@@ -218,7 +218,8 @@ extern int vmsplice (int __fdout, const 
 		     unsigned int __flags);
 
 /* Splice two files together.  */
-extern int splice (int __fdin, int __fdout, size_t __len, unsigned int __flags)
+extern int splice (int __fdin, __off64_t *__offin, int __fdout,
+		   __off64_t *__offout, size_t __len, unsigned int __flags)
     __THROW;
 
 /* In-kernel implementation of tee for pipe buffers.  */
--- libc/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h.jj	2006-08-03 19:36:26.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h	2006-08-30 16:24:59.000000000 +0200
@@ -238,7 +238,8 @@ extern int vmsplice (int __fdout, const 
 		     unsigned int __flags);
 
 /* Splice two files together.  */
-extern int splice (int __fdin, int __fdout, size_t __len, unsigned int __flags)
+extern int splice (int __fdin, __off64_t *__offin, int __fdout,
+		   __off64_t *__offout, size_t __len, unsigned int __flags)
     __THROW;
 
 /* In-kernel implementation of tee for pipe buffers.  */
--- libc/sysdeps/unix/sysv/linux/syscalls.list.jj	2006-08-03 19:36:26.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/syscalls.list	2006-08-30 16:23:16.000000000 +0200
@@ -67,7 +67,7 @@ setfsgid	EXTRA	setfsgid	i:i	setfsgid
 setfsuid	EXTRA	setfsuid	i:i	setfsuid
 setpgid		-	setpgid		i:ii	__setpgid	setpgid
 sigaltstack	-	sigaltstack	i:PP	__sigaltstack	sigaltstack
-splice		EXTRA	splice		i:iiii	splice
+splice		EXTRA	splice		i:iPiPii	splice
 sysinfo		EXTRA	sysinfo		i:p	sysinfo
 swapon		-	swapon		i:si	__swapon	swapon
 swapoff		-	swapoff		i:s	__swapoff	swapoff

	Jakub