From cb41660c94f10cca0041ebe436757aee376cf8ed Mon Sep 17 00:00:00 2001 From: Jason Volk Date: Mon, 13 Apr 2020 22:46:11 -0700 Subject: [PATCH] ircd: Applications of loopless copy overload for single character. --- include/ircd/json/tuple/tool.h | 6 +++--- ircd/fmt.cc | 2 +- ircd/json.cc | 2 +- ircd/net.cc | 6 +++--- ircd/rfc3986.cc | 4 ++-- matrix/dbs_event_horizon.cc | 2 +- matrix/dbs_event_sender.cc | 4 ++-- matrix/dbs_event_state.cc | 12 ++++++------ matrix/dbs_event_type.cc | 2 +- matrix/dbs_room_events.cc | 6 +++--- matrix/dbs_room_head.cc | 6 +++--- matrix/dbs_room_joined.cc | 10 +++++----- matrix/dbs_room_state.cc | 10 +++++----- matrix/dbs_room_state_space.cc | 14 +++++++------- matrix/dbs_room_type.cc | 6 +++--- matrix/event_conforms.cc | 2 +- 16 files changed, 47 insertions(+), 47 deletions(-) diff --git a/include/ircd/json/tuple/tool.h b/include/ircd/json/tuple/tool.h index d17f5d797..cc6e0ec27 100644 --- a/include/ircd/json/tuple/tool.h +++ b/include/ircd/json/tuple/tool.h @@ -90,17 +90,17 @@ stringify(mutable_buffer &buf, const tuple *e) { const auto start(begin(buf)); - consume(buf, copy(buf, "["_sv)); + consume(buf, copy(buf, '[')); if(b != e) { stringify(buf, *b); for(++b; b != e; ++b) { - consume(buf, copy(buf, ","_sv)); + consume(buf, copy(buf, ',')); stringify(buf, *b); } } - consume(buf, copy(buf, "]"_sv)); + consume(buf, copy(buf, ']')); return { start, begin(buf) }; } diff --git a/ircd/fmt.cc b/ircd/fmt.cc index 6e91d58f6..f5a96b577 100644 --- a/ircd/fmt.cc +++ b/ircd/fmt.cc @@ -379,7 +379,7 @@ try // Ensure null termination if out buffer is non-empty. assert(size(this->out) > 0); assert(this->out.remaining()); - copy(this->out, "\0"_sv); + copy(this->out, '\0'); } catch(const std::out_of_range &e) { diff --git a/ircd/json.cc b/ircd/json.cc index 69feae8aa..4ab21306e 100644 --- a/ircd/json.cc +++ b/ircd/json.cc @@ -2734,7 +2734,7 @@ ircd::json::stringify(mutable_buffer &buf, { char *const start(begin(buf)); assert(!surrounds(member.first, '"')); - consume(buf, copy(buf, "\""_sv)); + consume(buf, copy(buf, '"')); consume(buf, copy(buf, member.first)); consume(buf, copy(buf, "\":"_sv)); stringify(buf, member.second); diff --git a/ircd/net.cc b/ircd/net.cc index e0e6c4855..56f6ba542 100644 --- a/ircd/net.cc +++ b/ircd/net.cc @@ -2577,17 +2577,17 @@ ircd::net::string(const mutable_buffer &buf, }; if(need_bracket) - consume(out, copy(out, "["_sv)); + consume(out, copy(out, '[')); if(ipp) consume(out, size(string(out, std::get(ipp)))); if(need_bracket) - consume(out, copy(out, "]"_sv)); + consume(out, copy(out, ']')); if(has_port) { - consume(out, copy(out, ":"_sv)); + consume(out, copy(out, ':')); consume(out, size(lex_cast(port(ipp), out))); } diff --git a/ircd/rfc3986.cc b/ircd/rfc3986.cc index 9a265b62b..8a2f383e3 100644 --- a/ircd/rfc3986.cc +++ b/ircd/rfc3986.cc @@ -581,7 +581,7 @@ ircd::rfc3986::encode(const mutable_buffer &out, }; consume(buf, size(encode(buf, member.first))); - consume(buf, copy(buf, "="_sv)); + consume(buf, copy(buf, '=')); consume(buf, size(encode(buf, member.second))); }}; @@ -591,7 +591,7 @@ ircd::rfc3986::encode(const mutable_buffer &out, append(*it); for(++it; it != end(members); ++it) { - consume(buf, copy(buf, "&"_sv)); + consume(buf, copy(buf, '&')); append(*it); } } diff --git a/matrix/dbs_event_horizon.cc b/matrix/dbs_event_horizon.cc index 95998fdcd..fd6013a68 100644 --- a/matrix/dbs_event_horizon.cc +++ b/matrix/dbs_event_horizon.cc @@ -297,7 +297,7 @@ ircd::m::dbs::event_horizon_key(const mutable_buffer &out, if(event_idx) { - consume(buf, copy(buf, "\0"_sv)); + consume(buf, copy(buf, '\0')); consume(buf, copy(buf, byte_view(event_idx))); } diff --git a/matrix/dbs_event_sender.cc b/matrix/dbs_event_sender.cc index 3c13132c5..845c50762 100644 --- a/matrix/dbs_event_sender.cc +++ b/matrix/dbs_event_sender.cc @@ -226,7 +226,7 @@ ircd::m::dbs::event_sender_key(const mutable_buffer &out_, if(user_id && event_idx) { - consume(out, copy(out, "\0"_sv)); + consume(out, copy(out, '\0')); consume(out, copy(out, byte_view(event_idx))); } @@ -283,7 +283,7 @@ ircd::m::dbs::event_sender_origin_key(const mutable_buffer &out_, if(localpart && event_idx) { - consume(out, copy(out, "\0"_sv)); + consume(out, copy(out, '\0')); consume(out, copy(out, byte_view(event_idx))); } diff --git a/matrix/dbs_event_state.cc b/matrix/dbs_event_state.cc index cba304963..6d9eb5704 100644 --- a/matrix/dbs_event_state.cc +++ b/matrix/dbs_event_state.cc @@ -204,17 +204,17 @@ ircd::m::dbs::event_state_key(const string_view &amalgam) assert(!startswith(amalgam, '\0')); const auto &[state_key, r0] { - split(amalgam, "\0"_sv) + split(amalgam, '\0') }; const auto &[type, r1] { - split(r0, "\0"_sv) + split(r0, '\0') }; const auto &[room_id, r2] { - split(r1, "\0"_sv) + split(r1, '\0') }; assert(!room_id || m::valid(m::id::ROOM, room_id)); @@ -252,20 +252,20 @@ ircd::m::dbs::event_state_key(const mutable_buffer &out_, if(!type) return {data(out_), data(out)}; - consume(out, copy(out, "\0"_sv)); + consume(out, copy(out, '\0')); consume(out, copy(out, trunc(type, event::TYPE_MAX_SIZE))); if(!room_id) return {data(out_), data(out)}; assert(m::valid(m::id::ROOM, room_id)); - consume(out, copy(out, "\0"_sv)); + consume(out, copy(out, '\0')); consume(out, copy(out, room_id)); if(depth < 0) return {data(out_), data(out)}; - consume(out, copy(out, "\0"_sv)); + consume(out, copy(out, '\0')); consume(out, copy(out, byte_view(depth))); if(!event_idx) diff --git a/matrix/dbs_event_type.cc b/matrix/dbs_event_type.cc index 40a0437b0..0535dbe25 100644 --- a/matrix/dbs_event_type.cc +++ b/matrix/dbs_event_type.cc @@ -185,7 +185,7 @@ ircd::m::dbs::event_type_key(const mutable_buffer &out_, mutable_buffer out{out_}; consume(out, copy(out, trunc(type, event::TYPE_MAX_SIZE))); - consume(out, copy(out, "\0"_sv)); + consume(out, copy(out, '\0')); consume(out, copy(out, byte_view(event_idx))); return { data(out_), data(out) }; } diff --git a/matrix/dbs_room_events.cc b/matrix/dbs_room_events.cc index 7a24cc2fb..4478d1a00 100644 --- a/matrix/dbs_room_events.cc +++ b/matrix/dbs_room_events.cc @@ -73,7 +73,7 @@ ircd::m::dbs::desc::room_events__pfx [](const string_view &key) { - return split(key, "\0"_sv).first; + return split(key, '\0').first; } }; @@ -292,7 +292,7 @@ ircd::m::dbs::room_events_key(const mutable_buffer &out_, mutable_buffer out{out_}; consume(out, copy(out, room_id)); - consume(out, copy(out, "\0"_sv)); + consume(out, copy(out, '\0')); consume(out, copy(out, depth_cb)); return { data(out_), data(out) }; } @@ -315,7 +315,7 @@ ircd::m::dbs::room_events_key(const mutable_buffer &out_, mutable_buffer out{out_}; consume(out, copy(out, room_id)); - consume(out, copy(out, "\0"_sv)); + consume(out, copy(out, '\0')); consume(out, copy(out, depth_cb)); consume(out, copy(out, event_idx_cb)); return { data(out_), data(out) }; diff --git a/matrix/dbs_room_head.cc b/matrix/dbs_room_head.cc index 07503bb12..bbf8431b6 100644 --- a/matrix/dbs_room_head.cc +++ b/matrix/dbs_room_head.cc @@ -52,7 +52,7 @@ ircd::m::dbs::desc::room_head__pfx [](const string_view &key) { - return split(key, "\0"_sv).first; + return split(key, '\0').first; } }; @@ -207,7 +207,7 @@ ircd::m::dbs::room_head_key(const string_view &amalgam) { const auto &key { - lstrip(amalgam, "\0"_sv) + lstrip(amalgam, '\0') }; return @@ -223,7 +223,7 @@ ircd::m::dbs::room_head_key(const mutable_buffer &out_, { mutable_buffer out{out_}; consume(out, copy(out, room_id)); - consume(out, copy(out, "\0"_sv)); + consume(out, copy(out, '\0')); consume(out, copy(out, event_id)); return { data(out_), data(out) }; } diff --git a/matrix/dbs_room_joined.cc b/matrix/dbs_room_joined.cc index e3389744b..c0acd7296 100644 --- a/matrix/dbs_room_joined.cc +++ b/matrix/dbs_room_joined.cc @@ -72,7 +72,7 @@ ircd::m::dbs::desc::room_joined__pfx [](const string_view &key) { - return split(key, "\0"_sv).first; + return split(key, '\0').first; } }; @@ -200,12 +200,12 @@ ircd::m::dbs::room_joined_key(const string_view &amalgam) { const auto &key { - lstrip(amalgam, "\0"_sv) + lstrip(amalgam, '\0') }; const auto &s { - split(key, "@"_sv) + split(key, '@') }; return @@ -224,7 +224,7 @@ ircd::m::dbs::room_joined_key(const mutable_buffer &out_, { mutable_buffer out{out_}; consume(out, copy(out, room_id)); - consume(out, copy(out, "\0"_sv)); + consume(out, copy(out, '\0')); consume(out, copy(out, origin)); return { data(out_), data(out) }; } @@ -237,7 +237,7 @@ ircd::m::dbs::room_joined_key(const mutable_buffer &out_, { mutable_buffer out{out_}; consume(out, copy(out, room_id)); - consume(out, copy(out, "\0"_sv)); + consume(out, copy(out, '\0')); consume(out, copy(out, origin)); consume(out, copy(out, member)); return { data(out_), data(out) }; diff --git a/matrix/dbs_room_state.cc b/matrix/dbs_room_state.cc index 2e587033e..b68d97404 100644 --- a/matrix/dbs_room_state.cc +++ b/matrix/dbs_room_state.cc @@ -76,7 +76,7 @@ ircd::m::dbs::desc::room_state__pfx [](const string_view &key) { - return split(key, "\0"_sv).first; + return split(key, '\0').first; } }; @@ -201,13 +201,13 @@ ircd::m::dbs::room_state_key(const mutable_buffer &out_, if(likely(defined(type))) { - consume(out, copy(out, "\0"_sv)); + consume(out, copy(out, '\0')); consume(out, copy(out, trunc(type, event::TYPE_MAX_SIZE))); } if(defined(state_key)) { - consume(out, copy(out, "\0"_sv)); + consume(out, copy(out, '\0')); consume(out, copy(out, trunc(state_key, event::STATE_KEY_MAX_SIZE))); } @@ -219,12 +219,12 @@ ircd::m::dbs::room_state_key(const string_view &amalgam) { const auto &key { - lstrip(amalgam, "\0"_sv) + lstrip(amalgam, '\0') }; const auto &s { - split(key, "\0"_sv) + split(key, '\0') }; return diff --git a/matrix/dbs_room_state_space.cc b/matrix/dbs_room_state_space.cc index 46287d305..7fd87a8e2 100644 --- a/matrix/dbs_room_state_space.cc +++ b/matrix/dbs_room_state_space.cc @@ -83,7 +83,7 @@ ircd::m::dbs::desc::room_state_space__pfx [](const string_view &key) { - return split(key, "\0"_sv).first; + return split(key, '\0').first; } }; @@ -258,17 +258,17 @@ ircd::m::dbs::room_state_space_key(const string_view &amalgam) { const auto &key { - lstrip(amalgam, "\0"_sv) + lstrip(amalgam, '\0') }; const auto &[type, after_type] { - split(key, "\0"_sv) + split(key, '\0') }; const auto &[state_key, after_state_key] { - split(after_type, "\0"_sv) + split(after_type, '\0') }; const int64_t &depth @@ -325,11 +325,11 @@ ircd::m::dbs::room_state_space_key(const mutable_buffer &out_, { mutable_buffer out{out_}; consume(out, copy(out, room_id)); - consume(out, copy(out, "\0"_sv)); + consume(out, copy(out, '\0')); consume(out, copy(out, trunc(type, event::TYPE_MAX_SIZE))); - consume(out, copy(out, "\0"_sv)); + consume(out, copy(out, '\0')); consume(out, copy(out, trunc(state_key, event::STATE_KEY_MAX_SIZE))); - consume(out, copy(out, "\0"_sv)); + consume(out, copy(out, '\0')); consume(out, copy(out, byte_view(depth))); consume(out, copy(out, byte_view(event_idx))); return { data(out_), data(out) }; diff --git a/matrix/dbs_room_type.cc b/matrix/dbs_room_type.cc index 6a97b2ed2..d11bf5222 100644 --- a/matrix/dbs_room_type.cc +++ b/matrix/dbs_room_type.cc @@ -72,7 +72,7 @@ ircd::m::dbs::desc::room_type__pfx [](const string_view &key) { - return split(key, "\0"_sv).first; + return split(key, '\0').first; } }; @@ -305,9 +305,9 @@ ircd::m::dbs::room_type_key(const mutable_buffer &out_, if(!type) return { data(out_), data(out) }; - consume(out, copy(out, "\0"_sv)); + consume(out, copy(out, '\0')); consume(out, copy(out, trunc(type, event::TYPE_MAX_SIZE))); - consume(out, copy(out, "\0"_sv)); + consume(out, copy(out, '\0')); consume(out, copy(out, byte_view(depth))); consume(out, copy(out, byte_view(event_idx))); return { data(out_), data(out) }; diff --git a/matrix/event_conforms.cc b/matrix/event_conforms.cc index 3202cc4b3..64fa21ff3 100644 --- a/matrix/event_conforms.cc +++ b/matrix/event_conforms.cc @@ -389,7 +389,7 @@ const continue; if(begin(buf) != begin(out)) - consume(buf, copy(buf, " "_sv)); + consume(buf, copy(buf, ' ')); consume(buf, copy(buf, m::reflect(code(i)))); }