[PATCH] msxml3: Remove redundant NULL check before SysFreeString

Detlef Riekenberg wine.dev at web.de
Sun Sep 21 08:56:18 CDT 2008


---
 dlls/msxml3/saxreader.c |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c
index d0ba6b5..6cf2aaa 100644
--- a/dlls/msxml3/saxreader.c
+++ b/dlls/msxml3/saxreader.c
@@ -1517,10 +1517,8 @@ static ULONG WINAPI isaxlocator_Release(
     ref = InterlockedDecrement( &This->ref );
     if ( ref == 0 )
     {
-        if(This->publicId)
-            SysFreeString(This->publicId);
-        if(This->systemId)
-            SysFreeString(This->systemId);
+        SysFreeString(This->publicId);
+        SysFreeString(This->systemId);
         HeapFree(GetProcessHeap(), 0, This->nsStack);
 
         ISAXXMLReader_Release((ISAXXMLReader*)&This->saxreader->lpSAXXMLReaderVtbl);
@@ -1558,7 +1556,7 @@ static HRESULT WINAPI isaxlocator_getPublicId(
     BSTR publicId;
     saxlocator *This = impl_from_ISAXLocator( iface );
 
-    if(This->publicId) SysFreeString(This->publicId);
+    SysFreeString(This->publicId);
 
     publicId = bstr_from_xmlChar(xmlSAX2GetPublicId(This->pParserCtxt));
     if(SysStringLen(publicId))
@@ -1580,7 +1578,7 @@ static HRESULT WINAPI isaxlocator_getSystemId(
     BSTR systemId;
     saxlocator *This = impl_from_ISAXLocator( iface );
 
-    if(This->systemId) SysFreeString(This->systemId);
+    SysFreeString(This->systemId);
 
     systemId = bstr_from_xmlChar(xmlSAX2GetSystemId(This->pParserCtxt));
     if(SysStringLen(systemId))
-- 
1.5.4.3


--=-RLjW1bXLW8hXFR7v0BPS--




More information about the wine-patches mailing list