From e1ec65bd53db811bfc66d92346519c43a06b65c7 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Sun, 15 Dec 2013 17:05:18 +0100
Subject: UriUtil: add function uri_get_scheme()

Replaces g_uri_parse_scheme().
---
 src/PlaylistRegistry.cxx | 10 +++-------
 src/util/UriUtil.cxx     | 10 ++++++++++
 src/util/UriUtil.hxx     |  7 +++++++
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/PlaylistRegistry.cxx b/src/PlaylistRegistry.cxx
index 9afbe349d..65f55e6ff 100644
--- a/src/PlaylistRegistry.cxx
+++ b/src/PlaylistRegistry.cxx
@@ -40,8 +40,6 @@
 #include "system/FatalError.hxx"
 #include "Log.hxx"
 
-#include <glib.h>
-
 #include <assert.h>
 #include <string.h>
 
@@ -130,13 +128,12 @@ static SongEnumerator *
 playlist_list_open_uri_scheme(const char *uri, Mutex &mutex, Cond &cond,
 			      bool *tried)
 {
-	char *scheme;
 	SongEnumerator *playlist = nullptr;
 
 	assert(uri != nullptr);
 
-	scheme = g_uri_parse_scheme(uri);
-	if (scheme == nullptr)
+	const auto scheme = uri_get_scheme(uri);
+	if (scheme.empty())
 		return nullptr;
 
 	for (unsigned i = 0; playlist_plugins[i] != nullptr; ++i) {
@@ -146,7 +143,7 @@ playlist_list_open_uri_scheme(const char *uri, Mutex &mutex, Cond &cond,
 
 		if (playlist_plugins_enabled[i] && plugin->open_uri != nullptr &&
 		    plugin->schemes != nullptr &&
-		    string_array_contains(plugin->schemes, scheme)) {
+		    string_array_contains(plugin->schemes, scheme.c_str())) {
 			playlist = playlist_plugin_open_uri(plugin, uri,
 							    mutex, cond);
 			if (playlist != nullptr)
@@ -156,7 +153,6 @@ playlist_list_open_uri_scheme(const char *uri, Mutex &mutex, Cond &cond,
 		}
 	}
 
-	g_free(scheme);
 	return playlist;
 }
 
diff --git a/src/util/UriUtil.cxx b/src/util/UriUtil.cxx
index 7997bd5c9..89d2a473a 100644
--- a/src/util/UriUtil.cxx
+++ b/src/util/UriUtil.cxx
@@ -27,6 +27,16 @@ bool uri_has_scheme(const char *uri)
 	return strstr(uri, "://") != nullptr;
 }
 
+std::string
+uri_get_scheme(const char *uri)
+{
+	const char *end = strstr(uri, "://");
+	if (end == nullptr)
+		end = uri;
+
+	return std::string(uri, end);
+}
+
 /* suffixes should be ascii only characters */
 const char *
 uri_get_suffix(const char *uri)
diff --git a/src/util/UriUtil.hxx b/src/util/UriUtil.hxx
index 78d0a6bff..20e468103 100644
--- a/src/util/UriUtil.hxx
+++ b/src/util/UriUtil.hxx
@@ -31,6 +31,13 @@
 gcc_pure
 bool uri_has_scheme(const char *uri);
 
+/**
+ * Returns the scheme name of the specified URI, or an empty string.
+ */
+gcc_pure
+std::string
+uri_get_scheme(const char *uri);
+
 gcc_pure
 const char *
 uri_get_suffix(const char *uri);
-- 
cgit v1.2.3