1 files changed, 21 insertions, 93 deletions

diff --git a/src/playlist/AsxPlaylistPlugin.cxx b/src/playlist/AsxPlaylistPlugin.cxx
index c06200283..4e48dbf8d 100644
--- a/src/playlist/AsxPlaylistPlugin.cxx
+++ b/src/playlist/AsxPlaylistPlugin.cxx
@@ -21,20 +21,13 @@
 #include "AsxPlaylistPlugin.hxx"
 #include "PlaylistPlugin.hxx"
 #include "MemorySongEnumerator.hxx"
-#include "InputStream.hxx"
 #include "Song.hxx"
 #include "tag/TagBuilder.hxx"
 #include "util/ASCII.hxx"
 #include "util/Error.hxx"
-#include "util/Domain.hxx"
+#include "Expat.hxx"
 #include "Log.hxx"
 
-#include <glib.h>
-
-#include <string.h>
-
-static constexpr Domain asx_domain("asx");
-
 /**
  * This is the state object for the GLib XML parser.
  */
@@ -71,23 +64,9 @@ struct AsxParser {
 
 };
 
-static const gchar *
-get_attribute(const gchar **attribute_names, const gchar **attribute_values,
-	      const gchar *name)
-{
-	for (unsigned i = 0; attribute_names[i] != nullptr; ++i)
-		if (StringEqualsCaseASCII(attribute_names[i], name))
-			return attribute_values[i];
-
-	return nullptr;
-}
-
-static void
-asx_start_element(gcc_unused GMarkupParseContext *context,
-		  const gchar *element_name,
-		  const gchar **attribute_names,
-		  const gchar **attribute_values,
-		  gpointer user_data, gcc_unused GError **error)
+static void XMLCALL
+asx_start_element(void *user_data, const XML_Char *element_name,
+		  const XML_Char **atts)
 {
 	AsxParser *parser = (AsxParser *)user_data;
 
@@ -103,9 +82,8 @@ asx_start_element(gcc_unused GMarkupParseContext *context,
 
 	case AsxParser::ENTRY:
 		if (StringEqualsCaseASCII(element_name, "ref")) {
-			const gchar *href = get_attribute(attribute_names,
-							  attribute_values,
-							  "href");
+			const char *href =
+				ExpatParser::GetAttributeCase(atts, "href");
 			if (href != nullptr)
 				parser->location = href;
 		} else if (StringEqualsCaseASCII(element_name, "author"))
@@ -119,10 +97,8 @@ asx_start_element(gcc_unused GMarkupParseContext *context,
 	}
 }
 
-static void
-asx_end_element(gcc_unused GMarkupParseContext *context,
-		const gchar *element_name,
-		gpointer user_data, gcc_unused GError **error)
+static void XMLCALL
+asx_end_element(void *user_data, const XML_Char *element_name)
 {
 	AsxParser *parser = (AsxParser *)user_data;
 
@@ -144,10 +120,8 @@ asx_end_element(gcc_unused GMarkupParseContext *context,
 	}
 }
 
-static void
-asx_text(gcc_unused GMarkupParseContext *context,
-	 const gchar *text, gsize text_len,
-	 gpointer user_data, gcc_unused GError **error)
+static void XMLCALL
+asx_char_data(void *user_data, const XML_Char *s, int len)
 {
 	AsxParser *parser = (AsxParser *)user_data;
 
@@ -156,23 +130,13 @@ asx_text(gcc_unused GMarkupParseContext *context,
 		break;
 
 	case AsxParser::ENTRY:
-		if (parser->tag_type != TAG_NUM_OF_ITEM_TYPES) {
-			parser->tag_builder.AddItem(parser->tag_type,
-						    text, text_len);
-		}
+		if (parser->tag_type != TAG_NUM_OF_ITEM_TYPES)
+			parser->tag_builder.AddItem(parser->tag_type, s, len);
 
 		break;
 	}
 }
 
-static const GMarkupParser asx_parser = {
-	asx_start_element,
-	asx_end_element,
-	asx_text,
-	nullptr,
-	nullptr,
-};
-
 /*
  * The playlist object
  *
@@ -182,57 +146,21 @@ static SongEnumerator *
 asx_open_stream(InputStream &is)
 {
 	AsxParser parser;
-	bool success;
-	Error error2;
-	GError *error = nullptr;
-
-	/* parse the ASX XML file */
-
-	GMarkupParseContext *context =
-		g_markup_parse_context_new(&asx_parser,
-					   G_MARKUP_TREAT_CDATA_AS_TEXT,
-					   &parser, nullptr);
-
-	while (true) {
-	char buffer[1024];
-		size_t nbytes = is.LockRead(buffer, sizeof(buffer), error2);
-		if (nbytes == 0) {
-			if (error2.IsDefined()) {
-				g_markup_parse_context_free(context);
-				LogError(error2);
-				return nullptr;
-			}
-
-			break;
-		}
 
-		success = g_markup_parse_context_parse(context, buffer, nbytes,
-						       &error);
-		if (!success) {
-			FormatErrno(asx_domain,
-				    "XML parser failed: %s", error->message);
-			g_error_free(error);
-			g_markup_parse_context_free(context);
+	{
+		ExpatParser expat(&parser);
+		expat.SetElementHandler(asx_start_element, asx_end_element);
+		expat.SetCharacterDataHandler(asx_char_data);
+
+		Error error;
+		if (!expat.Parse(is, error)) {
+			LogError(error);
 			return nullptr;
 		}
 	}
 
-	success = g_markup_parse_context_end_parse(context, &error);
-	if (!success) {
-		FormatErrno(asx_domain,
-			    "XML parser failed: %s", error->message);
-		g_error_free(error);
-		g_markup_parse_context_free(context);
-		return nullptr;
-	}
-
 	parser.songs.reverse();
-	MemorySongEnumerator *playlist =
-		new MemorySongEnumerator(std::move(parser.songs));
-
-	g_markup_parse_context_free(context);
-
-	return playlist;
+	return new MemorySongEnumerator(std::move(parser.songs));
 }
 
 static const char *const asx_suffixes[] = {