qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update. 

1998-07-25  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/i386/bits/byteswap.h (__bswap_64): Change __v to __w to
	prevent conflict with __bswap_32.
This commit is contained in:
Ulrich Drepper 1998-07-25 18:02:26 +00:00
parent 264d5b944d
commit 6730873037
4 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
1998-07-25 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/i386/bits/byteswap.h (__bswap_64): Change __v to __w to
prevent conflict with __bswap_32.
1998-07-24 21:29 Ulrich Drepper <drepper@cygnus.com> 1998-07-24 21:29 Ulrich Drepper <drepper@cygnus.com>
* nscd/connections.c (pw_send_answer): Make one single writev call. * nscd/connections.c (pw_send_answer): Make one single writev call.

8
nscd/connections.c
View File

@ -502,6 +502,14 @@ gr_send_answer (int conn, struct group *grp)
} }
/* Send all the data. */ /* Send all the data. */
while (nblocks > UIO_MAXIOV)
{
if (writev (sock[conn], vec, UIO_MAXIOV) != total_len)
dbg_log (_("write incomplete on send group answer: %s"),
strerror (errno));
vec += UIO_MAXIOV;
nblocks -= UIO_MAXIOV;
}
if (writev (sock[conn], vec, nblocks) != total_len) if (writev (sock[conn], vec, nblocks) != total_len)
dbg_log (_("write incomplete on send group answer: %s"), dbg_log (_("write incomplete on send group answer: %s"),
strerror (errno)); strerror (errno));

13
nscd/nscd_getgr_r.c
View File

@ -232,7 +232,18 @@ __nscd_getgr_r (const char *key, request_type type, struct group *resultbuf,
*p++ = '\0'; *p++ = '\0';
} }
if (__readv (sock, vec, gr_resp.gr_mem_len) != total_len) while (i > UIO_MAXIOV)
{
if (__readv (sock, vec, UIO_MAXIOV) != total_len)
{
__close (sock);
return -1;
}
vec += UIO_MAXIOV;
i -= UIO_MAXIOV;
}
if (__readv (sock, vec, i) != total_len)
{ {
__close (sock); __close (sock);
return -1; return -1;

8
sysdeps/i386/bits/byteswap.h
View File

@ -83,9 +83,9 @@
/* Swap bytes in 64 bit value. */ /* Swap bytes in 64 bit value. */
# define __bswap_64(x) \ # define __bswap_64(x) \
({ union { unsigned long long int __ll; \ ({ union { unsigned long long int __ll; \
unsigned long int __l[2]; } __v, __r; \ unsigned long int __l[2]; } __w, __r; \
__v.__ll = (x); \ __w.__ll = (x); \
__r.__l[0] = __bswap_32 (__v.__l[1]); \ __r.__l[0] = __bswap_32 (__w.__l[1]); \
__r.__l[1] = __bswap_32 (__v.__l[0]); \ __r.__l[1] = __bswap_32 (__w.__l[0]); \
__r.__ll; }) __r.__ll; })
#endif #endif