[PATCH] Use libxml macros to get the length of a set

Anastasius Focht focht at gmx.net
Tue Jul 1 19:22:36 CDT 2008


---
 dlls/msxml3/queryresult.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/msxml3/queryresult.c b/dlls/msxml3/queryresult.c
index 81c7de5..d4b837e 100644
--- a/dlls/msxml3/queryresult.c
+++ b/dlls/msxml3/queryresult.c
@@ -99,7 +99,7 @@ HRESULT queryresult_create(xmlNodePtr node, LPWSTR szQuery, IXMLDOMNodeList **ou
 
     *out = (IXMLDOMNodeList *)This;
     hr = S_OK;
-    TRACE("found %d matches\n", This->result->nodesetval->nodeNr);
+    TRACE("found %d matches\n", xmlXPathNodeSetGetLength(This->result->nodesetval));
 
 cleanup:
     if (This != NULL && FAILED(hr))
@@ -257,7 +257,7 @@ static HRESULT WINAPI queryresult_get_item(
 
     *listItem = NULL;
 
-    if (index < 0 || index >= This->result->nodesetval->nodeNr)
+    if (index < 0 || index >= xmlXPathNodeSetGetLength(This->result->nodesetval))
         return S_FALSE;
 
     *listItem = create_node(This->result->nodesetval->nodeTab[index]);
@@ -274,7 +274,7 @@ static HRESULT WINAPI queryresult_get_length(
 
     TRACE("%p\n", This);
 
-    *listLength = This->result->nodesetval->nodeNr;
+    *listLength = xmlXPathNodeSetGetLength(This->result->nodesetval);
     return S_OK;
 }
 
@@ -288,7 +288,7 @@ static HRESULT WINAPI queryresult_nextNode(
 
     *nextItem = NULL;
 
-    if (This->resultPos >= This->result->nodesetval->nodeNr)
+    if (This->resultPos >= xmlXPathNodeSetGetLength(This->result->nodesetval))
         return S_FALSE;
 
     *nextItem = create_node(This->result->nodesetval->nodeTab[This->resultPos]);
-- 
1.5.4.1


--------------040603070604020901020304--




More information about the wine-patches mailing list