From 5068227a4684ba053db27e297ffb498e590f3e0d Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Thu, 25 Aug 2011 18:48:05 +0200
Subject: input/curl: move code to input_curl_flush_buffers()
Allow closing the handle while preserving the remaining buffers.
---
src/input/curl_input_plugin.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
(limited to 'src/input')
diff --git a/src/input/curl_input_plugin.c b/src/input/curl_input_plugin.c
index c3256103d..e5e5cd941 100644
--- a/src/input/curl_input_plugin.c
+++ b/src/input/curl_input_plugin.c
@@ -181,6 +181,13 @@ buffer_free_callback(gpointer data, G_GNUC_UNUSED gpointer user_data)
g_free(data);
}
+static void
+input_curl_flush_buffers(struct input_curl *c)
+{
+ g_queue_foreach(c->buffers, buffer_free_callback, NULL);
+ g_queue_clear(c->buffers);
+}
+
/**
* Frees the current "libcurl easy" handle, and everything associated
* with it.
@@ -199,9 +206,6 @@ input_curl_easy_free(struct input_curl *c)
g_free(c->range);
c->range = NULL;
-
- g_queue_foreach(c->buffers, buffer_free_callback, NULL);
- g_queue_clear(c->buffers);
}
/**
@@ -215,6 +219,7 @@ input_curl_free(struct input_curl *c)
g_free(c->meta_name);
input_curl_easy_free(c);
+ input_curl_flush_buffers(c);
if (c->multi != NULL)
curl_multi_cleanup(c->multi);
@@ -797,6 +802,7 @@ input_curl_seek(struct input_stream *is, goffset offset, int whence,
/* close the old connection and open a new one */
input_curl_easy_free(c);
+ input_curl_flush_buffers(c);
is->offset = offset;
if (is->offset == is->size) {
--
cgit v1.2.3