MirrorHub
/
construct
mirror of https://github.com/matrix-construct/construct
0
0
Fork 0
Code Issues Releases Wiki Activity

ircd:Ⓜ️ Fix m::index() interface for consistent leading std::nothrow_t.

This commit is contained in:
Jason Volk 2020-04-01 16:12:41 -07:00
parent 93665cc587
commit d1812f0c44
15 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/ircd/m/event/index.h
View File

@ -13,11 +13,11 @@
namespace ircd::m
{
bool index(const event::id &, std::nothrow_t, const event::closure_idx &);
bool index(std::nothrow_t, const event::id &, const event::closure_idx &);
event::idx index(const event::id &, std::nothrow_t);
event::idx index(std::nothrow_t, const event::id &);
event::idx index(const event::id &);
event::idx index(const event &, std::nothrow_t);
event::idx index(std::nothrow_t, const event &);
event::idx index(const event &);
}

2
include/ircd/m/redacted.h
View File

@ -38,7 +38,7 @@ inline
ircd::m::redacted::redacted(const event::id &event_id)
:redacted
{
index(event_id, std::nothrow)
index(std::nothrow, event_id)
}
{}

2
matrix/dbs.cc
View File

@ -398,7 +398,7 @@ ircd::m::dbs::find_event_idx(const event::id &event_id,
ret = wopts.interpose->val(db::op::SET, "_event_idx", event_id, 0UL);
if(wopts.allow_queries && !ret)
ret = m::index(event_id, std::nothrow); // query
ret = m::index(std::nothrow, event_id); // query
return ret;
}

4
matrix/event.cc
View File

@ -991,7 +991,7 @@ bool
ircd::m::bad(const id::event &event_id)
{
bool ret {false};
index(event_id, std::nothrow, [&ret]
index(std::nothrow, event_id, [&ret]
(const event::idx &event_idx)
{
ret = event_idx == 0;
@ -1016,7 +1016,7 @@ ircd::m::count(const event::prev &prev)
bool
ircd::m::good(const id::event &event_id)
{
return bool(event_id) && index(event_id, std::nothrow) != 0;
return bool(event_id) && index(std::nothrow, event_id) != 0;
}
bool

2
matrix/event_cached.cc
View File

@ -23,7 +23,7 @@ ircd::m::cached(const id::event &event_id,
const event::idx event_idx
{
index(event_id, std::nothrow)
index(std::nothrow, event_id)
};
return event_idx?

4
matrix/event_fetch.cc
View File

@ -30,7 +30,7 @@ ircd::m::seek(event::fetch &fetch,
{
const auto &event_idx
{
index(event_id, std::nothrow)
index(std::nothrow, event_id)
};
return seek(fetch, event_idx, event_id, std::nothrow);
@ -130,7 +130,7 @@ ircd::m::event::fetch::fetch(const event::id &event_id,
const opts &opts)
:fetch
{
index(event_id, std::nothrow), event_id, std::nothrow, opts
index(std::nothrow, event_id), event_id, std::nothrow, opts
}
{
}

4
matrix/event_get.cc
View File

@ -119,7 +119,7 @@ ircd::m::get(std::nothrow_t,
const string_view &key,
const mutable_buffer &buf)
{
return get(std::nothrow, index(event_id, std::nothrow), key, buf);
return get(std::nothrow, index(std::nothrow, event_id), key, buf);
}
ircd::const_buffer
@ -172,7 +172,7 @@ ircd::m::get(std::nothrow_t,
const string_view &key,
const event::fetch::view_closure &closure)
{
return get(std::nothrow, index(event_id, std::nothrow), key, closure);
return get(std::nothrow, index(std::nothrow, event_id), key, closure);
}
bool

18
matrix/event_index.cc
View File

@ -23,10 +23,10 @@ catch(const json::not_found &)
}
ircd::m::event::idx
ircd::m::index(const event &event,
std::nothrow_t)
ircd::m::index(std::nothrow_t,
const event &event)
{
return index(event.event_id, std::nothrow);
return index(std::nothrow, event.event_id);
}
ircd::m::event::idx
@ -35,7 +35,7 @@ ircd::m::index(const event::id &event_id)
assert(event_id);
const auto ret
{
index(event_id, std::nothrow)
index(std::nothrow, event_id)
};
if(!ret)
@ -50,11 +50,11 @@ ircd::m::index(const event::id &event_id)
}
ircd::m::event::idx
ircd::m::index(const event::id &event_id,
std::nothrow_t)
ircd::m::index(std::nothrow_t,
const event::id &event_id)
{
event::idx ret{0};
index(event_id, std::nothrow, [&ret]
index(std::nothrow, event_id, [&ret]
(const event::idx &event_idx)
{
ret = event_idx;
@ -64,8 +64,8 @@ ircd::m::index(const event::id &event_id,
}
bool
ircd::m::index(const event::id &event_id,
std::nothrow_t,
ircd::m::index(std::nothrow_t,
const event::id &event_id,
const event::closure_idx &closure)
{
auto &column

2
matrix/init_backfill.cc
View File

@ -595,7 +595,7 @@ ircd::m::init::backfill::gossip(const room::id &room_id,
size_t ret{0};
const m::event::refs refs
{
m::index(event_id, std::nothrow)
m::index(std::nothrow, event_id)
};
static const size_t max{48};

2
matrix/room_auth.cc
View File

@ -832,7 +832,7 @@ const
const auto &auth_event_idx
{
m::index(auth_event_id, std::nothrow)
m::index(std::nothrow, auth_event_id)
};
if(!auth_event_idx)

2
matrix/room_events.cc
View File

@ -359,7 +359,7 @@ ircd::m::room::events::seek(const event::id &event_id)
{
const event::idx &event_idx
{
m::index(event_id, std::nothrow)
m::index(std::nothrow, event_id)
};
return event_idx?

4
matrix/sync.cc
View File

@ -107,14 +107,14 @@ bool
ircd::m::sync::apropos(const data &d,
const event &event)
{
return apropos(d, index(event, std::nothrow));
return apropos(d, index(std::nothrow, event));
}
bool
ircd::m::sync::apropos(const data &d,
const event::id &event_id)
{
return apropos(d, index(event_id, std::nothrow));
return apropos(d, index(std::nothrow, event_id));
}
bool

2
modules/client/notifications.cc
View File

@ -173,7 +173,7 @@ ircd::m::get_notifications(client &client,
{
object, "read", json::value
{
last_read && index(last_read, std::nothrow) >= event_idx
last_read && index(std::nothrow, last_read) >= event_idx
}
};

2
modules/client/rooms/relations.cc
View File

@ -129,7 +129,7 @@ try
m::event::idx event_idx
{
index(event_id, std::nothrow)
index(std::nothrow, event_id)
};
m::event::fetch event

2
modules/m_room_redaction.cc
View File

@ -73,7 +73,7 @@ ircd::m::auth_room_redaction(const m::event &event,
// the power levels.
const auto redact_target_idx
{
m::index(at<"redacts"_>(event), std::nothrow)
m::index(std::nothrow, at<"redacts"_>(event))
};
if(!redact_target_idx)