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

Merge branch 'v0.20.x'

Browse Source
This commit is contained in:
Max Kellermann
2018-08-02 11:07:40 +02:00
parent 22192adbc8 906972973e
commit cf471e830f
19 changed files with 66 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/util/ASCII.hxx
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2013 Max Kellermann <max.kellermann@gmail.com>
* Copyright (C) 2013-2018 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -30,6 +30,7 @@
#ifndef ASCII_HXX
#define ASCII_HXX
#include "StringView.hxx"
#include "Compiler.h"
#include <assert.h>
@@ -69,4 +70,20 @@ StringEqualsCaseASCII(const char *a, const char *b, size_t n) noexcept
return strncasecmp(a, b, n) == 0;
}
gcc_pure gcc_nonnull_all
static inline bool
StringStartsWithCaseASCII(const char *haystack, StringView needle) noexcept
{
return StringEqualsCaseASCII(haystack, needle.data, needle.size);
}
gcc_pure gcc_nonnull_all
static inline const char *
StringAfterPrefixCaseASCII(const char *haystack, StringView needle) noexcept
{
return StringStartsWithCaseASCII(haystack, needle)
? haystack + needle.size
: nullptr;
}
#endif

4
src/util/UriUtil.cxx
View File

@@ -18,7 +18,7 @@
*/
#include "UriUtil.hxx"
#include "StringCompare.hxx"
#include "ASCII.hxx"
#include "CharUtil.hxx"
#include <assert.h>
@@ -169,7 +169,7 @@ SkipUriScheme(const char *uri) noexcept
{
const char *const schemes[] = { "http://", "https://", "ftp://" };
for (auto scheme : schemes) {
auto result = StringAfterPrefix(uri, scheme);
auto result = StringAfterPrefixCaseASCII(uri, scheme);
if (result != nullptr)
return result;
}