OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-11-24 12:11:04 +00:00
Code Issues Projects Releases Wiki Activity

Fixed explicit initialization and constructor for HttpContext

Browse Source
This commit is contained in:
archshift 2015-05-12 21:56:57 -07:00
parent 5b12f23365
commit b550a4e4dc
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/core/hle/service/http/http.cpp
View File

@ -24,6 +24,16 @@ static int BufWriter(u8 *data, size_t size, size_t nmemb, std::vector<u8>* out_b
return static_cast<int>(size * nmemb); return static_cast<int>(size * nmemb);
} }
HttpContext::HttpContext() {
state = REQUEST_STATE_NONE;
cancel_request = false;
req_type = REQUEST_TYPE_NONE;
request_hdrs = nullptr;
response_code = 0;
content_length = 0.0;
downloaded_size = 0.0;
}
HttpContext::~HttpContext() { HttpContext::~HttpContext() {
curl_slist_free_all(request_hdrs); curl_slist_free_all(request_hdrs);
} }
@ -68,8 +78,8 @@ void MakeRequest(HttpContext* context) {
mres = curl_multi_add_handle(manager, connection); mres = curl_multi_add_handle(manager, connection);
int still_running; int still_running = 0;
int repeats; int repeats = 0;
mres = curl_multi_perform(manager, &still_running); mres = curl_multi_perform(manager, &still_running);
do { do {

2
src/core/hle/service/http/http.h
View File

@ -34,6 +34,7 @@ enum RequestType : u32 {
/// Current state of the HTTP request (API-exposed). /// Current state of the HTTP request (API-exposed).
enum RequestState : u32 { enum RequestState : u32 {
REQUEST_STATE_NONE = 0, // TODO: Verify
REQUEST_STATE_IN_PROGRESS = 5, REQUEST_STATE_IN_PROGRESS = 5,
REQUEST_STATE_READY = 8, REQUEST_STATE_READY = 8,
}; };
@ -63,6 +64,7 @@ struct HttpContext {
double content_length; //< The total size in bytes that will be downloaded this request. double content_length; //< The total size in bytes that will be downloaded this request.
double downloaded_size; //< The amount in bytes that has been downloaded so far. double downloaded_size; //< The amount in bytes that has been downloaded so far.
HttpContext();
~HttpContext(); ~HttpContext();
}; };