tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove RequestBase::start

Browse Source 
Requests are always started immediately upon construction.

While here, use typed pointers, not void*.
This commit is contained in:
John Firebaugh
2015-04-17 12:37:43 -07:00
parent cdd8f3ac32
commit 8e5fa341eb
8 changed files with 70 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
platform/default/http_request_curl.cpp
View File

@@ -495,7 +495,7 @@ HTTPRequestImpl::~HTTPRequestImpl() {
if (request) {
context->removeRequest(request);
request->ptr = nullptr;
request->impl = nullptr;
}
handleError(curl_multi_remove_handle(context->multi, handle));
@@ -723,33 +723,27 @@ void HTTPRequestImpl::handleResult(CURLcode code) {
// -------------------------------------------------------------------------------------------------
HTTPRequest::HTTPRequest(const Resource& resource_, Callback callback_)
: RequestBase(resource_, callback_) {
HTTPRequest::HTTPRequest(const Resource& resource_, Callback callback_,
uv_loop_t* loop, std::shared_ptr<const Response> response)
: RequestBase(resource_, callback_)
, impl(new HTTPRequestImpl(this, loop, response)) {
}
HTTPRequest::~HTTPRequest() {
if (ptr) {
reinterpret_cast<HTTPRequestImpl *>(ptr)->abandon();
if (impl) {
impl->abandon();
}
}
void HTTPRequest::start(uv_loop_t *loop, std::shared_ptr<const Response> response) {
assert(!ptr);
ptr = new HTTPRequestImpl(this, loop, response);
}
void HTTPRequest::retryImmediately() {
if (ptr) {
reinterpret_cast<HTTPRequestImpl *>(ptr)->retryImmediately();
if (impl) {
impl->retryImmediately();
}
}
void HTTPRequest::cancel() {
if (ptr) {
delete reinterpret_cast<HTTPRequestImpl *>(ptr);
ptr = nullptr;
}
delete impl;
impl = nullptr;
delete this;
}