Commit 464b6117 authored by Max Kellermann's avatar Max Kellermann

input_stream: input_stream_close() returns void

close() shouldn't fail with read-only streams.
parent f08041f0
......@@ -235,11 +235,10 @@ input_curl_read(struct input_stream *is, void *ptr, size_t size)
return nbytes;
}
static int
static void
input_curl_close(struct input_stream *is)
{
input_curl_free(is);
return 0;
}
static int
......
......@@ -78,15 +78,10 @@ input_file_read(struct input_stream *is, void *ptr, size_t size)
return readSize;
}
static int
static void
input_file_close(struct input_stream *is)
{
if (fclose((FILE *) is->data) < 0) {
is->error = errno;
return -1;
}
return 0;
fclose((FILE *) is->data);
}
static int
......
......@@ -85,7 +85,7 @@ input_stream_read(struct input_stream *is, void *ptr, size_t size)
return is->plugin->read(is, ptr, size);
}
int input_stream_close(struct input_stream *is)
void input_stream_close(struct input_stream *is)
{
if (is->mime)
free(is->mime);
......@@ -94,7 +94,7 @@ int input_stream_close(struct input_stream *is)
if (is->meta_title)
free(is->meta_title);
return is->plugin->close(is);
is->plugin->close(is);
}
int input_stream_eof(struct input_stream *is)
......
......@@ -26,7 +26,7 @@ struct input_stream;
struct input_plugin {
bool (*open)(struct input_stream *is, const char *url);
int (*close)(struct input_stream *is);
void (*close)(struct input_stream *is);
int (*buffer)(struct input_stream *is);
size_t (*read)(struct input_stream *is, void *ptr, size_t size);
......@@ -58,7 +58,7 @@ void input_stream_global_finish(void);
for the input stream is set */
int input_stream_open(struct input_stream *is, char *url);
int input_stream_seek(struct input_stream *is, long offset, int whence);
int input_stream_close(struct input_stream *is);
void input_stream_close(struct input_stream *is);
int input_stream_eof(struct input_stream *is);
/* return value: -1 is error, 1 inidicates stuff was buffered, 0 means nothing
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment