Hans Leidekker : webservices: Add a helper to determine node type.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 49bc8b4cc7109c7deab1e7fa15ad47a0cc50f41a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=49bc8b4cc7109c7deab1e7fa15...

Author: Hans Leidekker <hans(a)codeweavers.com>
Date:   Wed Mar 30 14:12:16 2016 +0200

webservices: Add a helper to determine node type.

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/webservices/reader.c              | 38 +++++++++++++++++-----------------
 dlls/webservices/webservices_private.h |  5 +++++
 dlls/webservices/writer.c              | 10 ++++-----
 3 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c
index 9ae6254..c97fd7e 100644
--- a/dlls/webservices/reader.c
+++ b/dlls/webservices/reader.c
@@ -303,7 +303,7 @@ void free_attribute( WS_XML_ATTRIBUTE *attr )
 void free_node( struct node *node )
 {
     if (!node) return;
-    switch (node->hdr.node.nodeType)
+    switch (node_type( node ))
     {
     case WS_XML_NODE_TYPE_ELEMENT:
     {
@@ -337,7 +337,7 @@ void free_node( struct node *node )
         break;
 
     default:
-        ERR( "unhandled type %u\n", node->hdr.node.nodeType );
+        ERR( "unhandled type %u\n", node_type( node ) );
         break;
     }
     heap_free( node );
@@ -1117,12 +1117,12 @@ static struct node *read_find_parent( struct reader *reader, const WS_XML_STRING
 
     for (parent = reader->current; parent; parent = parent->parent)
     {
-        if (parent->hdr.node.nodeType == WS_XML_NODE_TYPE_BOF)
+        if (node_type( parent ) == WS_XML_NODE_TYPE_BOF)
         {
             if (!localname) return parent;
             return NULL;
         }
-        else if (parent->hdr.node.nodeType == WS_XML_NODE_TYPE_ELEMENT)
+        else if (node_type( parent ) == WS_XML_NODE_TYPE_ELEMENT)
         {
             if (!localname) return parent;
 
@@ -1540,7 +1540,7 @@ static BOOL move_to_root_element( struct reader *reader )
 
     if (!(ptr = list_head( &reader->root->children ))) return FALSE;
     node = LIST_ENTRY( ptr, struct node, entry );
-    if (node->hdr.node.nodeType == WS_XML_NODE_TYPE_ELEMENT)
+    if (node_type( node ) == WS_XML_NODE_TYPE_ELEMENT)
     {
         reader->current = node;
         return TRUE;
@@ -1548,7 +1548,7 @@ static BOOL move_to_root_element( struct reader *reader )
     while ((ptr = list_next( &reader->root->children, &node->entry )))
     {
         struct node *next = LIST_ENTRY( ptr, struct node, entry );
-        if (next->hdr.node.nodeType == WS_XML_NODE_TYPE_ELEMENT)
+        if (node_type( next ) == WS_XML_NODE_TYPE_ELEMENT)
         {
             reader->current = next;
             return TRUE;
@@ -1566,7 +1566,7 @@ static BOOL move_to_next_element( struct reader *reader )
     while ((ptr = list_next( &node->parent->children, &node->entry )))
     {
         struct node *next = LIST_ENTRY( ptr, struct node, entry );
-        if (next->hdr.node.nodeType == WS_XML_NODE_TYPE_ELEMENT)
+        if (node_type( next ) == WS_XML_NODE_TYPE_ELEMENT)
         {
             reader->current = next;
             return TRUE;
@@ -1584,7 +1584,7 @@ static BOOL move_to_prev_element( struct reader *reader )
     while ((ptr = list_prev( &node->parent->children, &node->entry )))
     {
         struct node *prev = LIST_ENTRY( ptr, struct node, entry );
-        if (prev->hdr.node.nodeType == WS_XML_NODE_TYPE_ELEMENT)
+        if (node_type( prev ) == WS_XML_NODE_TYPE_ELEMENT)
         {
             reader->current = prev;
             return TRUE;
@@ -1601,7 +1601,7 @@ static BOOL move_to_child_element( struct reader *reader )
 
     if (!(ptr = list_head( &reader->current->children ))) return FALSE;
     node = LIST_ENTRY( ptr, struct node, entry );
-    if (node->hdr.node.nodeType == WS_XML_NODE_TYPE_ELEMENT)
+    if (node_type( node ) == WS_XML_NODE_TYPE_ELEMENT)
     {
         reader->current = node;
         return TRUE;
@@ -1609,7 +1609,7 @@ static BOOL move_to_child_element( struct reader *reader )
     while ((ptr = list_next( &reader->current->children, &node->entry )))
     {
         struct node *next = LIST_ENTRY( ptr, struct node, entry );
-        if (next->hdr.node.nodeType == WS_XML_NODE_TYPE_ELEMENT)
+        if (node_type( next ) == WS_XML_NODE_TYPE_ELEMENT)
         {
             reader->current = next;
             return TRUE;
@@ -1624,12 +1624,12 @@ static BOOL move_to_end_element( struct reader *reader )
     struct list *ptr;
     struct node *node = reader->current;
 
-    if (node->hdr.node.nodeType != WS_XML_NODE_TYPE_ELEMENT) return FALSE;
+    if (node_type( node ) != WS_XML_NODE_TYPE_ELEMENT) return FALSE;
 
     if ((ptr = list_tail( &node->children )))
     {
         struct node *tail = LIST_ENTRY( ptr, struct node, entry );
-        if (tail->hdr.node.nodeType == WS_XML_NODE_TYPE_END_ELEMENT)
+        if (node_type( tail ) == WS_XML_NODE_TYPE_END_ELEMENT)
         {
             reader->current = tail;
             return TRUE;
@@ -1642,8 +1642,8 @@ static BOOL move_to_parent_element( struct reader *reader )
 {
     struct node *parent = reader->current->parent;
 
-    if (parent && (parent->hdr.node.nodeType == WS_XML_NODE_TYPE_ELEMENT ||
-                   parent->hdr.node.nodeType == WS_XML_NODE_TYPE_BOF))
+    if (parent && (node_type( parent ) == WS_XML_NODE_TYPE_ELEMENT ||
+                   node_type( parent ) == WS_XML_NODE_TYPE_BOF))
     {
         reader->current = parent;
         return TRUE;
@@ -1905,7 +1905,7 @@ static HRESULT read_get_node_text( struct reader *reader, WS_XML_UTF8_TEXT **ret
 {
     WS_XML_TEXT_NODE *text;
 
-    if (reader->current->hdr.node.nodeType != WS_XML_NODE_TYPE_TEXT)
+    if (node_type( reader->current ) != WS_XML_NODE_TYPE_TEXT)
         return WS_E_INVALID_FORMAT;
 
     text = (WS_XML_TEXT_NODE *)&reader->current->hdr.node;
@@ -1923,7 +1923,7 @@ static HRESULT read_get_attribute_text( struct reader *reader, ULONG index, WS_X
     WS_XML_ELEMENT_NODE *elem = &reader->current->hdr;
     WS_XML_ATTRIBUTE *attr;
 
-    if (reader->current->hdr.node.nodeType != WS_XML_NODE_TYPE_ELEMENT)
+    if (node_type( reader->current ) != WS_XML_NODE_TYPE_ELEMENT)
         return WS_E_INVALID_FORMAT;
 
     attr = elem->attributes[index];
@@ -1977,7 +1977,7 @@ HRESULT WINAPI WsFindAttribute( WS_XML_READER *handle, const WS_XML_STRING *loca
 
     if (!reader || !localname || !ns || !index) return E_INVALIDARG;
 
-    if (reader->current->hdr.node.nodeType != WS_XML_NODE_TYPE_ELEMENT)
+    if (node_type( reader->current ) != WS_XML_NODE_TYPE_ELEMENT)
         return WS_E_INVALID_OPERATION;
 
     if (!find_attribute( reader, localname, ns, index ))
@@ -2689,7 +2689,7 @@ static BOOL is_empty_text_node( const struct node *node )
     const WS_XML_UTF8_TEXT *utf8;
     ULONG i;
 
-    if (node->hdr.node.nodeType != WS_XML_NODE_TYPE_TEXT) return FALSE;
+    if (node_type( node ) != WS_XML_NODE_TYPE_TEXT) return FALSE;
     if (text->text->textType != WS_XML_TEXT_TYPE_UTF8)
     {
         ERR( "unhandled text type %u\n", text->text->textType );
@@ -2719,7 +2719,7 @@ static HRESULT read_type_next_node( struct reader *reader, const WS_XML_STRING *
     for (;;)
     {
         if ((hr = read_node( reader ) != S_OK)) return hr;
-        type = reader->current->hdr.node.nodeType;
+        type = node_type( reader->current );
         if (type == WS_XML_NODE_TYPE_COMMENT ||
             (type == WS_XML_NODE_TYPE_TEXT && is_empty_text_node( reader->current ))) continue;
         break;
diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h
index aa14416..548da06 100644
--- a/dlls/webservices/webservices_private.h
+++ b/dlls/webservices/webservices_private.h
@@ -46,6 +46,11 @@ struct node *alloc_node( WS_XML_NODE_TYPE ) DECLSPEC_HIDDEN;
 void free_node( struct node * ) DECLSPEC_HIDDEN;
 void destroy_nodes( struct node * ) DECLSPEC_HIDDEN;
 
+static inline WS_XML_NODE_TYPE node_type( const struct node *node )
+{
+    return node->hdr.node.nodeType;
+}
+
 static inline void *heap_alloc( SIZE_T size )
 {
     return HeapAlloc( GetProcessHeap(), 0, size );
diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c
index 0c5f3cf5..8f6c6aa 100644
--- a/dlls/webservices/writer.c
+++ b/dlls/webservices/writer.c
@@ -601,8 +601,8 @@ static struct node *write_find_parent_element( struct writer *writer )
 {
     struct node *node = writer->current;
 
-    if (node->hdr.node.nodeType == WS_XML_NODE_TYPE_ELEMENT) return node;
-    if (node->parent->hdr.node.nodeType == WS_XML_NODE_TYPE_ELEMENT) return node->parent;
+    if (node_type( node ) == WS_XML_NODE_TYPE_ELEMENT) return node;
+    if (node_type( node->parent ) == WS_XML_NODE_TYPE_ELEMENT) return node->parent;
     return NULL;
 }
 
@@ -894,15 +894,15 @@ static HRESULT write_add_element_node( struct writer *writer, const WS_XML_STRIN
                                        const WS_XML_STRING *localname, const WS_XML_STRING *ns )
 {
     struct node *node;
-    WS_XML_ELEMENT_NODE *elem, *current = &writer->current->hdr;
+    WS_XML_ELEMENT_NODE *elem;
     HRESULT hr;
 
     /* flush current start element if necessary */
     if (writer->state == WRITER_STATE_STARTELEMENT && ((hr = write_endstartelement( writer )) != S_OK))
         return hr;
 
-    if (!prefix && current->node.nodeType == WS_XML_NODE_TYPE_ELEMENT)
-        prefix = current->prefix;
+    if (!prefix && node_type( writer->current ) == WS_XML_NODE_TYPE_ELEMENT)
+        prefix = writer->current->hdr.prefix;
 
     if (!(node = alloc_node( WS_XML_NODE_TYPE_ELEMENT ))) return E_OUTOFMEMORY;
     elem = &node->hdr;