MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-11-29 10:12:39 +01:00
Code Issues Releases Wiki Activity

ircd:Ⓜ️:v1: Minor cleanup: remove extra initializers.

Browse source
This commit is contained in:
Jason Volk 2018-01-26 12:20:02 -08:00
parent 61e9bd018f
commit 21518623fe
1 changed files with 23 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
ircd/m/v1.cc
View file

@ -55,13 +55,10 @@ ircd::m::v1::send::send(const string_view &txnid,
if(!defined(json::get<"uri"_>(opts.request))) if(!defined(json::get<"uri"_>(opts.request)))
{ {
thread_local char urlbuf[1024], txnidbuf[512]; thread_local char urlbuf[1024], txnidbuf[512];
json::get<"uri"_>(opts.request) = json::get<"uri"_>(opts.request) = fmt::sprintf
{
fmt::sprintf
{ {
urlbuf, "/_matrix/federation/v1/send/%s/", urlbuf, "/_matrix/federation/v1/send/%s/",
url::encode(txnid, txnidbuf), url::encode(txnid, txnidbuf),
}
}; };
} }
@ -157,15 +154,12 @@ ircd::m::v1::backfill::backfill(const room::id &room_id,
if(!defined(json::get<"uri"_>(opts.request))) if(!defined(json::get<"uri"_>(opts.request)))
{ {
thread_local char urlbuf[2048], ridbuf[768], eidbuf[768]; thread_local char urlbuf[2048], ridbuf[768], eidbuf[768];
json::get<"uri"_>(opts.request) = json::get<"uri"_>(opts.request) = fmt::sprintf
{
fmt::sprintf
{ {
urlbuf, "/_matrix/federation/v1/backfill/%s/?limit=%zu&v=%s", urlbuf, "/_matrix/federation/v1/backfill/%s/?limit=%zu&v=%s",
url::encode(room_id, ridbuf), url::encode(room_id, ridbuf),
opts.limit, opts.limit,
url::encode(opts.event_id, eidbuf), url::encode(opts.event_id, eidbuf),
}
}; };
} }
@ -261,14 +255,11 @@ ircd::m::v1::state::state(const room::id &room_id,
if(!defined(json::get<"uri"_>(opts.request))) if(!defined(json::get<"uri"_>(opts.request)))
{ {
thread_local char urlbuf[2048], ridbuf[768], eidbuf[768]; thread_local char urlbuf[2048], ridbuf[768], eidbuf[768];
json::get<"uri"_>(opts.request) = json::get<"uri"_>(opts.request) = fmt::sprintf
{
fmt::sprintf
{ {
urlbuf, "/_matrix/federation/v1/state/%s/?event_id=%s", urlbuf, "/_matrix/federation/v1/state/%s/?event_id=%s",
url::encode(room_id, ridbuf), url::encode(room_id, ridbuf),
url::encode(opts.event_id, eidbuf), url::encode(opts.event_id, eidbuf),
}
}; };
} }
@ -336,13 +327,10 @@ ircd::m::v1::event::event(const m::event::id &event_id,
if(!defined(json::get<"uri"_>(opts.request))) if(!defined(json::get<"uri"_>(opts.request)))
{ {
thread_local char urlbuf[1024], eidbuf[768]; thread_local char urlbuf[1024], eidbuf[768];
json::get<"uri"_>(opts.request) = json::get<"uri"_>(opts.request) = fmt::sprintf
{
fmt::sprintf
{ {
urlbuf, "/_matrix/federation/v1/event/%s/", urlbuf, "/_matrix/federation/v1/event/%s/",
url::encode(event_id, eidbuf), url::encode(event_id, eidbuf),
}
}; };
} }
@ -402,14 +390,11 @@ ircd::m::v1::send_join::send_join(const room::id &room_id,
if(!defined(json::get<"uri"_>(opts.request))) if(!defined(json::get<"uri"_>(opts.request)))
{ {
thread_local char urlbuf[2048], ridbuf[768], uidbuf[768]; thread_local char urlbuf[2048], ridbuf[768], uidbuf[768];
json::get<"uri"_>(opts.request) = json::get<"uri"_>(opts.request) = fmt::sprintf
{
fmt::sprintf
{ {
urlbuf, "/_matrix/federation/v1/send_join/%s/%s", urlbuf, "/_matrix/federation/v1/send_join/%s/%s",
url::encode(room_id, ridbuf), url::encode(room_id, ridbuf),
url::encode(user_id, uidbuf) url::encode(user_id, uidbuf)
}
}; };
} }
@ -479,14 +464,11 @@ ircd::m::v1::make_join::make_join(const room::id &room_id,
if(!defined(json::get<"uri"_>(opts.request))) if(!defined(json::get<"uri"_>(opts.request)))
{ {
thread_local char urlbuf[2048], ridbuf[768], uidbuf[768]; thread_local char urlbuf[2048], ridbuf[768], uidbuf[768];
json::get<"uri"_>(opts.request) = json::get<"uri"_>(opts.request) = fmt::sprintf
{
fmt::sprintf
{ {
urlbuf, "/_matrix/federation/v1/make_join/%s/%s", urlbuf, "/_matrix/federation/v1/make_join/%s/%s",
url::encode(room_id, ridbuf), url::encode(room_id, ridbuf),
url::encode(user_id, uidbuf) url::encode(user_id, uidbuf)
}
}; };
} }