From 356c829b767863512da1792c048f6ddbeb8457a3 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Wed, 30 Sep 2015 22:03:01 +0200
Subject: util/StringView: new utility class

---
 src/db/plugins/upnp/Directory.cxx | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

(limited to 'src/db/plugins')

diff --git a/src/db/plugins/upnp/Directory.cxx b/src/db/plugins/upnp/Directory.cxx
index 894a53c6a..e7f92432a 100644
--- a/src/db/plugins/upnp/Directory.cxx
+++ b/src/db/plugins/upnp/Directory.cxx
@@ -25,6 +25,7 @@
 #include "tag/TagBuilder.hxx"
 #include "tag/TagTable.hxx"
 #include "util/NumberParser.hxx"
+#include "util/StringView.hxx"
 
 #include <algorithm>
 #include <string>
@@ -36,23 +37,13 @@ UPnPDirContent::~UPnPDirContent()
 	/* this destructor exists here just so it won't get inlined */
 }
 
-gcc_pure gcc_nonnull_all
-static bool
-CompareStringLiteral(const char *literal, const char *value, size_t length)
-{
-	return length == strlen(literal) &&
-		memcmp(literal, value, length) == 0;
-}
-
 gcc_pure
 static UPnPDirObject::ItemClass
-ParseItemClass(const char *name, size_t length)
+ParseItemClass(StringView name)
 {
-	if (CompareStringLiteral("object.item.audioItem.musicTrack",
-				 name, length))
+	if (name.EqualsLiteral("object.item.audioItem.musicTrack"))
 		return UPnPDirObject::ItemClass::MUSIC;
-	else if (CompareStringLiteral("object.item.playlistItem",
-				      name, length))
+	else if (name.EqualsLiteral("object.item.playlistItem"))
 		return UPnPDirObject::ItemClass::PLAYLIST;
 	else
 		return UPnPDirObject::ItemClass::UNKNOWN;
@@ -239,7 +230,7 @@ protected:
 			break;
 
 		case CLASS:
-			object.item_class = ParseItemClass(s, len);
+			object.item_class = ParseItemClass(StringView(s, len));
 			break;
 		}
 	}
-- 
cgit v1.2.3