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

input_stream: return errors with GError

Browse Source
This commit is contained in:
Max Kellermann
2009-11-14 23:53:04 +01:00
parent d000d31355
commit 228b03edf8
36 changed files with 422 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/decoder_api.c
View File

@@ -154,6 +154,7 @@ size_t decoder_read(struct decoder *decoder,
{
const struct decoder_control *dc =
decoder != NULL ? decoder->dc : NULL;
GError *error = NULL;
size_t nbytes;
assert(decoder == NULL ||
@@ -176,7 +177,14 @@ size_t decoder_read(struct decoder *decoder,
dc->command != DECODE_COMMAND_NONE)
return 0;
nbytes = input_stream_read(is, buffer, length);
nbytes = input_stream_read(is, buffer, length, &error);
if (G_UNLIKELY(nbytes == 0 && error != NULL)) {
g_warning("%s", error->message);
g_error_free(error);
return 0;
}
if (nbytes > 0 || input_stream_eof(is))
return nbytes;