Merge branch 'v0.20.x'

2018-08-02 11:07:40 +02:00
parent 22192adbc8 906972973e
commit cf471e830f
19 changed files with 66 additions and 47 deletions
--- a/src/input/plugins/SmbclientInputPlugin.cxx
+++ b/src/input/plugins/SmbclientInputPlugin.cxx
@@ -25,7 +25,7 @@
 #include "../InputPlugin.hxx"
 #include "PluginUnavailable.hxx"
 #include "system/Error.hxx"
-#include "util/StringCompare.hxx"
+#include "util/ASCII.hxx"

 #include <libsmbclient.h>

@@ -87,7 +87,7 @@ static InputStreamPtr
 input_smbclient_open(const char *uri,
 		     Mutex &mutex)
 {
-	if (!StringStartsWith(uri, "smb://"))
+	if (!StringStartsWithCaseASCII(uri, "smb://"))
 		return nullptr;

 	const std::lock_guard<Mutex> protect(smbclient_mutex);