MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-11-17 15:30:52 +01:00
Code Issues Releases Wiki Activity

ircd:Ⓜ️:dbs: Copy root_in to root_out buffer for intuitive behavior.

Browse source
This commit is contained in:
Jason Volk 2018-05-17 19:35:01 -07:00
parent 47e5e94ac1
commit 2626e14543
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ircd/m/dbs.cc
View file

@ -168,7 +168,7 @@ ircd::m::dbs::_index_ephem(db::txn &txn,
const write_opts &opts) const write_opts &opts)
{ {
_index__room_events(txn, event, opts, opts.root_in); _index__room_events(txn, event, opts, opts.root_in);
return opts.root_in; return strlcpy(opts.root_out, opts.root_in);
} }
ircd::string_view ircd::string_view
@ -198,12 +198,13 @@ try
if(!defined(json::get<"state_key"_>(target))) if(!defined(json::get<"state_key"_>(target)))
{ {
_index__room_events(txn, event, opts, opts.root_in); _index__room_events(txn, event, opts, opts.root_in);
return opts.root_in; return strlcpy(opts.root_out, opts.root_in);
} }
const string_view new_root const string_view new_root
{ {
opts.root_in //state::remove(txn, state_root_out, state_root_in, target) //state::remove(txn, state_root_out, state_root_in, target)
strlcpy(opts.root_out, opts.root_in)
}; };
_index__room_events(txn, event, opts, new_root); _index__room_events(txn, event, opts, new_root);
@ -239,7 +240,7 @@ try
{ {
opts.op == db::op::SET && opts.history? opts.op == db::op::SET && opts.history?
state::insert(txn, opts.root_out, opts.root_in, event): state::insert(txn, opts.root_out, opts.root_in, event):
opts.root_in strlcpy(opts.root_out, opts.root_in)
}; };
_index__room_events(txn, event, opts, new_root); _index__room_events(txn, event, opts, new_root);