oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

tag/Table: use std::string_view

Browse Source
This commit is contained in:
Max Kellermann 2022-06-30 10:52:32 +02:00
parent 1a2b505979
commit 455a412aaa
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/tag/Table.cxx
View File

@ -19,7 +19,7 @@
#include "Table.hxx" #include "Table.hxx"
#include "util/ASCII.hxx" #include "util/ASCII.hxx"
#include "util/StringView.hxx" #include "util/StringCompare.hxx"
#include <string.h> #include <string.h>
@ -39,10 +39,10 @@ tag_table_lookup(const struct tag_table *table, const char *name) noexcept
} }
TagType TagType
tag_table_lookup(const struct tag_table *table, StringView name) noexcept tag_table_lookup(const struct tag_table *table, std::string_view name) noexcept
{ {
for (; table->name != nullptr; ++table) for (; table->name != nullptr; ++table)
if (name.Equals(table->name)) if (name == table->name)
return table->type; return table->type;
return TAG_NUM_OF_ITEM_TYPES; return TAG_NUM_OF_ITEM_TYPES;
@ -64,10 +64,11 @@ tag_table_lookup_i(const struct tag_table *table, const char *name) noexcept
} }
TagType TagType
tag_table_lookup_i(const struct tag_table *table, StringView name) noexcept tag_table_lookup_i(const struct tag_table *table,
std::string_view name) noexcept
{ {
for (; table->name != nullptr; ++table) for (; table->name != nullptr; ++table)
if (name.EqualsIgnoreCase(table->name)) if (StringIsEqualIgnoreCase(name, table->name))
return table->type; return table->type;
return TAG_NUM_OF_ITEM_TYPES; return TAG_NUM_OF_ITEM_TYPES;

6
src/tag/Table.hxx
View File

@ -22,7 +22,7 @@
#include "Type.h" #include "Type.h"
struct StringView; #include <string_view>
struct tag_table { struct tag_table {
const char *name; const char *name;
@ -41,7 +41,7 @@ tag_table_lookup(const tag_table *table, const char *name) noexcept;
[[gnu::pure]] [[gnu::pure]]
TagType TagType
tag_table_lookup(const tag_table *table, StringView name) noexcept; tag_table_lookup(const tag_table *table, std::string_view name) noexcept;
/** /**
* Looks up a string in a tag translation table (case insensitive). * Looks up a string in a tag translation table (case insensitive).
@ -54,7 +54,7 @@ tag_table_lookup_i(const tag_table *table, const char *name) noexcept;
[[gnu::pure]] [[gnu::pure]]
TagType TagType
tag_table_lookup_i(const tag_table *table, StringView name) noexcept; tag_table_lookup_i(const tag_table *table, std::string_view name) noexcept;
/** /**
* Looks up a #TagType in a tag translation table and returns its * Looks up a #TagType in a tag translation table and returns its