oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

input/curl: move code to input_curl_flush_buffers()

Browse Source 
Allow closing the handle while preserving the remaining buffers.
This commit is contained in:
Max Kellermann 2011-08-25 18:48:05 +02:00
parent f8f3bc89e7
commit 5068227a46
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/input/curl_input_plugin.c
View File

@ -181,6 +181,13 @@ buffer_free_callback(gpointer data, G_GNUC_UNUSED gpointer user_data)
g_free(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 * Frees the current "libcurl easy" handle, and everything associated
* with it. * with it.
@ -199,9 +206,6 @@ input_curl_easy_free(struct input_curl *c)
g_free(c->range); g_free(c->range);
c->range = NULL; 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); g_free(c->meta_name);
input_curl_easy_free(c); input_curl_easy_free(c);
input_curl_flush_buffers(c);
if (c->multi != NULL) if (c->multi != NULL)
curl_multi_cleanup(c->multi); 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 */ /* close the old connection and open a new one */
input_curl_easy_free(c); input_curl_easy_free(c);
input_curl_flush_buffers(c);
is->offset = offset; is->offset = offset;
if (is->offset == is->size) { if (is->offset == is->size) {