diff options
| author | Max Kellermann <max@duempel.org> | 2013-10-21 08:42:55 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-10-21 08:42:55 +0200 |
| commit | 222dc8a239f7578cecdcb21523052140aa1192cf (patch) | |
| tree | 3d5577e2d9092277e08de28f20766c01f87cc0ea /src/decoder | |
| parent | 0e4d2e7277bc2adf18dd1e719ec4ce684f86d72b (diff) | |
| download | mpd-222dc8a239f7578cecdcb21523052140aa1192cf.tar.gz mpd-222dc8a239f7578cecdcb21523052140aa1192cf.tar.xz mpd-222dc8a239f7578cecdcb21523052140aa1192cf.zip | |
Util/ASCII: add StringEqualsCaseASCII() overload with length
Replaces GLib's g_ascii_strncasecmp().
Diffstat (limited to 'src/decoder')
| -rw-r--r-- | src/decoder/FlacMetadata.cxx | 3 | ||||
| -rw-r--r-- | src/decoder/VorbisComments.cxx | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/decoder/FlacMetadata.cxx b/src/decoder/FlacMetadata.cxx index 99659d143..a9c57d926 100644 --- a/src/decoder/FlacMetadata.cxx +++ b/src/decoder/FlacMetadata.cxx @@ -25,6 +25,7 @@ #include "tag/TagTable.hxx" #include "tag/TagBuilder.hxx" #include "ReplayGainInfo.hxx" +#include "util/ASCII.hxx" #include <glib.h> @@ -135,7 +136,7 @@ flac_comment_value(const FLAC__StreamMetadata_VorbisComment_Entry *entry, const char *comment = (const char*)entry->entry; if (entry->length <= name_length || - g_ascii_strncasecmp(comment, name, name_length) != 0) + StringEqualsCaseASCII(comment, name, name_length)) return nullptr; if (comment[name_length] == '=') { diff --git a/src/decoder/VorbisComments.cxx b/src/decoder/VorbisComments.cxx index 773eca261..44648884a 100644 --- a/src/decoder/VorbisComments.cxx +++ b/src/decoder/VorbisComments.cxx @@ -25,6 +25,7 @@ #include "tag/TagHandler.hxx" #include "tag/TagBuilder.hxx" #include "ReplayGainInfo.hxx" +#include "util/ASCII.hxx" #include <glib.h> @@ -38,7 +39,7 @@ vorbis_comment_value(const char *comment, const char *needle) { size_t len = strlen(needle); - if (g_ascii_strncasecmp(comment, needle, len) == 0 && + if (StringEqualsCaseASCII(comment, needle, len) && comment[len] == '=') return comment + len + 1; |