diff options
author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2009-04-30 21:37:18 +0000 |
---|---|---|
committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2009-04-30 21:37:18 +0000 |
commit | 83282eed328491591df00fb1628356f12c79b03e (patch) | |
tree | e6b002c31c92aef589274ff978a0d26e25c22a5f /libc/misc | |
parent | 08bd8d2970f4bde7e1b33c34d4bd2f590fd938a8 (diff) |
Merge changes between r8303 and r8393 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@8394 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/misc')
-rw-r--r-- | libc/misc/hsearch_r.c | 2 | ||||
-rw-r--r-- | libc/misc/preadv.c | 2 | ||||
-rw-r--r-- | libc/misc/preadv64.c | 2 | ||||
-rw-r--r-- | libc/misc/pwritev.c | 2 | ||||
-rw-r--r-- | libc/misc/pwritev64.c | 2 | ||||
-rw-r--r-- | libc/misc/sys/uio.h | 8 |
6 files changed, 10 insertions, 8 deletions
diff --git a/libc/misc/hsearch_r.c b/libc/misc/hsearch_r.c index 6e32afc43..73b956503 100644 --- a/libc/misc/hsearch_r.c +++ b/libc/misc/hsearch_r.c @@ -157,6 +157,8 @@ hsearch_r (item, action, retval, htab) hval <<= 4; hval += item.key[count]; } + if (hval == 0) + ++hval; /* First hash function: simply take the modul but prevent zero. */ idx = hval % htab->size + 1; diff --git a/libc/misc/preadv.c b/libc/misc/preadv.c index 3e2cc689e..facd8ca01 100644 --- a/libc/misc/preadv.c +++ b/libc/misc/preadv.c @@ -24,7 +24,7 @@ without change the file pointer, and put the result in the buffers described by VECTOR, which is a vector of COUNT 'struct iovec's. The buffers are filled in the order specified. Operates just like - 'read' (see <unistd.h>) except that data are put in VECTOR instead + 'pread' (see <unistd.h>) except that data are put in VECTOR instead of a contiguous buffer. */ ssize_t preadv (fd, vector, count, offset) diff --git a/libc/misc/preadv64.c b/libc/misc/preadv64.c index ea675bb35..4b4e5717f 100644 --- a/libc/misc/preadv64.c +++ b/libc/misc/preadv64.c @@ -24,7 +24,7 @@ without change the file pointer, and put the result in the buffers described by VECTOR, which is a vector of COUNT 'struct iovec's. The buffers are filled in the order specified. Operates just like - 'read' (see <unistd.h>) except that data are put in VECTOR instead + 'pread' (see <unistd.h>) except that data are put in VECTOR instead of a contiguous buffer. */ ssize_t preadv64 (fd, vector, count, offset) diff --git a/libc/misc/pwritev.c b/libc/misc/pwritev.c index d45ed2335..2ee47708e 100644 --- a/libc/misc/pwritev.c +++ b/libc/misc/pwritev.c @@ -23,7 +23,7 @@ /* Write data pointed by the buffers described by VECTOR, which is a vector of COUNT 'struct iovec's, to file descriptor FD at the given position OFFSET without change the file pointer. The data is - written in the order specified. Operates just like 'write' (see + written in the order specified. Operates just like 'pwrite' (see <unistd.h>) except that the data are taken from VECTOR instead of a contiguous buffer. */ ssize_t diff --git a/libc/misc/pwritev64.c b/libc/misc/pwritev64.c index fe9585755..6cff74908 100644 --- a/libc/misc/pwritev64.c +++ b/libc/misc/pwritev64.c @@ -23,7 +23,7 @@ /* Write data pointed by the buffers described by VECTOR, which is a vector of COUNT 'struct iovec's, to file descriptor FD at the given position OFFSET without change the file pointer. The data is - written in the order specified. Operates just like 'write' (see + written in the order specified. Operates just like 'pwrite' (see <unistd.h>) except that the data are taken from VECTOR instead of a contiguous buffer. */ ssize_t diff --git a/libc/misc/sys/uio.h b/libc/misc/sys/uio.h index a3c782917..05d956bfd 100644 --- a/libc/misc/sys/uio.h +++ b/libc/misc/sys/uio.h @@ -58,7 +58,7 @@ extern ssize_t writev (int __fd, __const struct iovec *__iovec, int __count) without change the file pointer, and put the result in the buffers described by IOVEC, which is a vector of COUNT 'struct iovec's. The buffers are filled in the order specified. Operates just like - 'read' (see <unistd.h>) except that data are put in IOVEC instead + 'pread' (see <unistd.h>) except that data are put in IOVEC instead of a contiguous buffer. This function is a cancellation point and therefore not marked with @@ -69,7 +69,7 @@ extern ssize_t preadv (int __fd, __const struct iovec *__iovec, int __count, /* Write data pointed by the buffers described by IOVEC, which is a vector of COUNT 'struct iovec's, to file descriptor FD at the given position OFFSET without change the file pointer. The data is - written in the order specified. Operates just like 'write' (see + written in the order specified. Operates just like 'pwrite' (see <unistd.h>) except that the data are taken from IOVEC instead of a contiguous buffer. @@ -96,7 +96,7 @@ extern ssize_t __REDIRECT (pwritev, (int __fd, __const struct iovec *__iovec, without change the file pointer, and put the result in the buffers described by IOVEC, which is a vector of COUNT 'struct iovec's. The buffers are filled in the order specified. Operates just like - 'read' (see <unistd.h>) except that data are put in IOVEC instead + 'pread' (see <unistd.h>) except that data are put in IOVEC instead of a contiguous buffer. This function is a cancellation point and therefore not marked with @@ -107,7 +107,7 @@ extern ssize_t preadv64 (int __fd, __const struct iovec *__iovec, int __count, /* Write data pointed by the buffers described by IOVEC, which is a vector of COUNT 'struct iovec's, to file descriptor FD at the given position OFFSET without change the file pointer. The data is - written in the order specified. Operates just like 'write' (see + written in the order specified. Operates just like 'pwrite' (see <unistd.h>) except that the data are taken from IOVEC instead of a contiguous buffer. |