From d53222b72961aade08fb12b4ac1ed00f9268c67d Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Mon, 24 Dec 2007 17:07:09 +0000 Subject: =?UTF-8?q?Spelling=20correction:=20successfuly=20=E2=86=92=20succ?= =?UTF-8?q?essfully.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/input/input_cdda.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/input/input_cdda.c') diff --git a/src/input/input_cdda.c b/src/input/input_cdda.c index 5f830a1d3..fd4dd1fa9 100644 --- a/src/input/input_cdda.c +++ b/src/input/input_cdda.c @@ -1660,7 +1660,7 @@ static int _cdda_cddb_retrieve(cdda_input_plugin_t *this) { this->cddb.fd = _cdda_cddb_socket_open(this); if(this->cddb.fd >= 0) { xprintf(this->stream->xine, XINE_VERBOSITY_LOG, - _("input_cdda: successfuly connected to cddb server '%s:%d'.\n"), + _("input_cdda: successfully connected to cddb server '%s:%d'.\n"), this->cddb.server, this->cddb.port); } else { -- cgit v1.2.3 From 97f3b7e5520f6258e98af3090d8ef384e945b3cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Wed, 2 Jan 2008 19:06:42 +0100 Subject: Update the network interfaces to accept constant strings where possible. --- src/input/input_cdda.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/input/input_cdda.c') diff --git a/src/input/input_cdda.c b/src/input/input_cdda.c index 3cad27bbe..79a8e93bd 100644 --- a/src/input/input_cdda.c +++ b/src/input/input_cdda.c @@ -987,7 +987,7 @@ static int parse_url (char *urlbuf, char** host, int *port) { #endif static int XINE_FORMAT_PRINTF(4, 5) -network_command( xine_stream_t *stream, int socket, char *data_buf, char *msg, ...) +network_command( xine_stream_t *stream, int socket, char *data_buf, const char *msg, ...) { char buf[_BUFSIZ]; va_list args; @@ -1036,13 +1036,13 @@ network_command( xine_stream_t *stream, int socket, char *data_buf, char *msg, . #ifndef WIN32 -static int network_connect(xine_stream_t *stream, char *url ) +static int network_connect(xine_stream_t *stream, const char *_url ) { char *host; int port; int fd; - url = strdup(url); + char *url = strdup(_url); parse_url(url, &host, &port); if( !host || !strlen(host) || !port ) -- cgit v1.2.3 From 2cfcd373e9fbbf043c616a11d86a318488026f9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Wed, 2 Jan 2008 19:08:12 +0100 Subject: Make network_command accept a generic data buffer. --- src/input/input_cdda.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/input/input_cdda.c') diff --git a/src/input/input_cdda.c b/src/input/input_cdda.c index 79a8e93bd..9ba248216 100644 --- a/src/input/input_cdda.c +++ b/src/input/input_cdda.c @@ -987,7 +987,7 @@ static int parse_url (char *urlbuf, char** host, int *port) { #endif static int XINE_FORMAT_PRINTF(4, 5) -network_command( xine_stream_t *stream, int socket, char *data_buf, const char *msg, ...) +network_command( xine_stream_t *stream, int socket, void *data_buf, const char *msg, ...) { char buf[_BUFSIZ]; va_list args; -- cgit v1.2.3 From 361dee4647591e47bbe6a8efcefb06fbc1e8314f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Wed, 2 Jan 2008 19:10:04 +0100 Subject: Remove stray return 0. --- src/input/input_cdda.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/input/input_cdda.c') diff --git a/src/input/input_cdda.c b/src/input/input_cdda.c index 9ba248216..f8819f9f4 100644 --- a/src/input/input_cdda.c +++ b/src/input/input_cdda.c @@ -1304,8 +1304,6 @@ static void _cdda_mkdir_recursive_safe (xine_t *xine, char *path) if (p) *p = '/'; } while (p); - - return 0; } /* -- cgit v1.2.3