dnsapi: Use internal name_skip function

André Hentschel nerv at dawncrow.de
Tue Sep 6 15:03:01 CDT 2011


That's quite useful for systems using uclibc or bionic which don't include dn_skipname.
see e.g. http://git.alpinelinux.org/cgit/aports/tree/main/wine/dn_skipname.patch?id=c9b491b6099eec02a835ffd05539b5c783c6c43a
---
 dlls/dnsapi/ns_parse.c |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/dlls/dnsapi/ns_parse.c b/dlls/dnsapi/ns_parse.c
index bfb83c2..6676157 100644
--- a/dlls/dnsapi/ns_parse.c
+++ b/dlls/dnsapi/ns_parse.c
@@ -35,6 +35,10 @@
 #include <string.h>
 
 #include "windef.h"
+#include "winbase.h"
+#include "winnls.h"
+
+#include "dnsapi.h"
 
 /* Forward. */
 
@@ -75,12 +79,11 @@ dns_ns_skiprr(const u_char *ptr, const u_char *eom, ns_sect section, int count)
 	const u_char *optr = ptr;
 
 	while (count-- > 0) {
-		int b, rdlength;
+		int rdlength;
 
-		b = dn_skipname(ptr, eom);
-		if (b < 0)
+		if (dns_ns_name_skip(&ptr, eom) < 0)
 			RETERR(EMSGSIZE);
-		ptr += b/*Name*/ + NS_INT16SZ/*Type*/ + NS_INT16SZ/*Class*/;
+		ptr += NS_INT16SZ/*Type*/ + NS_INT16SZ/*Class*/;
 		if (section != ns_s_qd) {
 			if (ptr + NS_INT32SZ + NS_INT16SZ > eom)
 				RETERR(EMSGSIZE);
-- 

Best Regards, André Hentschel



More information about the wine-patches mailing list