aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2002-09-06 19:20:20 +0000
committerRoland McGrath <roland@gnu.org>2002-09-06 19:20:20 +0000
commit131c6eb7daca02f20884c59e254d0963d07a9d5a (patch)
tree858faca702c8dcc76588de7dbe5dd5fede137b78
parent2e56ce9ba79344f636e6e205f51270e46950b5ce (diff)
downloadglibc-131c6eb7daca02f20884c59e254d0963d07a9d5a.tar
glibc-131c6eb7daca02f20884c59e254d0963d07a9d5a.tar.gz
glibc-131c6eb7daca02f20884c59e254d0963d07a9d5a.tar.bz2
glibc-131c6eb7daca02f20884c59e254d0963d07a9d5a.zip
2002-09-04 Bruno Haible <bruno@clisp.org>
* 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.
-rw-r--r--bits/ustat.h4
-rw-r--r--io/sys/sendfile.h7
-rw-r--r--sysdeps/generic/bits/ustat.h4
-rw-r--r--sysdeps/posix/pread.c4
-rw-r--r--sysdeps/posix/pread64.c4
-rw-r--r--sysdeps/posix/pwrite.c4
-rw-r--r--sysdeps/posix/pwrite64.c2
7 files changed, 20 insertions, 9 deletions
diff --git a/bits/ustat.h b/bits/ustat.h
index fc08758608..69c6b72270 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 0627c40464..797822b9fe 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 fc08758608..69c6b72270 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 8dc3385543..3b226a0dc0 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 <drepper@cygnus.com>, 1997.
@@ -22,6 +22,8 @@
#include <errno.h>
#include <unistd.h>
+/* 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 0c2322c1f2..b19eabe4aa 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 <drepper@cygnus.com>, 1997.
@@ -22,6 +22,8 @@
#include <errno.h>
#include <unistd.h>
+/* 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 3eec4a2dfb..51624e5a51 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 <drepper@cygnus.com>, 1997.
@@ -22,6 +22,8 @@
#include <errno.h>
#include <unistd.h>
+/* 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 7a206f6597..33446c66b5 100644
--- a/sysdeps/posix/pwrite64.c
+++ b/sysdeps/posix/pwrite64.c
@@ -22,6 +22,8 @@
#include <errno.h>
#include <unistd.h>
+/* Note: This implementation of pwrite64 is not multithread-safe. */
+
ssize_t
__libc_pwrite64 (int fd, const void *buf, size_t nbyte, off64_t offset)
{