From 131c6eb7daca02f20884c59e254d0963d07a9d5a Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Fri, 6 Sep 2002 19:20:20 +0000 Subject: [PATCH] 2002-09-04 Bruno Haible * sysdeps/generic/bits/ustat.h: Comment fix. * io/sys/sendfile.h: Comment fix. * sysdeps/posix/pread.c: Comment fix. * sysdeps/posix/pread64.c: Comment fix. * sysdeps/posix/pwrite.c: Comment fix. * sysdeps/posix/pwrite64.c: Comment fix. --- bits/ustat.h | 4 ++-- io/sys/sendfile.h | 7 +++++-- sysdeps/generic/bits/ustat.h | 4 ++-- sysdeps/posix/pread.c | 4 +++- sysdeps/posix/pread64.c | 4 +++- sysdeps/posix/pwrite.c | 4 +++- sysdeps/posix/pwrite64.c | 2 ++ 7 files changed, 20 insertions(+), 9 deletions(-) diff --git a/bits/ustat.h b/bits/ustat.h index fc08758..69c6b72 100644 --- a/bits/ustat.h +++ b/bits/ustat.h @@ -24,8 +24,8 @@ struct ustat { - __daddr_t f_tfree; - __ino_t f_tinode; + __daddr_t f_tfree; /* Number of free blocks. */ + __ino_t f_tinode; /* Number of free inodes. */ char f_fname[6]; char f_fpack[6]; }; diff --git a/io/sys/sendfile.h b/io/sys/sendfile.h index 0627c40..797822b 100644 --- a/io/sys/sendfile.h +++ b/io/sys/sendfile.h @@ -25,8 +25,11 @@ __BEGIN_DECLS -/* Send COUNT bytes from file associated with IN_FD starting at OFFSET to - descriptor OUT_FD. */ +/* Send up to COUNT bytes from file associated with IN_FD starting at + *OFFSET to descriptor OUT_FD. Set *OFFSET to the IN_FD's file position + following the read bytes. If OFFSET is a null pointer, use the normal + file position instead. Return the number of written bytes, or -1 in + case of error. */ #ifndef __USE_FILE_OFFSET64 extern ssize_t sendfile (int __out_fd, int __in_fd, off_t *__offset, size_t __count) __THROW; diff --git a/sysdeps/generic/bits/ustat.h b/sysdeps/generic/bits/ustat.h index fc08758..69c6b72 100644 --- a/sysdeps/generic/bits/ustat.h +++ b/sysdeps/generic/bits/ustat.h @@ -24,8 +24,8 @@ struct ustat { - __daddr_t f_tfree; - __ino_t f_tinode; + __daddr_t f_tfree; /* Number of free blocks. */ + __ino_t f_tinode; /* Number of free inodes. */ char f_fname[6]; char f_fpack[6]; }; diff --git a/sysdeps/posix/pread.c b/sysdeps/posix/pread.c index 8dc3385..3b226a0 100644 --- a/sysdeps/posix/pread.c +++ b/sysdeps/posix/pread.c @@ -1,6 +1,6 @@ /* Read block from given position in file without changing file pointer. POSIX version. - Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc. + Copyright (C) 1997, 1998, 1999, 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1997. @@ -22,6 +22,8 @@ #include #include +/* Note: This implementation of pread is not multithread-safe. */ + ssize_t __libc_pread (int fd, void *buf, size_t nbyte, off_t offset) { diff --git a/sysdeps/posix/pread64.c b/sysdeps/posix/pread64.c index 0c2322c..b19eabe 100644 --- a/sysdeps/posix/pread64.c +++ b/sysdeps/posix/pread64.c @@ -1,6 +1,6 @@ /* Read block from given position in file without changing file pointer. POSIX version. - Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc. + Copyright (C) 1997, 1998, 1999, 2000, 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1997. @@ -22,6 +22,8 @@ #include #include +/* Note: This implementation of pread64 is not multithread-safe. */ + ssize_t __libc_pread64 (int fd, void *buf, size_t nbyte, off64_t offset) { diff --git a/sysdeps/posix/pwrite.c b/sysdeps/posix/pwrite.c index 3eec4a2..51624e5 100644 --- a/sysdeps/posix/pwrite.c +++ b/sysdeps/posix/pwrite.c @@ -1,6 +1,6 @@ /* Write block to given position in file without changing file pointer. POSIX version. - Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc. + Copyright (C) 1997, 1998, 1999, 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1997. @@ -22,6 +22,8 @@ #include #include +/* Note: This implementation of pwrite is not multithread-safe. */ + ssize_t __libc_pwrite (int fd, const void *buf, size_t nbyte, off_t offset) { diff --git a/sysdeps/posix/pwrite64.c b/sysdeps/posix/pwrite64.c index 7a206f6..33446c6 100644 --- a/sysdeps/posix/pwrite64.c +++ b/sysdeps/posix/pwrite64.c @@ -22,6 +22,8 @@ #include #include +/* Note: This implementation of pwrite64 is not multithread-safe. */ + ssize_t __libc_pwrite64 (int fd, const void *buf, size_t nbyte, off64_t offset) { -- 2.7.4