remove casts now that NULL is a void *

from Brad.
This commit is contained in:
sthen 2011-04-15 23:22:31 +00:00
parent 85f74973d4
commit 2f6c635f99
17 changed files with 7 additions and 476 deletions

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.73 2011/03/26 10:05:24 sthen Exp $
# $OpenBSD: Makefile,v 1.74 2011/04/15 23:22:31 sthen Exp $
SHARED_ONLY= Yes
COMMENT= multimedia decoding library
DISTNAME= xine-lib-1.1.19
REVISION= 3
REVISION= 4
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xine/}
EXTRACT_SUFX= .tar.bz2

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_demuxers_demux_asf_c,v 1.5 2008/08/20 01:54:01 brad Exp $
--- src/demuxers/demux_asf.c.orig Thu Aug 7 13:52:44 2008
+++ src/demuxers/demux_asf.c Thu Aug 14 18:48:39 2008
@@ -460,7 +460,7 @@ static int asf_read_header (demux_asf_t *this) {
xine_log(this->stream->xine, XINE_LOG_MSG,
_("demux_asf: warning: The stream id=%d is encrypted.\n"), asf_stream->stream_number);
_x_message(this->stream, XINE_MSG_ENCRYPTED_SOURCE,
- _("Media stream scrambled/encrypted"), NULL);
+ _("Media stream scrambled/encrypted"), (char *)NULL);
this->mode = ASF_MODE_ENCRYPTED_CONTENT;
}
}

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_demuxers_demux_mpeg_block_c,v 1.3 2010/01/05 11:48:51 sthen Exp $
--- src/demuxers/demux_mpeg_block.c.orig Mon Nov 30 15:55:56 2009
+++ src/demuxers/demux_mpeg_block.c Wed Dec 2 19:15:35 2009
@@ -644,7 +644,7 @@ static int32_t parse_pes_for_pts(demux_mpeg_block_t *t
_("demux_mpeg_block: warning: PES header indicates that this stream "
"may be encrypted (encryption mode %d)\n"), (p[6] & 0x30) >> 4);
_x_message (this->stream, XINE_MSG_ENCRYPTED_SOURCE,
- "Media stream scrambled/encrypted", NULL);
+ "Media stream scrambled/encrypted", (char *)NULL);
this->status = DEMUX_FINISHED;
buf->free_buffer(buf);
return -1;

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_demuxers_demux_mpeg_pes_c,v 1.4 2009/02/02 22:00:42 sthen Exp $
--- src/demuxers/demux_mpeg_pes.c.orig Wed Jan 7 11:14:32 2009
+++ src/demuxers/demux_mpeg_pes.c Thu Jan 8 01:02:34 2009
@@ -814,7 +814,7 @@ static int32_t parse_pes_for_pts(demux_mpeg_pes_t *thi
_("demux_mpeg_pes: warning: PES header indicates that "
"this stream may be encrypted (encryption mode %d)\n"), (p[6] & 0x30) >> 4);
_x_message (this->stream, XINE_MSG_ENCRYPTED_SOURCE,
- "Media stream scrambled/encrypted", NULL);
+ "Media stream scrambled/encrypted", (char *)NULL);
this->status = DEMUX_FINISHED;
buf->free_buffer(buf);
return -1;

View File

@ -1,15 +1,6 @@
$OpenBSD: patch-src_demuxers_demux_qt_c,v 1.11 2010/10/15 14:13:03 dcoppa Exp $
--- src/demuxers/demux_qt.c.orig Sun Jul 25 00:21:31 2010
+++ src/demuxers/demux_qt.c Fri Oct 15 15:50:29 2010
@@ -3184,7 +3184,7 @@ static demux_plugin_t *open_plugin (demux_class_t *cla
/* special consideration for DRM-protected files */
if (this->qt->last_error == QT_DRM_NOT_SUPPORTED)
_x_message (this->stream, XINE_MSG_ENCRYPTED_SOURCE,
- "DRM-protected Quicktime file", NULL);
+ "DRM-protected Quicktime file", (char *)NULL);
} else if (last_error != QT_OK) {
$OpenBSD: patch-src_demuxers_demux_qt_c,v 1.12 2011/04/15 23:22:31 sthen Exp $
--- src/demuxers/demux_qt.c.orig Sat Jul 24 18:21:31 2010
+++ src/demuxers/demux_qt.c Fri Apr 15 17:46:25 2011
@@ -3255,7 +3255,7 @@ static const char *get_identifier (demux_class_t *this
}

View File

@ -1,21 +0,0 @@
$OpenBSD: patch-src_input_input_dvb_c,v 1.9 2010/01/05 11:48:51 sthen Exp $
--- src/input/input_dvb.c.orig Mon Nov 30 15:55:45 2009
+++ src/input/input_dvb.c Wed Dec 2 20:34:56 2009
@@ -903,7 +903,7 @@ static channel_t *load_channels(xine_t *xine, xine_str
if (!f) {
xprintf(xine, XINE_VERBOSITY_LOG, _("input_dvb: failed to open dvb channel file '%s': %s\n"), filename, strerror (errno));
if (!f && stream)
- _x_message(stream, XINE_MSG_FILE_NOT_FOUND, filename, "Please run the dvbscan utility.", NULL);
+ _x_message(stream, XINE_MSG_FILE_NOT_FOUND, filename, "Please run the dvbscan utility.", (char *)NULL);
return NULL;
}
if (fstat(fileno(f), &st) || !S_ISREG (st.st_mode)) {
@@ -2585,7 +2585,7 @@ static off_t dvb_plugin_read (input_plugin_t *this_gen
/* no data for several seconds - tell the user a possible reason */
if(this->read_failcount==5){
- _x_message(this->stream,1,"DVB Signal Lost. Please check connections.", NULL);
+ _x_message(this->stream,1,"DVB Signal Lost. Please check connections.", (char *)NULL);
}
#ifdef DVB_NO_BUFFERING
if(this->newchannel){

View File

@ -1,21 +0,0 @@
$OpenBSD: patch-src_input_input_dvd_c,v 1.10 2010/09/13 20:12:16 sthen Exp $
--- src/input/input_dvd.c.orig Sat Jul 24 18:09:09 2010
+++ src/input/input_dvd.c Sun Jul 25 14:34:53 2010
@@ -614,7 +614,7 @@ static buf_element_t *dvd_plugin_read_block (input_plu
xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
_("input_dvd: Error getting next block from DVD (%s)\n"), dvdnav_err_to_string(this->dvdnav));
_x_message(this->stream, XINE_MSG_READ_ERROR,
- dvdnav_err_to_string(this->dvdnav), NULL);
+ dvdnav_err_to_string(this->dvdnav), (char *)NULL);
if (block != buf->mem) dvdnav_free_cache_block(this->dvdnav, block);
buf->free_buffer(buf);
return NULL;
@@ -1505,7 +1505,7 @@ static int dvd_plugin_open (input_plugin_t *this_gen)
xprintf(this->stream->xine, XINE_VERBOSITY_LOG, _("input_dvd: Error opening DVD device\n"));
_x_message(this->stream, XINE_MSG_READ_ERROR,
/* FIXME: see FIXME in dvd_parse_try_open() */
- (strlen(locator) && !(locator[0] == '/' && locator[1] == '\0')) ? locator : class->dvd_device, NULL);
+ (strlen(locator) && !(locator[0] == '/' && locator[1] == '\0')) ? locator : class->dvd_device, (char *)NULL);
free (locator_orig);
return 0;
}

View File

@ -1,35 +0,0 @@
$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,

View File

@ -1,99 +0,0 @@
$OpenBSD: patch-src_input_input_http_c,v 1.8 2010/01/05 11:48:51 sthen Exp $
--- src/input/input_http.c.orig Mon Nov 30 15:55:44 2009
+++ src/input/input_http.c Wed Dec 2 20:36:12 2009
@@ -411,7 +411,7 @@ static off_t http_plugin_read_int (http_input_plugin_t
error:
if (!_x_action_pending(this->stream))
- _x_message (this->stream, XINE_MSG_READ_ERROR, this->host, NULL);
+ _x_message (this->stream, XINE_MSG_READ_ERROR, this->host, (char *)NULL);
xine_log (this->stream->xine, XINE_LOG_MSG, _("input_http: read error %d\n"), errno);
return read_bytes;
}
@@ -683,7 +683,7 @@ static int http_plugin_open (input_plugin_t *this_gen
if (http_plugin_basicauth (this_class->proxyuser,
this_class->proxypassword,
this->proxyauth, BUFSIZE)) {
- _x_message(this->stream, XINE_MSG_CONNECTION_REFUSED, "proxy error", NULL);
+ _x_message(this->stream, XINE_MSG_CONNECTION_REFUSED, "proxy error", (char *)NULL);
return 0;
}
}
@@ -693,7 +693,7 @@ static int http_plugin_open (input_plugin_t *this_gen
if (!_x_parse_url(this->mrl, &this->proto, &this->host, &this->port,
&this->user, &this->password, &this->uri,
&this->user_agent)) {
- _x_message(this->stream, XINE_MSG_GENERAL_WARNING, "malformed url", NULL);
+ _x_message(this->stream, XINE_MSG_GENERAL_WARNING, "malformed url", (char *)NULL);
return 0;
}
use_proxy = use_proxy && _x_use_proxy(this_class, this->host);
@@ -703,7 +703,7 @@ static int http_plugin_open (input_plugin_t *this_gen
if (this->user && strlen(this->user)) {
if (http_plugin_basicauth (this->user, this->password, this->auth, BUFSIZE)) {
- _x_message(this->stream, XINE_MSG_CONNECTION_REFUSED, "basic auth error", NULL);
+ _x_message(this->stream, XINE_MSG_CONNECTION_REFUSED, "basic auth error", (char *)NULL);
return -1;
}
}
@@ -757,7 +757,7 @@ static int http_plugin_open (input_plugin_t *this_gen
} while ((res == XIO_TIMEOUT) && (progress <= 100000));
if (res != XIO_READY) {
- _x_message(this->stream, XINE_MSG_NETWORK_UNREACHABLE, this->mrl, NULL);
+ _x_message(this->stream, XINE_MSG_NETWORK_UNREACHABLE, this->mrl, (char *)NULL);
return -3;
}
}
@@ -799,7 +799,7 @@ static int http_plugin_open (input_plugin_t *this_gen
this->user_agent ? " " : "",
VERSION);
if (_x_io_tcp_write (this->stream, this->fh, this->buf, buflen) != buflen) {
- _x_message(this->stream, XINE_MSG_CONNECTION_REFUSED, "couldn't send request", NULL);
+ _x_message(this->stream, XINE_MSG_CONNECTION_REFUSED, "couldn't send request", (char *)NULL);
xprintf(this_class->xine, XINE_VERBOSITY_DEBUG, "input_http: couldn't send request\n");
return -4;
}
@@ -843,7 +843,7 @@ static int http_plugin_open (input_plugin_t *this_gen
(sscanf(this->buf, "ICY %d %50[^\015\012]", /* icecast 1 ? */
&httpcode, httpstatus) != 2)
) {
- _x_message(this->stream, XINE_MSG_CONNECTION_REFUSED, "invalid http answer", NULL);
+ _x_message(this->stream, XINE_MSG_CONNECTION_REFUSED, "invalid http answer", (char *)NULL);
xine_log (this->stream->xine, XINE_LOG_MSG,
_("input_http: invalid http answer\n"));
return -6;
@@ -854,20 +854,20 @@ static int http_plugin_open (input_plugin_t *this_gen
_("input_http: 3xx redirection: >%d %s<\n"),
httpcode, httpstatus);
} else if (httpcode == 404) {
- _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_http: http status not 2xx: >%d %s<\n"),
httpcode, httpstatus);
return -7;
} else if (httpcode == 403 || httpcode == 401) {
- _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_http: http status not 2xx: >%d %s<\n"),
httpcode, httpstatus);
return -8;
} else if (httpcode < 200 || httpcode >= 300) {
_x_message(this->stream, XINE_MSG_CONNECTION_REFUSED, "http status not 2xx: ",
- httpstatus, NULL);
+ httpstatus, (char *)NULL);
xine_log (this->stream->xine, XINE_LOG_MSG,
_("input_http: http status not 2xx: >%d %s<\n"),
httpcode, httpstatus);
@@ -964,7 +964,7 @@ static int http_plugin_open (input_plugin_t *this_gen
} else
len ++;
if ( len >= BUFSIZE ) {
- _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_http: buffer exhausted after %d bytes."), BUFSIZE);
return -10;

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_input_input_net_c,v 1.4 2010/01/05 11:48:51 sthen Exp $
--- src/input/input_net.c.orig Mon Nov 30 15:55:45 2009
+++ src/input/input_net.c Wed Dec 2 19:15:35 2009
@@ -275,7 +275,7 @@ static off_t net_plugin_read (input_plugin_t *this_gen
xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, "input_net: got %" PRIdMAX " bytes (%" PRIdMAX "/%" PRIdMAX " bytes read)\n", (intmax_t)n, (intmax_t)total, (intmax_t)len);
if (n < 0) {
- _x_message(this->stream, XINE_MSG_READ_ERROR, this->host_port, NULL);
+ _x_message(this->stream, XINE_MSG_READ_ERROR, this->host_port, (char *)NULL);
return 0;
}

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_input_input_stdin_fifo_c,v 1.4 2010/01/05 11:48:51 sthen Exp $
--- src/input/input_stdin_fifo.c.orig Mon Nov 30 15:55:44 2009
+++ src/input/input_stdin_fifo.c Wed Dec 2 19:15:35 2009
@@ -106,7 +106,7 @@ static off_t stdin_plugin_read (input_plugin_t *this_g
lprintf ("got %"PRId64" bytes (%"PRId64"/%"PRId64" bytes read)\n", n,total,len);
if (n < 0) {
- _x_message(this->stream, XINE_MSG_READ_ERROR, NULL);
+ _x_message(this->stream, XINE_MSG_READ_ERROR, (char *)NULL);
return 0;
}

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_input_media_helper_c,v 1.3 2007/06/13 10:58:29 jakemsr Exp $
--- src/input/media_helper.c.orig Thu Mar 29 15:44:56 2007
+++ src/input/media_helper.c Sun May 20 22:40:02 2007
@@ -59,7 +59,7 @@ static int media_umount_media(const char *device)
pid=fork();
if (pid == 0) {
- execl("/bin/umount", "umount", device, NULL);
+ execl("/bin/umount", "umount", device, (char *)NULL);
exit(127);
}
do {

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_libreal_real_common_c,v 1.3 2010/01/05 11:48:51 sthen Exp $
--- src/libreal/real_common.c.orig Mon Nov 30 15:55:53 2009
+++ src/libreal/real_common.c Wed Dec 2 20:39:44 2009
@@ -177,7 +177,7 @@ void *_x_real_codec_open(xine_stream_t *const stream,
LOG_MODULE ": error loading %s: %s\n", codecpath, dlerror());
}
- _x_message(stream, XINE_MSG_LIBRARY_LOAD_ERROR, codec_name, NULL);
+ _x_message(stream, XINE_MSG_LIBRARY_LOAD_ERROR, codec_name, (char *)NULL);
return NULL;
}

View File

@ -1,48 +0,0 @@
$OpenBSD: patch-src_xine-engine_audio_out_c,v 1.12 2010/09/13 20:12:16 sthen Exp $
--- src/xine-engine/audio_out.c.orig Wed Jul 21 13:43:52 2010
+++ src/xine-engine/audio_out.c Sun Jul 25 14:37:08 2010
@@ -1089,7 +1089,7 @@ static void *ao_loop (void *this_gen) {
in_buf->format.rate,
in_buf->format.mode) == 0 ) {
in_buf->stream->emergency_brake = 1;
- _x_message (in_buf->stream, XINE_MSG_AUDIO_OUT_UNAVAILABLE, NULL);
+ _x_message (in_buf->stream, XINE_MSG_AUDIO_OUT_UNAVAILABLE, (char *)NULL);
}
}
}
@@ -1120,7 +1120,7 @@ static void *ao_loop (void *this_gen) {
stream = xine_list_get_value (this->streams, ite);
if( !stream->emergency_brake ) {
stream->emergency_brake = 1;
- _x_message (stream, XINE_MSG_AUDIO_OUT_UNAVAILABLE, NULL);
+ _x_message (stream, XINE_MSG_AUDIO_OUT_UNAVAILABLE, (char *)NULL);
}
}
pthread_mutex_unlock(&this->streams_lock);
@@ -1252,7 +1252,7 @@ static void *ao_loop (void *this_gen) {
if( result < 0 ) {
/* device unplugged. */
xprintf(this->xine, XINE_VERBOSITY_LOG, _("write to sound card failed. Assuming the device was unplugged.\n"));
- _x_message (in_buf->stream, XINE_MSG_AUDIO_OUT_UNAVAILABLE, NULL);
+ _x_message (in_buf->stream, XINE_MSG_AUDIO_OUT_UNAVAILABLE, (char *)NULL);
pthread_mutex_lock( &this->driver_lock );
if(this->driver_open) {
@@ -1266,7 +1266,7 @@ static void *ao_loop (void *this_gen) {
in_buf->format.rate,
in_buf->format.mode) == 0) {
in_buf->stream->emergency_brake = 1;
- _x_message (in_buf->stream, XINE_MSG_AUDIO_OUT_UNAVAILABLE, NULL);
+ _x_message (in_buf->stream, XINE_MSG_AUDIO_OUT_UNAVAILABLE, (char *)NULL);
}
}
pthread_mutex_unlock( &this->driver_lock );
@@ -1514,7 +1514,7 @@ static int ao_open(xine_audio_port_t *this_gen, xine_s
if( !ret ) {
stream->emergency_brake = 1;
- _x_message (stream, XINE_MSG_AUDIO_OUT_UNAVAILABLE, NULL);
+ _x_message (stream, XINE_MSG_AUDIO_OUT_UNAVAILABLE, (char *)NULL);
return 0;
}
} else {

View File

@ -1,21 +0,0 @@
$OpenBSD: patch-src_xine-engine_input_rip_c,v 1.4 2010/01/05 11:48:51 sthen Exp $
--- src/xine-engine/input_rip.c.orig Mon Nov 30 15:55:52 2009
+++ src/xine-engine/input_rip.c Wed Dec 2 19:15:36 2009
@@ -565,7 +565,7 @@ input_plugin_t *_x_rip_plugin_get_instance (xine_strea
xine_log(stream->xine, XINE_LOG_MSG,
_("input_rip: target directory wasn't specified, please fill out the option 'media.capture.save_dir'\n"));
_x_message(stream, XINE_MSG_SECURITY,
- _("The stream save feature is disabled until you set media.capture.save_dir in the configuration."), NULL);
+ _("The stream save feature is disabled until you set media.capture.save_dir in the configuration."), (char *)NULL);
return NULL;
}
@@ -574,7 +574,7 @@ input_plugin_t *_x_rip_plugin_get_instance (xine_strea
xine_log(stream->xine, XINE_LOG_MSG,
_("input_rip: ripping/caching of this source is not permitted!\n"));
_x_message(stream, XINE_MSG_SECURITY,
- _("xine is not allowed to save from this source. (possibly copyrighted material?)"), NULL);
+ _("xine is not allowed to save from this source. (possibly copyrighted material?)"), (char *)NULL);
return NULL;
}
#endif

View File

@ -1,122 +0,0 @@
$OpenBSD: patch-src_xine-engine_io_helper_c,v 1.2 2010/01/05 11:48:51 sthen Exp $
--- src/xine-engine/io_helper.c.orig Mon Nov 30 15:55:52 2009
+++ src/xine-engine/io_helper.c Wed Dec 2 20:37:52 2009
@@ -56,19 +56,19 @@ static int _x_io_tcp_connect_ipv4(xine_stream_t *strea
h = gethostbyname(host);
if (h == NULL) {
- _x_message(stream, XINE_MSG_UNKNOWN_HOST, "unable to resolve", host, NULL);
+ _x_message(stream, XINE_MSG_UNKNOWN_HOST, "unable to resolve", host, (char *)NULL);
return -1;
}
s = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
if (s == -1) {
- _x_message(stream, XINE_MSG_CONNECTION_REFUSED, "failed to create socket", strerror(errno), NULL);
+ _x_message(stream, XINE_MSG_CONNECTION_REFUSED, "failed to create socket", strerror(errno), (char *)NULL);
return -1;
}
#ifndef WIN32
if (fcntl (s, F_SETFL, fcntl (s, F_GETFL) | O_NONBLOCK) == -1) {
- _x_message(stream, XINE_MSG_CONNECTION_REFUSED, "can't put socket in non-blocking mode", strerror(errno), NULL);
+ _x_message(stream, XINE_MSG_CONNECTION_REFUSED, "can't put socket in non-blocking mode", strerror(errno), (char *)NULL);
return -1;
}
#else
@@ -79,7 +79,7 @@ static int _x_io_tcp_connect_ipv4(xine_stream_t *strea
rc = ioctlsocket(s, FIONBIO, &non_block);
if (rc == SOCKET_ERROR) {
- _x_message(stream, XINE_MSG_CONNECTION_REFUSED, "can't put socket in non-blocking mode", strerror(errno), NULL);
+ _x_message(stream, XINE_MSG_CONNECTION_REFUSED, "can't put socket in non-blocking mode", strerror(errno), (char *)NULL);
return -1;
}
}
@@ -102,7 +102,7 @@ static int _x_io_tcp_connect_ipv4(xine_stream_t *strea
xprintf(stream->xine, XINE_VERBOSITY_DEBUG, "io_helper: WSAGetLastError() = %d\n", WSAGetLastError());
#endif /* WIN32 */
- _x_message(stream, XINE_MSG_CONNECTION_REFUSED, strerror(errno), NULL);
+ _x_message(stream, XINE_MSG_CONNECTION_REFUSED, strerror(errno), (char *)NULL);
close(s);
continue;
}
@@ -136,7 +136,7 @@ int _x_io_tcp_connect(xine_stream_t *stream, const cha
if (error) {
_x_message(stream, XINE_MSG_UNKNOWN_HOST,
- "unable to resolve", host, NULL);
+ "unable to resolve", host, (char *)NULL);
return -1;
}
@@ -147,7 +147,7 @@ int _x_io_tcp_connect(xine_stream_t *stream, const cha
s = socket(tmpaddr->ai_family, SOCK_STREAM, IPPROTO_TCP);
if (s == -1) {
_x_message(stream, XINE_MSG_CONNECTION_REFUSED,
- "failed to create socket", strerror(errno), NULL);
+ "failed to create socket", strerror(errno), (char *)NULL);
tmpaddr = tmpaddr->ai_next;
continue;
}
@@ -160,7 +160,7 @@ int _x_io_tcp_connect(xine_stream_t *stream, const cha
if ( ! tmpaddr->ai_next ) {
#ifndef WIN32
if (fcntl (s, F_SETFL, fcntl (s, F_GETFL) | O_NONBLOCK) == -1) {
- _x_message(stream, XINE_MSG_CONNECTION_REFUSED, "can't put socket in non-blocking mode", strerror(errno), NULL);
+ _x_message(stream, XINE_MSG_CONNECTION_REFUSED, "can't put socket in non-blocking mode", strerror(errno), (char *)NULL);
return -1;
}
#else
@@ -170,7 +170,7 @@ int _x_io_tcp_connect(xine_stream_t *stream, const cha
rc = ioctlsocket(s, FIONBIO, &non_block);
if (rc == SOCKET_ERROR) {
- _x_message(stream, XINE_MSG_CONNECTION_REFUSED, "can't put socket in non-blocking mode", strerror(errno), NULL);
+ _x_message(stream, XINE_MSG_CONNECTION_REFUSED, "can't put socket in non-blocking mode", strerror(errno), (char *)NULL);
return -1;
}
#endif
@@ -200,7 +200,7 @@ int _x_io_tcp_connect(xine_stream_t *stream, const cha
tmpaddr = tmpaddr->ai_next;
}
- _x_message(stream, XINE_MSG_CONNECTION_REFUSED, strerror(error), NULL);
+ _x_message(stream, XINE_MSG_CONNECTION_REFUSED, strerror(error), (char *)NULL);
return -1;
#endif
@@ -311,11 +311,11 @@ int _x_io_tcp_connect_finish(xine_stream_t *stream, in
int err;
if ((getsockopt(fd, SOL_SOCKET, SO_ERROR, (void *)&err, &len)) == -1) {
- _x_message(stream, XINE_MSG_CONNECTION_REFUSED, _("failed to get status of socket"), strerror(errno), NULL);
+ _x_message(stream, XINE_MSG_CONNECTION_REFUSED, _("failed to get status of socket"), strerror(errno), (char *)NULL);
return XIO_ERROR;
}
if (err) {
- _x_message(stream, XINE_MSG_CONNECTION_REFUSED, strerror(errno), NULL);
+ _x_message(stream, XINE_MSG_CONNECTION_REFUSED, strerror(errno), (char *)NULL);
return XIO_ERROR;
}
}
@@ -383,15 +383,15 @@ static off_t xio_rw_abort(xine_stream_t *stream, int f
continue;
if (errno == EACCES) {
- _x_message(stream, XINE_MSG_PERMISSION_ERROR, NULL, NULL);
+ _x_message(stream, XINE_MSG_PERMISSION_ERROR, NULL, (char *)NULL);
xine_log (stream->xine, XINE_LOG_MSG,
_("io_helper: Permission denied\n"));
} else if (errno == ENOENT) {
- _x_message(stream, XINE_MSG_FILE_NOT_FOUND, NULL, NULL);
+ _x_message(stream, XINE_MSG_FILE_NOT_FOUND, NULL, (char *)NULL);
xine_log (stream->xine, XINE_LOG_MSG,
_("io_helper: File not found\n"));
} else if (errno == ECONNREFUSED) {
- _x_message(stream, XINE_MSG_CONNECTION_REFUSED, NULL, NULL);
+ _x_message(stream, XINE_MSG_CONNECTION_REFUSED, NULL, (char *)NULL);
xine_log (stream->xine, XINE_LOG_MSG,
_("io_helper: Connection Refused\n"));
} else {

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_xine-engine_xine_c,v 1.11 2010/11/22 11:15:55 sthen Exp $
$OpenBSD: patch-src_xine-engine_xine_c,v 1.12 2011/04/15 23:22:31 sthen Exp $
--- src/xine-engine/xine.c.orig Thu Apr 29 12:55:02 2010
+++ src/xine-engine/xine.c Sat Nov 13 13:31:08 2010
+++ src/xine-engine/xine.c Fri Apr 15 17:49:16 2011
@@ -1561,6 +1561,8 @@ void xine_exit (xine_t *this) {
if(this->port_ticket)
this->port_ticket->dispose(this->port_ticket);
@ -18,15 +18,6 @@ $OpenBSD: patch-src_xine-engine_xine_c,v 1.11 2010/11/22 11:15:55 sthen Exp $
#ifdef WIN32
@@ -1679,7 +1682,7 @@ static void config_save_cb (void *this_gen, xine_cfg_e
pthread_mutex_lock(&this->streams_lock);
if ( (ite = xine_list_front(this->streams)) ) {
stream = xine_list_get_value(this->streams, ite);
- _x_message(stream, XINE_MSG_SECURITY, _("The specified save_dir might be a security risk."), NULL);
+ _x_message(stream, XINE_MSG_SECURITY, _("The specified save_dir might be a security risk."), (char *)NULL);
}
pthread_mutex_unlock(&this->streams_lock);
}
@@ -1696,7 +1699,6 @@ void xine_init (xine_t *this) {
* locks
*/