summaryrefslogtreecommitdiff
path: root/src/input
diff options
context:
space:
mode:
Diffstat (limited to 'src/input')
-rw-r--r--src/input/input_gnome_vfs.c4
-rw-r--r--src/input/input_http.c14
-rw-r--r--src/input/input_net.c46
-rw-r--r--src/input/input_pnm.c3
-rw-r--r--src/input/input_stdin_fifo.c5
5 files changed, 38 insertions, 34 deletions
diff --git a/src/input/input_gnome_vfs.c b/src/input/input_gnome_vfs.c
index 4c7a61842..fe4efb5ba 100644
--- a/src/input/input_gnome_vfs.c
+++ b/src/input/input_gnome_vfs.c
@@ -18,7 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: input_gnome_vfs.c,v 1.21 2004/06/13 21:28:56 miguelfreitas Exp $
+ * $Id: input_gnome_vfs.c,v 1.22 2004/09/17 19:21:45 valtri Exp $
*/
@@ -223,7 +223,7 @@ static char
return _("gnome-vfs input plugin as shipped with xine");
}
-static char
+static const char
*gnomevfs_klass_get_identifier (input_class_t *this_gen)
{
return "gnomevfs";
diff --git a/src/input/input_http.c b/src/input/input_http.c
index 546e9813b..2ad0bcc4a 100644
--- a/src/input/input_http.c
+++ b/src/input/input_http.c
@@ -19,7 +19,7 @@
*
* input plugin for http network streams
*
- * $Id: input_http.c,v 1.95 2004/07/23 13:47:39 f1rmb Exp $
+ * $Id: input_http.c,v 1.96 2004/09/17 19:21:46 valtri Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -594,7 +594,8 @@ static off_t http_plugin_seek(input_plugin_t *this_gen, off_t offset, int origin
this->curpos = offset;
else
xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,
- "http: cannot seek back! (%lld > %lld)\n", this->curpos, offset);
+ "http: cannot seek back! (%" PRIiMAX " > %" PRIiMAX ")\n",
+ (intmax_t)this->curpos, (intmax_t)offset);
} else {
offset -= this->curpos;
@@ -872,12 +873,13 @@ static int http_plugin_open (input_plugin_t *this_gen ) {
}
} else {
if (this->contentlength == 0) {
- off_t contentlength;
+ intmax_t contentlength;
- if (sscanf(this->buf, "Content-Length: %Ld", &contentlength) == 1) {
+ if (sscanf(this->buf, "Content-Length: %" SCNdMAX , &contentlength) == 1) {
xine_log (this->stream->xine, XINE_LOG_MSG,
- _("input_http: content length = %Ld bytes\n"), contentlength);
- this->contentlength = contentlength;
+ _("input_http: content length = %" PRIiMAX " bytes\n"),
+ contentlength);
+ this->contentlength = (off_t)contentlength;
}
}
diff --git a/src/input/input_net.c b/src/input/input_net.c
index f44bb6d81..df0c6c499 100644
--- a/src/input/input_net.c
+++ b/src/input/input_net.c
@@ -20,7 +20,7 @@
* Read from a tcp network stream over a lan (put a tweaked mp1e encoder the
* other end and you can watch tv anywhere in the house ..)
*
- * $Id: input_net.c,v 1.59 2004/07/20 00:50:11 rockyb Exp $
+ * $Id: input_net.c,v 1.60 2004/09/17 19:21:46 valtri Exp $
*
* how to set up mp1e for use with this plugin:
*
@@ -119,8 +119,8 @@ static int host_connect_attempt_ipv4(struct in_addr ia, int port, xine_t *xine)
s = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
if (s==-1) {
- xine_log (xine, XINE_LOG_MSG,
- _("input_net: socket(): %s\n"), strerror(errno));
+ xine_log(xine, XINE_LOG_MSG,
+ _("input_net: socket(): %s\n"), strerror(errno));
return -1;
}
@@ -134,8 +134,8 @@ static int host_connect_attempt_ipv4(struct in_addr ia, int port, xine_t *xine)
if (connect(s, (struct sockaddr *)&sin, sizeof(sin))==-1 && WSAGetLastError() != WSAEINPROGRESS)
#endif
{
- xine_log (xine, XINE_LOG_MSG,
- _("input_net: connect(): %s\n"), strerror(errno));
+ xine_log(xine, XINE_LOG_MSG,
+ _("input_net: connect(): %s\n"), strerror(errno));
close(s);
return -1;
}
@@ -149,8 +149,8 @@ static int host_connect_attempt(int family, struct sockaddr* sin, int addrlen, x
s = socket(family, SOCK_STREAM, IPPROTO_TCP);
if (s==-1) {
- xine_log (xine, XINE_LOG_MSG,
- _("input_net: socket(): %s\n"), strerror(errno));
+ xine_log(xine, XINE_LOG_MSG,
+ _("input_net: socket(): %s\n"), strerror(errno));
return -1;
}
@@ -160,8 +160,8 @@ static int host_connect_attempt(int family, struct sockaddr* sin, int addrlen, x
if (connect(s, sin, addrlen)==-1 && WSAGetLastError() != WSAEINPROGRESS)
#endif
{
- xine_log (xine, XINE_LOG_MSG,
- _("input_net: connect(): %s\n"), strerror(errno));
+ xine_log(xine, XINE_LOG_MSG,
+ _("input_net: connect(): %s\n"), strerror(errno));
close(s);
return -1;
}
@@ -178,8 +178,8 @@ static int host_connect_ipv4(const char *host, int port, xine_t *xine) {
h = gethostbyname(host);
if (h==NULL) {
- xine_log (xine, XINE_LOG_MSG,
- _("input_net: unable to resolve '%s'.\n"), host);
+ xine_log(xine, XINE_LOG_MSG,
+ _("input_net: unable to resolve '%s'.\n"), host);
return -1;
}
@@ -191,8 +191,8 @@ static int host_connect_ipv4(const char *host, int port, xine_t *xine) {
return s;
}
- xine_log (xine, XINE_LOG_MSG,
- _("input_net: unable to connect to '%s'.\n"), host);
+ xine_log(xine, XINE_LOG_MSG,
+ _("input_net: unable to connect to '%s'.\n"), host);
return -1;
}
#endif
@@ -221,8 +221,8 @@ static int host_connect(const char *host, int port, xine_t *xine) {
if (error) {
- xine_log (xine, XINE_LOG_MSG,
- _("input_net: unable to resolve '%s'.\n"), host);
+ xine_log(xine, XINE_LOG_MSG,
+ _("input_net: unable to resolve '%s'.\n"), host);
return -1;
}
@@ -238,8 +238,8 @@ static int host_connect(const char *host, int port, xine_t *xine) {
tmpaddr = tmpaddr->ai_next;
}
- xine_log (xine, XINE_LOG_MSG,
- _("input_net: unable to connect to '%s'.\n"), host);
+ xine_log(xine, XINE_LOG_MSG,
+ _("input_net: unable to connect to '%s'.\n"), host);
return -1;
#endif
@@ -254,7 +254,7 @@ static off_t net_plugin_read (input_plugin_t *this_gen,
net_input_plugin_t *this = (net_input_plugin_t *) this_gen;
off_t n, total;
- lprintf ("reading %d bytes...\n", len);
+ lprintf("reading %d bytes...\n", len);
total=0;
if (this->curpos < this->preview_size) {
@@ -262,7 +262,7 @@ static off_t net_plugin_read (input_plugin_t *this_gen,
if (n > (len - total))
n = len - total;
- lprintf ("%lld bytes from preview (which has %lld bytes)\n", n, this->preview_size);
+ lprintf("%lld bytes from preview (which has %lld bytes)\n", n, this->preview_size);
memcpy (&buf[total], &this->preview[this->curpos], n);
this->curpos += n;
@@ -272,8 +272,7 @@ static off_t net_plugin_read (input_plugin_t *this_gen,
if( (len-total) > 0 ) {
n = _x_read_abort (this->stream, this->fh, &buf[total], len-total);
- xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG,
- "input_net: got %lld bytes (%lld/%lld bytes read)\n", n,total,len);
+ xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, "input_net: got %" PRIiMAX " bytes (%" PRIiMAX "/%" PRIiMAX " 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);
@@ -349,8 +348,9 @@ static off_t net_plugin_seek (input_plugin_t *this_gen, off_t offset, int origin
if( this->curpos <= this->preview_size )
this->curpos = offset;
else
- xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG,
- "input_net: cannot seek back! (%lld > %lld)\n", this->curpos, offset);
+ xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,
+ "input_net: cannot seek back! (%" PRIiMAX " > %" PRIiMAX ")\n",
+ (intmax_t)this->curpos, (intmax_t)offset);
} else {
offset -= this->curpos;
diff --git a/src/input/input_pnm.c b/src/input/input_pnm.c
index 0f5df891f..52c8ea997 100644
--- a/src/input/input_pnm.c
+++ b/src/input/input_pnm.c
@@ -121,7 +121,8 @@ static off_t pnm_plugin_seek (input_plugin_t *this_gen, off_t offset, int origin
pnm_input_plugin_t *this = (pnm_input_plugin_t *) this_gen;
xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG,
- "input_pnm: seek %lld bytes, origin %d\n", offset, origin);
+ "input_pnm: seek %" PRIiMAX " bytes, origin %d\n", (intmax_t)offset,
+ origin);
/* only realtive forward-seeking is implemented */
diff --git a/src/input/input_stdin_fifo.c b/src/input/input_stdin_fifo.c
index 37db6049f..5c427d9f4 100644
--- a/src/input/input_stdin_fifo.c
+++ b/src/input/input_stdin_fifo.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: input_stdin_fifo.c,v 1.59 2004/07/20 00:50:11 rockyb Exp $
+ * $Id: input_stdin_fifo.c,v 1.60 2004/09/17 19:21:46 valtri Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -158,7 +158,8 @@ static off_t stdin_plugin_seek (input_plugin_t *this_gen, off_t offset, int orig
this->curpos = offset;
else
xprintf (this->xine, XINE_VERBOSITY_LOG,
- _("stdin: cannot seek back! (%lld > %lld)\n"), this->curpos, offset);
+ _("stdin: cannot seek back! (%" PRIiMAX " > %" PRIiMAX ")\n"),
+ (intmax_t)this->curpos, (intmax_t)offset);
} else {
offset -= this->curpos;
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-01 23:52:47 +0000