 -			/* No buffer allocated for the first
 -			   reply.  We can try to use the rest
 -			   of the user-provided buffer.  */
+-#if __GNUC_PREREQ (4, 7)
 -			DIAG_PUSH_NEEDS_COMMENT;
 -			DIAG_IGNORE_NEEDS_COMMENT (5, "-Wmaybe-uninitialized");
+-#endif
 -#if _STRING_ARCH_unaligned
 -			*anssizp2 = orig_anssizp - resplen;
 -			*ansp2 = *ansp + resplen;

-			*anssizp2 = orig_anssizp - aligned_resplen;
-			*ansp2 = *ansp + aligned_resplen;
-#endif
-			DIAG_POP_NEEDS_COMMENT;
-		} else {
-			/* The first reply did not fit into the
-			   user-provided buffer.  Maybe the second

-	// int anssiz = *anssizp;
-	HEADER *anhp = (HEADER *) ans;
+	HEADER *anhp = (HEADER *) *ansp;
	struct sockaddr_in6 *nsap = EXT(statp).nsaddrs[ns];
 	int truncating, connreset, n;
 	/* On some architectures compiler might emit a warning indicating
@@ -731,6 +817,8 @@ send_vc(res_state statp,
