diff options
| author | Max Kellermann <max@duempel.org> | 2011-08-25 18:40:12 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2011-08-25 18:43:26 +0200 |
| commit | f8f3bc89e788faf8eea979065f532120ce631a75 (patch) | |
| tree | e52f926b6e85dd94cd0cb9bb72da8915a47eb66d | |
| parent | 635f7026b0406fc127719ca50cd6dee4232e6bd1 (diff) | |
| download | mpd-f8f3bc89e788faf8eea979065f532120ce631a75.tar.gz mpd-f8f3bc89e788faf8eea979065f532120ce631a75.tar.xz mpd-f8f3bc89e788faf8eea979065f532120ce631a75.zip | |
input/curl: pass input_curl to fill_buffer()
Remove a cast.
| -rw-r--r-- | src/input/curl_input_plugin.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/input/curl_input_plugin.c b/src/input/curl_input_plugin.c index 8307b00be..c3256103d 100644 --- a/src/input/curl_input_plugin.c +++ b/src/input/curl_input_plugin.c @@ -319,9 +319,8 @@ input_curl_select(struct input_curl *c, GError **error_r) } static bool -fill_buffer(struct input_stream *is, GError **error_r) +fill_buffer(struct input_curl *c, GError **error_r) { - struct input_curl *c = (struct input_curl *)is; CURLMcode mcode = CURLM_CALL_MULTI_PERFORM; while (!c->eof && g_queue_is_empty(c->buffers)) { @@ -343,7 +342,7 @@ fill_buffer(struct input_stream *is, GError **error_r) "curl_multi_perform() failed: %s", curl_multi_strerror(mcode)); c->eof = true; - is->ready = true; + c->base.ready = true; return false; } @@ -457,7 +456,7 @@ input_curl_read(struct input_stream *is, void *ptr, size_t size, do { /* fill the buffer */ - success = fill_buffer(is, error_r); + success = fill_buffer(c, error_r); if (!success) return 0; |