From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 16724 invoked by alias); 30 Aug 2006 14:30:02 -0000 Received: (qmail 16661 invoked by uid 22791); 30 Aug 2006 14:30:00 -0000 X-Spam-Check-By: sourceware.org Received: from sunsite.ms.mff.cuni.cz (HELO sunsite.mff.cuni.cz) (195.113.15.26) by sourceware.org (qpsmtpd/0.31) with ESMTP; Wed, 30 Aug 2006 14:29:55 +0000 Received: from sunsite.mff.cuni.cz (sunsite.mff.cuni.cz [127.0.0.1]) by sunsite.mff.cuni.cz (8.13.1/8.13.1) with ESMTP id k7UETh88024328; Wed, 30 Aug 2006 16:29:43 +0200 Received: (from jj@localhost) by sunsite.mff.cuni.cz (8.13.1/8.13.1/Submit) id k7UEThgO024327; Wed, 30 Aug 2006 16:29:43 +0200 Date: Wed, 30 Aug 2006 14:30:00 -0000 From: Jakub Jelinek To: Ulrich Drepper Cc: Glibc hackers Subject: [PATCH] Adjust splice prototypes Message-ID: <20060830142942.GN4556@sunsite.mff.cuni.cz> Reply-To: Jakub Jelinek Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.4.1i Mailing-List: contact libc-hacker-help@sourceware.org; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-hacker-owner@sourceware.org X-SW-Source: 2006-08/txt/msg00033.txt.bz2 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 * 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