From 017cc6330d0dcb4f315b93a8d612f4f67204b2b4 Mon Sep 17 00:00:00 2001 From: Daniel Jacobowitz Date: Tue, 25 Sep 2007 12:04:54 +0000 Subject: [PATCH] * sysdeps/unix/sysv/linux/arm/bits/fcntl.h: Correct return value type and __THROW marker of splice, vmsplice, and tee. * sysdeps/unix/sysv/linux/mips/bits/fcntl.h: Correct return value type and __THROW marker of splice, vmsplice, and tee. --- ChangeLog.arm | 5 +++++ ChangeLog.mips | 5 +++++ sysdeps/unix/sysv/linux/arm/bits/fcntl.h | 14 +++++++------- sysdeps/unix/sysv/linux/mips/bits/fcntl.h | 14 +++++++------- 4 files changed, 24 insertions(+), 14 deletions(-) diff --git a/ChangeLog.arm b/ChangeLog.arm index 8554fad..bc5b67e 100644 --- a/ChangeLog.arm +++ b/ChangeLog.arm @@ -1,3 +1,8 @@ +2007-09-25 Joseph Myers + + * sysdeps/unix/sysv/linux/arm/bits/fcntl.h: Correct return value + type and __THROW marker of splice, vmsplice, and tee. + 2007-09-17 Daniel Jacobowitz * sysdeps/unix/sysv/linux/arm/kernel-features.h: Undefine diff --git a/ChangeLog.mips b/ChangeLog.mips index 0e8fda4..3ecda0c 100644 --- a/ChangeLog.mips +++ b/ChangeLog.mips @@ -1,3 +1,8 @@ +2007-09-25 Joseph Myers + + * sysdeps/unix/sysv/linux/mips/bits/fcntl.h: Correct return value + type and __THROW marker of splice, vmsplice, and tee. + 2007-09-12 Joseph Myers * sysdeps/mips/nptl/tls.h (THREAD_GSCOPE_RESET_FLAG): Pass diff --git a/sysdeps/unix/sysv/linux/arm/bits/fcntl.h b/sysdeps/unix/sysv/linux/arm/bits/fcntl.h index 6fcc5c0..bf0321f 100644 --- a/sysdeps/unix/sysv/linux/arm/bits/fcntl.h +++ b/sysdeps/unix/sysv/linux/arm/bits/fcntl.h @@ -221,17 +221,17 @@ extern int sync_file_range (int __fd, __off64_t __from, __off64_t __to, /* Splice address range into a pipe. */ -extern int vmsplice (int __fdout, const struct iovec *__iov, size_t __count, - unsigned int __flags); +extern ssize_t vmsplice (int __fdout, const struct iovec *__iov, + size_t __count, unsigned int __flags); /* Splice two files together. */ -extern int splice (int __fdin, __off64_t *__offin, int __fdout, - __off64_t *__offout, size_t __len, unsigned int __flags) - __THROW; +extern ssize_t splice (int __fdin, __off64_t *__offin, int __fdout, + __off64_t *__offout, size_t __len, + unsigned int __flags); /* In-kernel implementation of tee for pipe buffers. */ -extern int tee (int __fdin, int __fdout, size_t __len, unsigned int __flags) - __THROW; +extern ssize_t tee (int __fdin, int __fdout, size_t __len, + unsigned int __flags); #endif diff --git a/sysdeps/unix/sysv/linux/mips/bits/fcntl.h b/sysdeps/unix/sysv/linux/mips/bits/fcntl.h index 27af9ed..f751886 100644 --- a/sysdeps/unix/sysv/linux/mips/bits/fcntl.h +++ b/sysdeps/unix/sysv/linux/mips/bits/fcntl.h @@ -234,17 +234,17 @@ extern int sync_file_range (int __fd, __off64_t __from, __off64_t __to, /* Splice address range into a pipe. */ -extern int vmsplice (int __fdout, const struct iovec *__iov, size_t __count, - unsigned int __flags); +extern ssize_t vmsplice (int __fdout, const struct iovec *__iov, + size_t __count, unsigned int __flags); /* Splice two files together. */ -extern int splice (int __fdin, __off64_t *__offin, int __fdout, - __off64_t *__offout, size_t __len, unsigned int __flags) - __THROW; +extern ssize_t splice (int __fdin, __off64_t *__offin, int __fdout, + __off64_t *__offout, size_t __len, + unsigned int __flags); /* In-kernel implementation of tee for pipe buffers. */ -extern int tee (int __fdin, int __fdout, size_t __len, unsigned int __flags) - __THROW; +extern ssize_t tee (int __fdin, int __fdout, size_t __len, + unsigned int __flags); #endif -- 2.7.4