X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fhttp%2Fclient.cpp;h=30c336e3e1bf627867d7e4a75ffd3d7a763f352a;hb=3ab65d35cfd696002e09768a38f98e6a2e1ade81;hp=705f4cb7bbd0a7e09dcdbcde3dc979e9bf0cae86;hpb=5afa6e0e07b20ef58d262d69d96971df9a4be71f;p=libs%2Fnet.git diff --git a/source/http/client.cpp b/source/http/client.cpp index 705f4cb..30c336e 100644 --- a/source/http/client.cpp +++ b/source/http/client.cpp @@ -11,17 +11,6 @@ using namespace std; namespace Msp { namespace Http { -Client::Client(): - sock(0), - event_disp(0), - resolver(0), - resolve_listener(0), - resolve_tag(0), - user_agent("libmsphttp/0.1"), - request(0), - response(0) -{ } - Client::~Client() { delete sock; @@ -43,7 +32,7 @@ void Client::use_resolver(Net::Resolver *r) if(resolver) { delete resolve_listener; - resolve_listener = 0; + resolve_listener = nullptr; } resolver = r; @@ -57,14 +46,14 @@ void Client::start_request(const Request &r) throw invalid_state("already processing a request"); delete sock; - sock = 0; + sock = nullptr; request = new Request(r); if(!user_agent.empty()) request->set_header("User-Agent", user_agent); delete response; - response = 0; + response = nullptr; in_buf.clear(); string host = r.get_header("Host"); @@ -99,9 +88,9 @@ void Client::tick() signal_response_complete.emit(*response); delete sock; - sock = 0; + sock = nullptr; delete request; - request = 0; + request = nullptr; } } @@ -114,9 +103,9 @@ void Client::wait_response() void Client::abort() { delete sock; - sock = 0; + sock = nullptr; delete request; - request = 0; + request = nullptr; } void Client::address_resolved(unsigned tag, const Net::SockAddr &addr) @@ -143,7 +132,7 @@ void Client::resolve_failed(unsigned tag, const exception &err) resolve_tag = 0; delete request; - request = 0; + request = nullptr; if(signal_socket_error.empty()) throw err; @@ -155,7 +144,7 @@ void Client::connect_finished(const exception *err) if(err) { delete request; - request = 0; + request = nullptr; if(signal_socket_error.empty()) throw *err; @@ -217,7 +206,7 @@ void Client::data_available() signal_response_complete.emit(*response); delete request; - request = 0; + request = nullptr; } }