diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2007-02-04 09:34:13 +0000 | 
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2007-02-04 09:34:13 +0000 | 
| commit | 5c7d0f39be1407076e8aba626c7aa11ad1aed7ec (patch) | |
| tree | 430ada587619819c48eac949b9f4a07b9d2138c9 | |
| parent | 70c8f81bb83dad4c073eef246f6504fc8a8d3131 (diff) | |
fix compiling and touchup style
| -rw-r--r-- | libc/sysdeps/linux/sh/pread_write.c | 30 | 
1 files changed, 16 insertions, 14 deletions
diff --git a/libc/sysdeps/linux/sh/pread_write.c b/libc/sysdeps/linux/sh/pread_write.c index 9cc4bbf97..415572ef7 100644 --- a/libc/sysdeps/linux/sh/pread_write.c +++ b/libc/sysdeps/linux/sh/pread_write.c @@ -1,12 +1,13 @@ -/* vi: set sw=4 ts=4: - * +/* vi: set sw=4 ts=4: */ +/*   * Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org>   *   * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.   */ -/* Based in part on the files +/* + * Based in part on the files   *		./sysdeps/unix/sysv/linux/pwrite.c, - *		./sysdeps/unix/sysv/linux/pread.c,  + *		./sysdeps/unix/sysv/linux/pread.c,   *		sysdeps/posix/pread.c   *		sysdeps/posix/pwrite.c   * from GNU libc 2.2.5, but reworked considerably... @@ -15,6 +16,7 @@  #include <sys/syscall.h>  #include <unistd.h>  #include <stdint.h> +#include <endian.h>  #ifdef __NR_pread64             /* Newer kernels renamed but it's the same.  */  # ifdef __NR_pread @@ -25,20 +27,20 @@  #ifdef __NR_pread  extern __typeof(pread) __libc_pread; -# define __NR___syscall_pread __NR_pread  -static inline _syscall6(ssize_t, __syscall_pread, int, fd, void *, buf,  +# define __NR___syscall_pread __NR_pread +static inline _syscall6(ssize_t, __syscall_pread, int, fd, void *, buf,  		size_t, count, int, dummy, off_t, offset_hi, off_t, offset_lo);  ssize_t __libc_pread(int fd, void *buf, size_t count, off_t offset) -{  +{  	return(__syscall_pread(fd,buf,count,0,__LONG_LONG_PAIR((off_t)0,offset)));  }  weak_alias(__libc_pread,pread) -# ifdef __UCLIBC_HAS_LFS__  +# ifdef __UCLIBC_HAS_LFS__  extern __typeof(pread64) __libc_pread64;  ssize_t __libc_pread64(int fd, void *buf, size_t count, off64_t offset) -{  +{      uint32_t low = offset & 0xffffffff;      uint32_t high = offset >> 32;  	return(__syscall_pread(fd, buf, count, 0, __LONG_LONG_PAIR (high, low))); @@ -58,20 +60,20 @@ weak_alias(__libc_pread64,pread64)  #ifdef __NR_pwrite  extern __typeof(pwrite) __libc_pwrite; -# define __NR___syscall_pwrite __NR_pwrite  -static inline _syscall6(ssize_t, __syscall_pwrite, int, fd, const void *, buf,  +# define __NR___syscall_pwrite __NR_pwrite +static inline _syscall6(ssize_t, __syscall_pwrite, int, fd, const void *, buf,  		size_t, count, int, dummy, off_t, offset_hi, off_t, offset_lo);  ssize_t __libc_pwrite(int fd, const void *buf, size_t count, off_t offset) -{  +{  	return(__syscall_pwrite(fd,buf,count,0,__LONG_LONG_PAIR((off_t)0,offset)));  }  weak_alias(__libc_pwrite,pwrite) -# ifdef __UCLIBC_HAS_LFS__  +# ifdef __UCLIBC_HAS_LFS__  extern __typeof(pwrite64) __libc_pwrite64;  ssize_t __libc_pwrite64(int fd, const void *buf, size_t count, off64_t offset) -{  +{      uint32_t low = offset & 0xffffffff;      uint32_t high = offset >> 32;  	return(__syscall_pwrite(fd, buf, count, 0, __LONG_LONG_PAIR (high, low)));  | 
