[commits] r7203 - in /fsf/trunk/libc: ChangeLog resolv/res_query.c

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Sat Oct 25 00:04:02 2008
New Revision: 7203

Log:
Import glibc-mainline for 2008-10-25

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/resolv/res_query.c

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Sat Oct 25 00:04:02 2008
@@ -1,3 +1,8 @@
+2008-10-24  Ulrich Drepper  <drepper@xxxxxxxxxx>
+
+	* resolv/res_query.c (__libc_res_nquery): Add a few casts.
+	Fix tests for existence of second reply.
+
 2008-10-23  Ulrich Drepper  <drepper@xxxxxxxxxx>
 
 	* po/id.po: New file.

Modified: fsf/trunk/libc/resolv/res_query.c
==============================================================================
--- fsf/trunk/libc/resolv/res_query.c (original)
+++ fsf/trunk/libc/resolv/res_query.c Sat Oct 25 00:04:02 2008
@@ -244,15 +244,15 @@
 	   tests of HP2.  */
 	HEADER *hp2 = answerp2 ? (HEADER *) *answerp2 : hp;
 
-	if (n < sizeof (HEADER) && nanswerp2 != NULL
-	    && *nanswerp2 > sizeof (HEADER))
+	if (n < (int) sizeof (HEADER) && answerp2 != NULL
+	    && *resplen2 > (int) sizeof (HEADER))
 	  {
 	    /* Special case of partial answer.  */
 	    assert (hp != hp2);
 	    hp = hp2;
 	  }
-	else if (nanswerp2 != NULL
-		 && *nanswerp2 < sizeof (HEADER) && n > sizeof (HEADER))
+	else if (answerp2 != NULL && *resplen2 < (int) sizeof (HEADER)
+		 && n > (int) sizeof (HEADER))
 	  {
 	    /* Special case of partial answer.  */
 	    assert (hp != hp2);