diff --git a/AK/URLParser.cpp b/AK/URLParser.cpp deleted file mode 100644 index 83f8d11a42..0000000000 --- a/AK/URLParser.cpp +++ /dev/null @@ -1,87 +0,0 @@ -/* - * Copyright (c) 2020, Andreas Kling - * - * SPDX-License-Identifier: BSD-2-Clause - */ - -#include -#include -#include -#include -#include - -namespace AK { - -static bool is_ascii_hex_digit(u8 ch) -{ - return (ch >= '0' && ch <= '9') || (ch >= 'a' && ch <= 'f') || (ch >= 'A' && ch <= 'F'); -} - -String urldecode(const StringView& input) -{ - size_t cursor = 0; - - auto peek = [&](size_t offset = 0) -> u8 { - if (cursor + offset >= input.length()) - return 0; - return input[cursor + offset]; - }; - - auto consume = [&] { - return input[cursor++]; - }; - - StringBuilder builder; - while (cursor < input.length()) { - if (peek() != '%') { - builder.append(consume()); - continue; - } - if (!is_ascii_hex_digit(peek(1)) || !is_ascii_hex_digit(peek(2))) { - builder.append(consume()); - continue; - } - auto byte_point = StringUtils::convert_to_uint_from_hex(input.substring_view(cursor + 1, 2)); - builder.append(byte_point.value()); - consume(); - consume(); - consume(); - } - return builder.to_string(); -} - -static inline bool in_c0_control_set(u32 c) -{ - return c <= 0x1f || c > '~'; -} - -static inline bool in_fragment_set(u32 c) -{ - return in_c0_control_set(c) || c == ' ' || c == '"' || c == '<' || c == '>' || c == '`'; -} - -static inline bool in_path_set(u32 c) -{ - return in_fragment_set(c) || c == '#' || c == '?' || c == '{' || c == '}'; -} - -static inline bool in_userinfo_set(u32 c) -{ - return in_path_set(c) || c == '/' || c == ':' || c == ';' || c == '=' || c == '@' || (c >= '[' && c <= '^') || c == '|'; -} - -String urlencode(const StringView& input, const StringView& exclude) -{ - StringBuilder builder; - for (unsigned char ch : input) { - if (in_userinfo_set((u8)ch) && !exclude.contains(ch)) { - builder.append('%'); - builder.appendff("{:02X}", ch); - } else { - builder.append(ch); - } - } - return builder.to_string(); -} - -} diff --git a/AK/URLParser.h b/AK/URLParser.h deleted file mode 100644 index 741b04d9e7..0000000000 --- a/AK/URLParser.h +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (c) 2020, Andreas Kling - * - * SPDX-License-Identifier: BSD-2-Clause - */ - -#pragma once - -#include - -namespace AK { - -String urlencode(const StringView&, const StringView& exclude = {}); -String urldecode(const StringView&); - -} - -using AK::urldecode; -using AK::urlencode; diff --git a/Userland/Applications/Run/RunWindow.cpp b/Userland/Applications/Run/RunWindow.cpp index e1267c50c4..bf6fa40a37 100644 --- a/Userland/Applications/Run/RunWindow.cpp +++ b/Userland/Applications/Run/RunWindow.cpp @@ -7,7 +7,6 @@ #include "RunWindow.h" #include #include -#include #include #include #include diff --git a/Userland/Libraries/LibWeb/OutOfProcessWebView.cpp b/Userland/Libraries/LibWeb/OutOfProcessWebView.cpp index a3a76b7266..81b878099d 100644 --- a/Userland/Libraries/LibWeb/OutOfProcessWebView.cpp +++ b/Userland/Libraries/LibWeb/OutOfProcessWebView.cpp @@ -7,7 +7,6 @@ #include "OutOfProcessWebView.h" #include "WebContentClient.h" #include -#include #include #include #include