RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 19:37:36 +00:00
Code Issues Activity Actions

LibIMAP: Replace abuse of String::matches() with == in the parser

Browse source 
matches() is for globs. These are not globs.
This commit is contained in:
Linus Groh 2021-07-24 21:00:37 +01:00
parent ddd11b98d9
commit 73a9d2ec32
1 changed files with 29 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

58
Userland/Libraries/LibIMAP/Parser.cpp
View file

@ -131,16 +131,16 @@ void Parser::parse_untagged()
if (number.has_value()) { if (number.has_value()) {
consume(" "); consume(" ");
auto data_type = parse_atom().to_string(); auto data_type = parse_atom().to_string();
if (data_type.matches("EXISTS")) { if (data_type == "EXISTS"sv) {
m_response.data().set_exists(number.value()); m_response.data().set_exists(number.value());
consume("\r\n"); consume("\r\n");
} else if (data_type.matches("RECENT")) { } else if (data_type == "RECENT"sv) {
m_response.data().set_recent(number.value()); m_response.data().set_recent(number.value());
consume("\r\n"); consume("\r\n");
} else if (data_type.matches("FETCH")) { } else if (data_type == "FETCH"sv) {
auto fetch_response = parse_fetch_response(); auto fetch_response = parse_fetch_response();
m_response.data().add_fetch_response(number.value(), move(fetch_response)); m_response.data().add_fetch_response(number.value(), move(fetch_response));
} else if (data_type.matches("EXPUNGE")) { } else if (data_type == "EXPUNGE"sv) {
m_response.data().add_expunged(number.value()); m_response.data().add_expunged(number.value());
consume("\r\n"); consume("\r\n");
} }
@ -165,16 +165,16 @@ void Parser::parse_untagged()
if (try_consume("[")) { if (try_consume("[")) {
auto actual_type = parse_atom(); auto actual_type = parse_atom();
consume(" "); consume(" ");
if (actual_type.matches("UIDNEXT")) { if (actual_type == "UIDNEXT"sv) {
auto n = parse_number(); auto n = parse_number();
m_response.data().set_uid_next(n); m_response.data().set_uid_next(n);
} else if (actual_type.matches("UIDVALIDITY")) { } else if (actual_type == "UIDVALIDITY"sv) {
auto n = parse_number(); auto n = parse_number();
m_response.data().set_uid_validity(n); m_response.data().set_uid_validity(n);
} else if (actual_type.matches("UNSEEN")) { } else if (actual_type == "UNSEEN"sv) {
auto n = parse_number(); auto n = parse_number();
m_response.data().set_unseen(n); m_response.data().set_unseen(n);
} else if (actual_type.matches("PERMANENTFLAGS")) { } else if (actual_type == "PERMANENTFLAGS"sv) {
auto flags = parse_list(+[](StringView x) { return String(x); }); auto flags = parse_list(+[](StringView x) { return String(x); });
m_response.data().set_permanent_flags(move(flags)); m_response.data().set_permanent_flags(move(flags));
} else { } else {
@ -209,15 +209,15 @@ void Parser::parse_untagged()
auto value = parse_number(); auto value = parse_number();
auto type = StatusItemType::Recent; auto type = StatusItemType::Recent;
if (status_att.matches("MESSAGES")) { if (status_att == "MESSAGES"sv) {
type = StatusItemType::Messages; type = StatusItemType::Messages;
} else if (status_att.matches("UNSEEN")) { } else if (status_att == "UNSEEN"sv) {
type = StatusItemType::Unseen; type = StatusItemType::Unseen;
} else if (status_att.matches("UIDNEXT")) { } else if (status_att == "UIDNEXT"sv) {
type = StatusItemType::UIDNext; type = StatusItemType::UIDNext;
} else if (status_att.matches("UIDVALIDITY")) { } else if (status_att == "UIDVALIDITY"sv) {
type = StatusItemType::UIDValidity; type = StatusItemType::UIDValidity;
} else if (status_att.matches("RECENT")) { } else if (status_att == "RECENT"sv) {
type = StatusItemType::Recent; type = StatusItemType::Recent;
} else { } else {
dbgln("Unmatched status attribute: {}", status_att); dbgln("Unmatched status attribute: {}", status_att);
@ -610,11 +610,11 @@ ResponseStatus Parser::parse_status()
{ {
auto atom = parse_atom(); auto atom = parse_atom();
if (atom.matches("OK")) { if (atom == "OK"sv) {
return ResponseStatus::OK; return ResponseStatus::OK;
} else if (atom.matches("BAD")) { } else if (atom == "BAD"sv) {
return ResponseStatus::Bad; return ResponseStatus::Bad;
} else if (atom.matches("NO")) { } else if (atom == "NO"sv) {
return ResponseStatus::No; return ResponseStatus::No;
} }
@ -643,31 +643,31 @@ Vector<T> Parser::parse_list(T converter(StringView))
MailboxFlag Parser::parse_mailbox_flag(StringView s) MailboxFlag Parser::parse_mailbox_flag(StringView s)
{ {
if (s.matches("\\All")) if (s == "\\All"sv)
return MailboxFlag::All; return MailboxFlag::All;
if (s.matches("\\Drafts")) if (s == "\\Drafts"sv)
return MailboxFlag::Drafts; return MailboxFlag::Drafts;
if (s.matches("\\Flagged")) if (s == "\\Flagged"sv)
return MailboxFlag::Flagged; return MailboxFlag::Flagged;
if (s.matches("\\HasChildren")) if (s == "\\HasChildren"sv)
return MailboxFlag::HasChildren; return MailboxFlag::HasChildren;
if (s.matches("\\HasNoChildren")) if (s == "\\HasNoChildren"sv)
return MailboxFlag::HasNoChildren; return MailboxFlag::HasNoChildren;
if (s.matches("\\Important")) if (s == "\\Important"sv)
return MailboxFlag::Important; return MailboxFlag::Important;
if (s.matches("\\Junk")) if (s == "\\Junk"sv)
return MailboxFlag::Junk; return MailboxFlag::Junk;
if (s.matches("\\Marked")) if (s == "\\Marked"sv)
return MailboxFlag::Marked; return MailboxFlag::Marked;
if (s.matches("\\Noinferiors")) if (s == "\\Noinferiors"sv)
return MailboxFlag::NoInferiors; return MailboxFlag::NoInferiors;
if (s.matches("\\Noselect")) if (s == "\\Noselect"sv)
return MailboxFlag::NoSelect; return MailboxFlag::NoSelect;
if (s.matches("\\Sent")) if (s == "\\Sent"sv)
return MailboxFlag::Sent; return MailboxFlag::Sent;
if (s.matches("\\Trash")) if (s == "\\Trash"sv)
return MailboxFlag::Trash; return MailboxFlag::Trash;
if (s.matches("\\Unmarked")) if (s == "\\Unmarked"sv)
return MailboxFlag::Unmarked; return MailboxFlag::Unmarked;
dbgln("Unrecognized mailbox flag {}", s); dbgln("Unrecognized mailbox flag {}", s);