* posix/bits/unistd.h (read, pread, pread64): Use __bos0 instead

	of __bos.
	* socket/bits/socket2.h (recv, recvfrom): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 66da7b6..f7e66a6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-03-01  Jakub Jelinek  <jakub@redhat.com>
+
+       * posix/bits/unistd.h (read, pread, pread64): Use __bos0 instead
+       of __bos.
+       * socket/bits/socket2.h (recv, recvfrom): Likewise.
+
 2005-03-01  Roland McGrath  <roland@redhat.com>
 
        [BZ #721]

diff --git a/posix/bits/unistd.h b/posix/bits/unistd.h
index 0e5417c..215063f 100644 (file)
--- a/posix/bits/unistd.h
+++ b/posix/bits/unistd.h
@@ -24,9 +24,9 @@
 extern ssize_t __read_chk (int __fd, void *__buf, size_t __nbytes,
                           size_t __buflen) __wur;
 #define read(fd, buf, nbytes) \
-  (__bos (buf) != (size_t) -1                                                \
-   && (!__builtin_constant_p (nbytes) || (nbytes) > __bos (buf))             \
-   ? __read_chk (fd, buf, nbytes, __bos (buf))                               \
+  (__bos0 (buf) != (size_t) -1                                               \
+   && (!__builtin_constant_p (nbytes) || (nbytes) > __bos0 (buf))            \
+   ? __read_chk (fd, buf, nbytes, __bos0 (buf))                                      \
    : read (fd, buf, nbytes))
 
 #ifdef __USE_UNIX98
@@ -36,23 +36,23 @@ extern ssize_t __pread64_chk (int __fd, void *__buf, size_t __nbytes,
                              __off64_t __offset, size_t __bufsize) __wur;
 # ifndef __USE_FILE_OFFSET64
 #  define pread(fd, buf, nbytes, offset) \
-  (__bos (buf) != (size_t) -1                                                \
-   && (!__builtin_constant_p (nbytes) || (nbytes) > __bos (buf))             \
-   ? __pread64_chk (fd, buf, nbytes, offset, __bos (buf))                    \
+  (__bos0 (buf) != (size_t) -1                                               \
+   && (!__builtin_constant_p (nbytes) || (nbytes) > __bos0 (buf))            \
+   ? __pread64_chk (fd, buf, nbytes, offset, __bos0 (buf))                   \
    : pread (fd, buf, offset, nbytes))
 # else
 #  define pread(fd, buf, nbytes, offset) \
-  (__bos (buf) != (size_t) -1                                                \
-   && (!__builtin_constant_p (nbytes) || (nbytes) > __bos (buf))             \
-   ? __pread_chk (fd, buf, nbytes, offset, __bos (buf))                              \
+  (__bos0 (buf) != (size_t) -1                                               \
+   && (!__builtin_constant_p (nbytes) || (nbytes) > __bos0 (buf))            \
+   ? __pread_chk (fd, buf, nbytes, offset, __bos0 (buf))                     \
    : pread (fd, buf, offset, nbytes))
 # endif
 
 # ifdef __USE_LARGEFILE64
 #  define pread64(fd, buf, nbytes, offset) \
-  (__bos (buf) != (size_t) -1                                                \
-   && (!__builtin_constant_p (nbytes) || (nbytes) > __bos (buf))             \
-   ? __pread64_chk (fd, buf, nbytes, offset, __bos (buf))                    \
+  (__bos0 (buf) != (size_t) -1                                               \
+   && (!__builtin_constant_p (nbytes) || (nbytes) > __bos0 (buf))            \
+   ? __pread64_chk (fd, buf, nbytes, offset, __bos0 (buf))                   \
    : pread64 (fd, buf, offset, nbytes))
 # endif
 #endif

diff --git a/socket/bits/socket2.h b/socket/bits/socket2.h
index bb75907..0ccb24c 100644 (file)
--- a/socket/bits/socket2.h
+++ b/socket/bits/socket2.h
@@ -24,8 +24,8 @@
 extern ssize_t __recv_chk (int __fd, void *__buf, size_t __n, size_t __buflen,
                           int __flags);
 #define recv(fd, buf, n, flags) \
-  (__bos (buf) != (size_t) -1                                                \
-   ? __recv_chk (fd, buf, n, __bos (buf), flags)                             \
+  (__bos0 (buf) != (size_t) -1                                               \
+   ? __recv_chk (fd, buf, n, __bos0 (buf), flags)                            \
    : recv (fd, buf, n, flags))
 
 extern ssize_t __recvfrom_chk (int __fd, void *__restrict __buf, size_t __n,
@@ -33,6 +33,6 @@ extern ssize_t __recvfrom_chk (int __fd, void *__restrict __buf, size_t __n,
                               __SOCKADDR_ARG __addr,
                               socklen_t *__restrict __addr_len);
 #define recvfrom(fd, buf, n, flags, addr, addr_len) \
-  (__bos (buf) != (size_t) -1                                                \
-   ? __recvfrom_chk (fd, buf, n, __bos (buf), flags, addr, addr_len)         \
+  (__bos0 (buf) != (size_t) -1                                               \
+   ? __recvfrom_chk (fd, buf, n, __bos0 (buf), flags, addr, addr_len)        \
    : recvfrom (fd, buf, n, flags, addr, addr_len))