commit 2adcef79544fe17797a4a5b60ce784e2fabfd358
author Michael Karcher <wine@mkarcher.dialup.fu-berlin.de> Sun Nov 02 13:34:44 2008 +0100
committer Alexandre Julliard <julliard@winehq.org> Mon Nov 03 14:05:16 2008 +0100
tree 0c79f331b4c058ef3795a7cff906d6149e78d127
parent 813da72423ee37262873f905d61e89116745a9a9

msxml3: Simplify IXMLDOMNodeMap::removeNamedItem.

dlls/msxml3/nodemap.c

diff --git a/dlls/msxml3/nodemap.c b/dlls/msxml3/nodemap.c
index e4150e5..8c7c1d0 100644
--- a/dlls/msxml3/nodemap.c
+++ b/dlls/msxml3/nodemap.c
@@ -289,7 +289,7 @@
 {
     xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface );
     xmlChar *element_name;
-    xmlAttrPtr attr, attr_copy;
+    xmlAttrPtr attr;
     xmlNodePtr node;
 
     TRACE("%p %s %p\n", This, debugstr_w(name), namedItem );
@@ -314,13 +314,15 @@
 
     if ( namedItem )
     {
-        attr_copy = xmlCopyProp( NULL, attr );
-        attr_copy->doc = node->doc;
-        /* The cast here is OK, xmlFreeNode handles xmlAttrPtr pointers */
-        xmldoc_add_orphan(attr_copy->doc, (xmlNodePtr) attr_copy);
-        *namedItem = create_node( (xmlNodePtr) attr_copy );
+        xmlUnlinkNode( (xmlNodePtr) attr );
+        xmldoc_add_orphan( attr->doc, (xmlNodePtr) attr );
+        *namedItem = create_node( (xmlNodePtr) attr );
     }
-    xmlRemoveProp( attr );
+    else
+    {
+        if( xmlRemoveProp( attr ) == -1 )
+            ERR("xmlRemoveProp failed\n");
+    }
 
     return S_OK;
 }