From e78ac791e50ef918441df1dc3c7dd65ac1843179 Mon Sep 17 00:00:00 2001 From: Dan Dennedy Date: Fri, 31 Dec 2010 12:28:56 -0800 Subject: [PATCH] Cleanup libxml changes for MinGW. --- src/modules/xml/consumer_xml.c | 9 +++------ src/modules/xml/producer_xml.c | 9 +++------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/modules/xml/consumer_xml.c b/src/modules/xml/consumer_xml.c index 3bcf818e..174aa068 100644 --- a/src/modules/xml/consumer_xml.c +++ b/src/modules/xml/consumer_xml.c @@ -752,13 +752,10 @@ static int consumer_start( mlt_consumer this ) xmlDocDumpMemoryEnc( doc, &buffer, &length, "utf-8" ); mlt_properties_set( properties, resource, _s(buffer) ); #ifdef WIN32 - xmlFreeFunc myXmlFree = NULL; - xmlMemGet( &myXmlFree, NULL, NULL, NULL); - if ( myXmlFree ) - myXmlFree( buffer ); -#else - xmlFree( buffer ); + xmlFreeFunc xmlFree = NULL; + xmlMemGet( &xmlFree, NULL, NULL, NULL); #endif + xmlFree( buffer ); } else { diff --git a/src/modules/xml/producer_xml.c b/src/modules/xml/producer_xml.c index 285b9223..b7bfed81 100644 --- a/src/modules/xml/producer_xml.c +++ b/src/modules/xml/producer_xml.c @@ -1096,13 +1096,10 @@ static void on_end_property( deserialise_context context, const xmlChar *name ) xmlDocDumpMemory( context->value_doc, &value, &size ); mlt_properties_set( properties, context->property, _s(value) ); #ifdef WIN32 - xmlFreeFunc myXmlFree = NULL; - xmlMemGet( &myXmlFree, NULL, NULL, NULL); - if ( myXmlFree ) - myXmlFree( value ); -#else - xmlFree( value ); + xmlFreeFunc xmlFree = NULL; + xmlMemGet( &xmlFree, NULL, NULL, NULL); #endif + xmlFree( value ); xmlFreeDoc( context->value_doc ); context->value_doc = NULL; } -- 2.39.2