- trim any trailing whitespace

[uclinux-h8/uClibc.git] / libc / sysdeps / linux / powerpc / pread_write.c

diff --git a/libc/sysdeps/linux/powerpc/pread_write.c b/libc/sysdeps/linux/powerpc/pread_write.c
index b8d0cae..cdbadfd 100644 (file)
--- a/libc/sysdeps/linux/powerpc/pread_write.c
+++ b/libc/sysdeps/linux/powerpc/pread_write.c
@@ -6,70 +6,62 @@
  */
 /* 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...
  */
 
-#define _GNU_SOURCE
-#define _LARGEFILE64_SOURCE
-#include <features.h>
-#undef __OPTIMIZE__
-/* We absolutely do _NOT_ want interfaces silently
- *  *  * renamed under us or very bad things will happen... */
-#ifdef __USE_FILE_OFFSET64
-# undef __USE_FILE_OFFSET64
-#endif
-
-#include <errno.h>
-#include <sys/types.h>
 #include <sys/syscall.h>
 #include <unistd.h>
 
-#if ! defined __UCLIBC_HAS_LFS__ 
-#define off64_t off_t
+#ifndef __UCLIBC_HAS_LFS__
+# define off64_t off_t
 #endif
 
 #ifdef __NR_pread
-#define __NR___syscall_pread __NR_pread 
-static inline _syscall4(ssize_t, __syscall_pread, int, fd, 
+extern __typeof(pread) __libc_pread;
+# define __NR___syscall_pread __NR_pread
+static __inline__ _syscall4(ssize_t, __syscall_pread, int, fd,
                void *, buf, size_t, count, off64_t, offset);
 
 ssize_t __libc_pread(int fd, void *buf, size_t count, off_t offset)
-{ 
+{
        return(__syscall_pread(fd, buf, count, (off64_t)offset));
 }
-strong_alias(__libc_pread,pread)
+weak_alias(__libc_pread,pread)
 
-#if defined __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)
-{ 
+{
        return(__syscall_pread(fd, buf, count, offset));
 }
-strong_alias(__libc_pread64,pread64)
-#endif /* __UCLIBC_HAS_LFS__  */
+weak_alias(__libc_pread64,pread64)
+# endif /* __UCLIBC_HAS_LFS__  */
 #endif /* __NR_pread */
 
 
 #ifdef __NR_pwrite
-#define __NR___syscall_pwrite __NR_pwrite 
-static inline _syscall4(ssize_t, __syscall_pwrite, int, fd, 
+extern __typeof(pwrite) __libc_pwrite;
+# define __NR___syscall_pwrite __NR_pwrite
+static __inline__ _syscall4(ssize_t, __syscall_pwrite, int, fd,
                const void *, buf, size_t, count, off64_t, offset);
 
 ssize_t __libc_pwrite(int fd, const void *buf, size_t count, off_t offset)
-{ 
+{
        return(__syscall_pwrite(fd, buf, count, (off64_t)offset));
 }
-strong_alias(__libc_pwrite,pwrite)
+weak_alias(__libc_pwrite,pwrite)
 
-#if defined __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)
-{ 
+{
        return(__syscall_pwrite(fd, buf, count, offset));
 }
-strong_alias(__libc_pwrite64,pwrite64)
-#endif /* __UCLIBC_HAS_LFS__  */
+weak_alias(__libc_pwrite64,pwrite64)
+# endif /* __UCLIBC_HAS_LFS__  */
 #endif /* __NR_pwrite */
 
 
@@ -78,16 +70,15 @@ strong_alias(__libc_pwrite64,pwrite64)
 libc_hidden_proto(read)
 libc_hidden_proto(write)
 libc_hidden_proto(lseek)
-libc_hidden_proto(lseek64)
 
-static ssize_t __fake_pread_write(int fd, void *buf, 
+static ssize_t __fake_pread_write(int fd, void *buf,
                size_t count, off_t offset, int do_pwrite)
 {
        int save_errno;
        ssize_t result;
        off_t old_offset;
 
-       /* Since we must not change the file pointer preserve the 
+       /* Since we must not change the file pointer preserve the
         * value so that we can restore it later.  */
        if ((old_offset=lseek(fd, 0, SEEK_CUR)) == (off_t) -1)
                return -1;
@@ -104,7 +95,7 @@ static ssize_t __fake_pread_write(int fd, void *buf,
                result = read(fd, buf, count);
        }
 
-       /* Now we have to restore the position.  If this fails we 
+       /* Now we have to restore the position.  If this fails we
         * have to return this as an error.  */
        save_errno = errno;
        if (lseek(fd, old_offset, SEEK_SET) == (off_t) -1)
@@ -117,22 +108,24 @@ static ssize_t __fake_pread_write(int fd, void *buf,
        return(result);
 }
 
-#if defined __UCLIBC_HAS_LFS__ 
-static ssize_t __fake_pread_write64(int fd, void *buf, 
+# ifdef __UCLIBC_HAS_LFS__
+libc_hidden_proto(lseek64)
+
+static ssize_t __fake_pread_write64(int fd, void *buf,
                size_t count, off64_t offset, int do_pwrite)
 {
        int save_errno;
        ssize_t result;
        off64_t old_offset;
 
-       /* Since we must not change the file pointer preserve the 
+       /* Since we must not change the file pointer preserve the
         * value so that we can restore it later.  */
        if ((old_offset=lseek64(fd, 0, SEEK_CUR)) == (off64_t) -1)
                return -1;
 
        /* Set to wanted position.  */
-       if (lseek64(fd, offset, SEEK_SET) == (off64_t) -1) 
-               return -1;                               
+       if (lseek64(fd, offset, SEEK_SET) == (off64_t) -1)
+               return -1;
 
        if (do_pwrite==1) {
                /* Write the data.  */
@@ -152,7 +145,7 @@ static ssize_t __fake_pread_write64(int fd, void *buf,
        __set_errno (save_errno);
        return result;
 }
-#endif /* __UCLIBC_HAS_LFS__  */
+# endif /* __UCLIBC_HAS_LFS__  */
 #endif /*  ! defined __NR_pread || ! defined __NR_pwrite */
 
 #ifndef __NR_pread
@@ -160,30 +153,30 @@ ssize_t __libc_pread(int fd, void *buf, size_t count, off_t offset)
 {
        return(__fake_pread_write(fd, buf, count, offset, 0));
 }
-strong_alias(__libc_pread,pread)
+weak_alias(__libc_pread,pread)
 
-#if defined __UCLIBC_HAS_LFS__ 
+# ifdef __UCLIBC_HAS_LFS__
 ssize_t __libc_pread64(int fd, void *buf, size_t count, off64_t offset)
-{ 
+{
        return(__fake_pread_write64(fd, buf, count, offset, 0));
 }
-strong_alias(__libc_pread64,pread64)
-#endif /* __UCLIBC_HAS_LFS__  */
+weak_alias(__libc_pread64,pread64)
+# endif /* __UCLIBC_HAS_LFS__  */
 #endif /* ! __NR_pread */
 
 
 #ifndef __NR_pwrite
 ssize_t __libc_pwrite(int fd, const void *buf, size_t count, off_t offset)
 {
-       return(__fake_pread_write(fd, buf, count, offset, 1));
+       return(__fake_pread_write(fd, (void*)buf, count, offset, 1));
 }
-strong_alias(__libc_pwrite,pwrite)
+weak_alias(__libc_pwrite,pwrite)
 
-#if defined __UCLIBC_HAS_LFS__ 
+# ifdef __UCLIBC_HAS_LFS__
 ssize_t __libc_pwrite64(int fd, const void *buf, size_t count, off64_t offset)
-{ 
+{
        return(__fake_pread_write64(fd, (void*)buf, count, offset, 1));
 }
-strong_alias(__libc_pwrite64,pwrite64)
-#endif /* __UCLIBC_HAS_LFS__  */
+weak_alias(__libc_pwrite64,pwrite64)
+# endif /* __UCLIBC_HAS_LFS__  */
 #endif /* ! __NR_pwrite */