Alistair Leslie-Hughes : msxml3: Use libxml macros to get the length of a set.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 13f202a6e98e90a2ef85c7fd22779823dd226419
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=13f202a6e98e90a2ef85c7fd22...

Author: Alistair Leslie-Hughes 
Date:   Wed Jul  2 10:22:36 2008 +1000

msxml3: Use libxml macros to get the length of a set.

---

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]);