monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-23 03:59:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #8792

Browse source 
04dfdb3 epee: protect base64_chars, removed dead functions, speed up compile (Jeffro256)
This commit is contained in:
luigi1111 2023-06-27 11:32:07 -05:00
commit 02ebe9090e
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
4 changed files with 6 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
contrib/epee/include/net/abstract_http_client.h
View file

@ -54,7 +54,6 @@ namespace net_utils
std::string convert(char val); std::string convert(char val);
std::string conver_to_url_format(const std::string& uri); std::string conver_to_url_format(const std::string& uri);
std::string convert_from_url_format(const std::string& uri); std::string convert_from_url_format(const std::string& uri);
std::string convert_to_url_format_force_all(const std::string& uri);
namespace http namespace http
{ {

20
contrib/epee/include/storages/http_abstract_invoke.h
View file

@ -26,13 +26,10 @@
// //
#pragma once #pragma once
#include <boost/utility/string_ref.hpp>
#include <chrono>
#include <string>
#include "byte_slice.h"
#include "portable_storage_template_helper.h"
#include "net/http_base.h" #include "net/http_base.h"
#include "net/http_server_handlers_map2.h" #include "net/jsonrpc_structs.h"
#include "portable_storage_template_helper.h"
namespace epee namespace epee
{ {
@ -136,12 +133,5 @@ namespace epee
epee::json_rpc::error error_struct; epee::json_rpc::error error_struct;
return invoke_http_json_rpc(uri, method_name, out_struct, result_struct, error_struct, transport, timeout, http_method, req_id); return invoke_http_json_rpc(uri, method_name, out_struct, result_struct, error_struct, transport, timeout, http_method, req_id);
} }
} // namespace net_utils
template<class t_command, class t_transport> } // namespace epee
bool invoke_http_json_rpc(const boost::string_ref uri, typename t_command::request& out_struct, typename t_command::response& result_struct, t_transport& transport, std::chrono::milliseconds timeout = std::chrono::seconds(15), const boost::string_ref http_method = "POST", const std::string& req_id = "0")
{
return invoke_http_json_rpc(uri, t_command::methodname(), out_struct, result_struct, transport, timeout, http_method, req_id);
}
}
}

2
contrib/epee/include/string_coding.h
View file

@ -35,7 +35,7 @@ namespace epee
namespace string_encoding namespace string_encoding
{ {
inline inline
std::string& base64_chars() const std::string& base64_chars()
{ {
static std::string chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" static std::string chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"

10
contrib/epee/src/abstract_http_client.cpp
View file

@ -116,16 +116,6 @@ namespace net_utils
return result; return result;
} }
//---------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------
std::string convert_to_url_format_force_all(const std::string& uri)
{
std::string result;
for(size_t i = 0; i!= uri.size(); i++)
{
result += convert(uri[i]);
}
return result;
}
namespace http namespace http
{ {