Changed rjp_search_members calls to utilize update from rjp commit #71661cd

This commit is contained in:
rexy712 2019-03-30 04:38:56 -07:00
parent 58c01bb182
commit c61f996415

View File

@ -445,7 +445,7 @@ namespace matrix{
res = rjp_search_member(res.value, "events", 0); res = rjp_search_member(res.value, "events", 0);
if(!res.value) continue; if(!res.value) continue;
for(RJP_value* event = rjp_get_element(res.value);event;event = rjp_next_element(event)){ for(RJP_value* event = rjp_get_element(res.value);event;event = rjp_next_element(event)){
static const char* search_terms[] = {"event_id", "sender", "state_key", "unsigned"}; static constexpr const char* search_terms[] = {"event_id", "sender", "state_key", "unsigned"};
static constexpr size_t num_searches = sizeof(search_terms)/sizeof(search_terms[0]); static constexpr size_t num_searches = sizeof(search_terms)/sizeof(search_terms[0]);
RJP_search_res results[num_searches] = {}; RJP_search_res results[num_searches] = {};
rjp_search_members(event, num_searches, search_terms, results, 0); rjp_search_members(event, num_searches, search_terms, results, 0);
@ -465,7 +465,7 @@ namespace matrix{
res = rjp_search_member(res.value, "events", 0); res = rjp_search_member(res.value, "events", 0);
if(!res.value) continue; if(!res.value) continue;
for(RJP_value* event = rjp_get_element(res.value);event;event = rjp_next_element(event)){ for(RJP_value* event = rjp_get_element(res.value);event;event = rjp_next_element(event)){
static const char* searches[] = {"sender", "content", "event_id", "unsigned"}; static constexpr const char* searches[] = {"sender", "content", "event_id", "unsigned"};
static constexpr size_t num_searches = sizeof(searches)/sizeof(searches[0]); static constexpr size_t num_searches = sizeof(searches)/sizeof(searches[0]);
RJP_search_res results[num_searches] = {}; RJP_search_res results[num_searches] = {};
rjp_search_members(event, num_searches, searches, results, 0); rjp_search_members(event, num_searches, searches, results, 0);