summaryrefslogtreecommitdiff
path: root/src/xine-engine
diff options
context:
space:
mode:
Diffstat (limited to 'src/xine-engine')
-rw-r--r--src/xine-engine/buffer_types.c2
-rw-r--r--src/xine-engine/configfile.c4
-rw-r--r--src/xine-engine/io_helper.c16
3 files changed, 14 insertions, 8 deletions
diff --git a/src/xine-engine/buffer_types.c b/src/xine-engine/buffer_types.c
index 55661c381..31ee4443a 100644
--- a/src/xine-engine/buffer_types.c
+++ b/src/xine-engine/buffer_types.c
@@ -1189,6 +1189,8 @@ static const audio_db_t audio_db[] = {
},
{
{
+ ME_FOURCC('E', 'A', 'C', '3'),
+ ME_FOURCC('e', 'c', '-', '3'),
0
},
BUF_AUDIO_EAC3,
diff --git a/src/xine-engine/configfile.c b/src/xine-engine/configfile.c
index 0eada28b4..924fbe02a 100644
--- a/src/xine-engine/configfile.c
+++ b/src/xine-engine/configfile.c
@@ -1035,7 +1035,9 @@ void xine_config_save (xine_t *xine, const char *filename) {
buf = (char *) malloc(config_stat.st_size + 1);
if((rlen = fread(buf, 1, config_stat.st_size, f_config)) && ((off_t)rlen == config_stat.st_size)) {
- (void) fwrite(buf, 1, rlen, f_backup);
+ if (rlen != fwrite(buf, 1, rlen, f_backup)) {
+ lprintf("backing up configfile to %s failed\n", temp);
+ }
}
free(buf);
diff --git a/src/xine-engine/io_helper.c b/src/xine-engine/io_helper.c
index 399cb25a4..1336fc790 100644
--- a/src/xine-engine/io_helper.c
+++ b/src/xine-engine/io_helper.c
@@ -87,17 +87,19 @@ static int _x_io_tcp_connect_ipv4(xine_stream_t *stream, const char *host, int p
for (i = 0; h->h_addr_list[i]; i++) {
struct in_addr ia;
- struct sockaddr_in sin;
-
+ union {
+ struct sockaddr sa;
+ struct sockaddr_in in;
+ } saddr;
memcpy (&ia, h->h_addr_list[i], 4);
- sin.sin_family = AF_INET;
- sin.sin_addr = ia;
- sin.sin_port = htons(port);
+ saddr.in.sin_family = AF_INET;
+ saddr.in.sin_addr = ia;
+ saddr.in.sin_port = htons(port);
#ifndef WIN32
- if (connect(s, (struct sockaddr *)&sin, sizeof(sin))==-1 && errno != EINPROGRESS) {
+ if (connect(s, &saddr.sa, sizeof(saddr.in))==-1 && errno != EINPROGRESS) {
#else
- if (connect(s, (struct sockaddr *)&sin, sizeof(sin))==-1 && WSAGetLastError() != WSAEWOULDBLOCK) {
+ if (connect(s, &saddr.sa, sizeof(saddr.in))==-1 && WSAGetLastError() != WSAEWOULDBLOCK) {
if (stream)
xprintf(stream->xine, XINE_VERBOSITY_DEBUG, "io_helper: WSAGetLastError() = %d\n", WSAGetLastError());
#endif /* WIN32 */