From dcf55c7e328578d435eb14277cb6ba9e072f7e9c Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 28 Jan 2013 20:32:23 +0100 Subject: InputStream: add constructor/destructor Eliminate input_stream_init() and input_stream_deinit(). --- src/input/CurlInputPlugin.cxx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/input/CurlInputPlugin.cxx') diff --git a/src/input/CurlInputPlugin.cxx b/src/input/CurlInputPlugin.cxx index 8ed25f9a4..0fbfa29d2 100644 --- a/src/input/CurlInputPlugin.cxx +++ b/src/input/CurlInputPlugin.cxx @@ -166,12 +166,12 @@ struct input_curl { GError *postponed_error; input_curl(const char *url, Mutex &mutex, Cond &cond) - :range(nullptr), request_headers(nullptr), + :base(input_plugin_curl, url, mutex, cond), + range(nullptr), request_headers(nullptr), paused(false), meta_name(nullptr), tag(nullptr), postponed_error(nullptr) { - input_stream_init(&base, &input_plugin_curl, url, mutex, cond); } ~input_curl(); @@ -705,8 +705,6 @@ input_curl::~input_curl() if (postponed_error != NULL) g_error_free(postponed_error); - - input_stream_deinit(&base); } static bool -- cgit v1.2.3