Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
* 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.
  • Loading branch information
Ulrich Drepper committed Aug 30, 2006
1 parent 950398e commit 99ea599
Show file tree
Hide file tree
Showing 10 changed files with 30 additions and 9 deletions.
13 changes: 13 additions & 0 deletions ChangeLog
View file
@@ -1,3 +1,16 @@
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.

2006-08-28 Ulrich Drepper <drepper@redhat.com>

* elf/dl-load.c (_dl_init_paths): Expand DSTs.
Expand Down
3 changes: 2 additions & 1 deletion sysdeps/unix/sysv/linux/alpha/bits/fcntl.h
View file
Expand Up @@ -216,7 +216,8 @@ extern int vmsplice (int __fdout, const struct iovec *__iov, size_t __count,
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. */
Expand Down
3 changes: 2 additions & 1 deletion sysdeps/unix/sysv/linux/i386/bits/fcntl.h
View file
Expand Up @@ -224,7 +224,8 @@ extern int vmsplice (int __fdout, const struct iovec *__iov, size_t __count,
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. */
Expand Down
3 changes: 2 additions & 1 deletion sysdeps/unix/sysv/linux/ia64/bits/fcntl.h
View file
Expand Up @@ -218,7 +218,8 @@ extern int vmsplice (int __fdout, const struct iovec *__iov, size_t __count,
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. */
Expand Down
3 changes: 2 additions & 1 deletion sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h
View file
Expand Up @@ -224,7 +224,8 @@ extern int vmsplice (int __fdout, const struct iovec *__iov, size_t __count,
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. */
Expand Down
3 changes: 2 additions & 1 deletion sysdeps/unix/sysv/linux/s390/bits/fcntl.h
View file
Expand Up @@ -244,7 +244,8 @@ extern int vmsplice (int __fdout, const struct iovec *__iov, size_t __count,
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. */
Expand Down
3 changes: 2 additions & 1 deletion sysdeps/unix/sysv/linux/sh/bits/fcntl.h
View file
Expand Up @@ -224,7 +224,8 @@ extern int vmsplice (int __fdout, const struct iovec *__iov, size_t __count,
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. */
Expand Down
3 changes: 2 additions & 1 deletion sysdeps/unix/sysv/linux/sparc/bits/fcntl.h
View file
Expand Up @@ -243,7 +243,8 @@ extern int vmsplice (int __fdout, const struct iovec *__iov, size_t __count,
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. */
Expand Down
2 changes: 1 addition & 1 deletion sysdeps/unix/sysv/linux/syscalls.list
View file
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h
View file
Expand Up @@ -238,7 +238,8 @@ extern int vmsplice (int __fdout, const struct iovec *__iov, size_t __count,
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. */
Expand Down

0 comments on commit 99ea599

Please sign in to comment.