36 lines
1.6 KiB
Plaintext
36 lines
1.6 KiB
Plaintext
$OpenBSD: patch-src_input_input_file_c,v 1.6 2010/03/21 01:41:15 sthen Exp $
|
|
--- src/input/input_file.c.orig Tue Feb 23 20:55:09 2010
|
|
+++ src/input/input_file.c Sat Mar 6 15:12:08 2010
|
|
@@ -210,7 +210,7 @@ static buf_element_t *file_plugin_read_block (input_pl
|
|
xine_log (this->stream->xine, XINE_LOG_MSG,
|
|
_("input_file: read error (%s)\n"), strerror(errno));
|
|
_x_message(this->stream, XINE_MSG_READ_ERROR,
|
|
- this->mrl, NULL);
|
|
+ this->mrl, (char *)NULL);
|
|
}
|
|
buf->free_buffer (buf);
|
|
buf = NULL;
|
|
@@ -366,11 +366,11 @@ static int file_plugin_open (input_plugin_t *this_gen
|
|
|
|
if (this->fh == -1) {
|
|
if (errno == EACCES) {
|
|
- _x_message(this->stream, XINE_MSG_PERMISSION_ERROR, this->mrl, NULL);
|
|
+ _x_message(this->stream, XINE_MSG_PERMISSION_ERROR, this->mrl, (char *)NULL);
|
|
xine_log (this->stream->xine, XINE_LOG_MSG,
|
|
_("input_file: Permission denied: >%s<\n"), this->mrl);
|
|
} else if (errno == ENOENT) {
|
|
- _x_message(this->stream, XINE_MSG_FILE_NOT_FOUND, this->mrl, NULL);
|
|
+ _x_message(this->stream, XINE_MSG_FILE_NOT_FOUND, this->mrl, (char *)NULL);
|
|
xine_log (this->stream->xine, XINE_LOG_MSG,
|
|
_("input_file: File not found: >%s<\n"), this->mrl);
|
|
}
|
|
@@ -407,7 +407,7 @@ static int file_plugin_open (input_plugin_t *this_gen
|
|
#endif
|
|
|
|
if (file_plugin_get_length (this_gen) == 0) {
|
|
- _x_message(this->stream, XINE_MSG_FILE_EMPTY, this->mrl, NULL);
|
|
+ _x_message(this->stream, XINE_MSG_FILE_EMPTY, this->mrl, (char *)NULL);
|
|
close (this->fh);
|
|
this->fh = -1;
|
|
xine_log (this->stream->xine, XINE_LOG_MSG,
|