rexy712/matrix_thing
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update to newer librexy string construction

Browse Source
This commit is contained in:
rexy712 2020-04-09 13:16:08 -07:00
parent a27e2c06ba
commit ec3901b904
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/raii/rjp_string.hpp
View File

@ -48,7 +48,7 @@ namespace raii{
using rexy::string_intermediary<detail::rjp_allocator>::string_intermediary; using rexy::string_intermediary<detail::rjp_allocator>::string_intermediary;
rjp_string(RJP_value* r): rjp_string(RJP_value* r):
rexy::string_intermediary<detail::rjp_allocator>(r ? rjp_get_string(r)->value : nullptr, rexy::string_intermediary<detail::rjp_allocator>(rexy::steal(r ? rjp_get_string(r)->value : nullptr),
r ? rjp_get_string(r)->length : 0, r ? rjp_get_string(r)->length : 0,
r ? rjp_get_string(r)->length : 0) r ? rjp_get_string(r)->length : 0)
{ {

2
src/matrix/roomcxn.cpp
View File

@ -64,7 +64,7 @@ namespace matrix{
raii::rjp_object_iterator it(res); raii::rjp_object_iterator it(res);
for(raii::rjp_object_iterator it = res;*it;++it){ for(raii::rjp_object_iterator it = res;*it;++it){
raii::rjp_string tmp(rjp_member_key(*it)->value, rjp_member_key(*it)->length); raii::rjp_string tmp(rexy::steal(rjp_member_key(*it)->value), rjp_member_key(*it)->length);
retval.value().emplace_back(std::move(tmp)); retval.value().emplace_back(std::move(tmp));
} }
return retval; return retval;

6
src/raii/curler.cpp
View File

@ -115,14 +115,14 @@ namespace raii{
curl_string curler::encode(const char* data, int len){ curl_string curler::encode(const char* data, int len){
char* tmp = curl_easy_escape(m_curl, data, len); char* tmp = curl_easy_escape(m_curl, data, len);
size_t esclen = strlen(tmp); size_t esclen = strlen(tmp);
return curl_string(tmp, esclen, esclen); return curl_string(rexy::steal(tmp), esclen, esclen);
} }
curl_string curler::decode(const char* data, int* outlen, int len){ curl_string curler::decode(const char* data, int* outlen, int len){
if(outlen) if(outlen)
return curl_string(curl_easy_unescape(m_curl, data, len, outlen), *outlen); return curl_string(rexy::steal(curl_easy_unescape(m_curl, data, len, outlen)), *outlen);
int out; int out;
char* tmp = curl_easy_unescape(m_curl, data, len, &out); char* tmp = curl_easy_unescape(m_curl, data, len, &out);
return curl_string(tmp, out); return curl_string(rexy::steal(tmp), out);
} }
long curler::last_status(void)const{ long curler::last_status(void)const{

2
src/raii/util.cpp
View File

@ -87,7 +87,7 @@ namespace raii{
char* tmp = reinterpret_cast<char*>(rexy::string::allocator_type::allocate(len+1)); char* tmp = reinterpret_cast<char*>(rexy::string::allocator_type::allocate(len+1));
detail::_sanitize_json_copy(tmp, str); detail::_sanitize_json_copy(tmp, str);
tmp[len] = 0; tmp[len] = 0;
return rexy::string(tmp, len, len); return rexy::string(rexy::steal(tmp), len, len);
} }