summaryrefslogtreecommitdiff
path: root/src/input
diff options
context:
space:
mode:
Diffstat (limited to 'src/input')
-rw-r--r--src/input/input_http.c8
-rw-r--r--src/input/input_mms.c10
-rw-r--r--src/input/input_pnm.c6
-rw-r--r--src/input/input_rtsp.c8
-rw-r--r--src/input/input_stdin_fifo.c10
-rw-r--r--src/input/mms.c4
6 files changed, 23 insertions, 23 deletions
diff --git a/src/input/input_http.c b/src/input/input_http.c
index 8555e3bc8..a9bcee0d5 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.127 2007/01/19 01:05:25 dgp85 Exp $
+ * $Id: input_http.c,v 1.128 2007/02/20 00:34:56 dgp85 Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -363,7 +363,7 @@ static off_t http_plugin_read_int (http_input_plugin_t *this,
int read_bytes = 0;
int nlen;
- lprintf("total=%lld\n", total);
+ lprintf("total=%"PRId64"\n", total);
while (total) {
nlen = total;
if (this->shoutcast_mode &&
@@ -415,7 +415,7 @@ static off_t http_plugin_read (input_plugin_t *this_gen,
else
n = nlen;
- lprintf ("%lld bytes from preview (which has %lld bytes)\n", n, this->preview_size);
+ lprintf ("%"PRId64" bytes from preview (which has %"PRId64" bytes)\n", n, this->preview_size);
memcpy (buf, &this->preview[this->curpos], n);
num_bytes += n;
@@ -942,7 +942,7 @@ static int http_plugin_open (input_plugin_t *this_gen ) {
return -12;
}
- lprintf("preview_size=%lld\n", this->preview_size);
+ lprintf("preview_size=%"PRId64"\n", this->preview_size);
this->curpos = 0;
return 1;
diff --git a/src/input/input_mms.c b/src/input/input_mms.c
index 52a0d4bab..758ad770d 100644
--- a/src/input/input_mms.c
+++ b/src/input/input_mms.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_mms.c,v 1.68 2007/01/19 01:05:25 dgp85 Exp $
+ * $Id: input_mms.c,v 1.69 2007/02/20 00:34:56 dgp85 Exp $
*
* mms input plugin based on work from major mms
*/
@@ -102,7 +102,7 @@ static off_t mms_plugin_read (input_plugin_t *this_gen,
mms_input_plugin_t *this = (mms_input_plugin_t *) this_gen;
off_t n = 0;
- lprintf ("mms_plugin_read: %lld bytes ...\n", len);
+ lprintf ("mms_plugin_read: %"PRId64" bytes ...\n", len);
switch (this->protocol) {
case PROTOCOL_MMST:
@@ -122,7 +122,7 @@ static buf_element_t *mms_plugin_read_block (input_plugin_t *this_gen,
buf_element_t *buf = fifo->buffer_pool_alloc (fifo);
int total_bytes;
- lprintf ("mms_plugin_read_block: %lld bytes...\n", todo);
+ lprintf ("mms_plugin_read_block: %"PRId64" bytes...\n", todo);
buf->content = buf->mem;
buf->type = BUF_DEMUX_BLOCK;
@@ -144,7 +144,7 @@ static off_t mms_plugin_seek (input_plugin_t *this_gen, off_t offset, int origin
off_t dest = 0;
off_t curpos = 0;
- lprintf ("mms_plugin_seek: %lld offset, %d origin...\n", offset, origin);
+ lprintf ("mms_plugin_seek: %"PRId64" offset, %d origin...\n", offset, origin);
switch (this->protocol) {
@@ -239,7 +239,7 @@ static off_t mms_plugin_get_length (input_plugin_t *this_gen) {
break;
}
- lprintf ("length is %lld\n", length);
+ lprintf ("length is %"PRId64"\n", length);
return length;
diff --git a/src/input/input_pnm.c b/src/input/input_pnm.c
index af860ac1e..e1413b0f7 100644
--- a/src/input/input_pnm.c
+++ b/src/input/input_pnm.c
@@ -80,7 +80,7 @@ static off_t pnm_plugin_read (input_plugin_t *this_gen,
pnm_input_plugin_t *this = (pnm_input_plugin_t *) this_gen;
off_t n;
- lprintf ("pnm_plugin_read: %lld bytes ...\n", len);
+ lprintf ("pnm_plugin_read: %"PRId64" bytes ...\n", len);
nbc_check_buffers (this->nbc);
@@ -96,7 +96,7 @@ static buf_element_t *pnm_plugin_read_block (input_plugin_t *this_gen,
buf_element_t *buf = fifo->buffer_pool_alloc (fifo);
int total_bytes;
- lprintf ("pnm_plugin_read_block: %lld bytes...\n", todo);
+ lprintf ("pnm_plugin_read_block: %"PRId64" bytes...\n", todo);
buf->content = buf->mem;
buf->type = BUF_DEMUX_BLOCK;
@@ -156,7 +156,7 @@ static off_t pnm_plugin_get_current_pos (input_plugin_t *this_gen){
pnm_input_plugin_t *this = (pnm_input_plugin_t *) this_gen;
/*
- printf ("current pos is %lld\n", this->curpos);
+ printf ("current pos is %"PRId64"\n", this->curpos);
*/
return this->curpos;
diff --git a/src/input/input_rtsp.c b/src/input/input_rtsp.c
index c23c761cc..693e8af66 100644
--- a/src/input/input_rtsp.c
+++ b/src/input/input_rtsp.c
@@ -81,7 +81,7 @@ static off_t rtsp_plugin_read (input_plugin_t *this_gen,
rtsp_input_plugin_t *this = (rtsp_input_plugin_t *) this_gen;
off_t n;
- lprintf ("rtsp_plugin_read: %lld bytes ...\n", len);
+ lprintf ("rtsp_plugin_read: %"PRId64" bytes ...\n", len);
nbc_check_buffers (this->nbc);
@@ -97,7 +97,7 @@ static buf_element_t *rtsp_plugin_read_block (input_plugin_t *this_gen,
buf_element_t *buf = fifo->buffer_pool_alloc (fifo);
int total_bytes;
- lprintf ("rtsp_plugin_read_block: %lld bytes...\n", todo);
+ lprintf ("rtsp_plugin_read_block: %"PRId64" bytes...\n", todo);
buf->content = buf->mem;
buf->type = BUF_DEMUX_BLOCK;
@@ -118,7 +118,7 @@ static off_t rtsp_plugin_seek (input_plugin_t *this_gen, off_t offset, int origi
rtsp_input_plugin_t *this = (rtsp_input_plugin_t *) this_gen;
- lprintf ("seek %lld bytes, origin %d\n", offset, origin);
+ lprintf ("seek %"PRId64" bytes, origin %d\n", offset, origin);
/* only realtive forward-seeking is implemented */
@@ -168,7 +168,7 @@ static off_t rtsp_plugin_get_current_pos (input_plugin_t *this_gen){
rtsp_input_plugin_t *this = (rtsp_input_plugin_t *) this_gen;
/*
- printf ("current pos is %lld\n", this->curpos);
+ printf ("current pos is %"PRId64"\n", this->curpos);
*/
return this->curpos;
diff --git a/src/input/input_stdin_fifo.c b/src/input/input_stdin_fifo.c
index 654e5d1a2..939f56f25 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.69 2007/01/19 01:05:25 dgp85 Exp $
+ * $Id: input_stdin_fifo.c,v 1.70 2007/02/20 00:34:56 dgp85 Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -86,14 +86,14 @@ static off_t stdin_plugin_read (input_plugin_t *this_gen,
stdin_input_plugin_t *this = (stdin_input_plugin_t *) this_gen;
off_t n, total;
- lprintf ("reading %lld bytes...\n", len);
+ lprintf ("reading %"PRId64" bytes...\n", len);
total=0;
if (this->curpos < this->preview_size) {
n = this->preview_size - this->curpos;
if (n > (len - total))
n = len - total;
- lprintf ("%lld bytes from preview (which has %lld bytes)\n", n, this->preview_size);
+ lprintf ("%"PRId64" bytes from preview (which has %"PRId64" bytes)\n", n, this->preview_size);
memcpy (&buf[total], &this->preview[this->curpos], n);
this->curpos += n;
@@ -103,7 +103,7 @@ static off_t stdin_plugin_read (input_plugin_t *this_gen,
if( (len-total) > 0 ) {
n = _x_io_file_read (this->stream, this->fh, &buf[total], len - total);
- lprintf ("got %lld bytes (%lld/%lld bytes read)\n", n,total,len);
+ lprintf ("got %"PRId64" bytes (%"PRId64"/%"PRId64" bytes read)\n", n,total,len);
if (n < 0) {
_x_message(this->stream, XINE_MSG_READ_ERROR, NULL);
@@ -143,7 +143,7 @@ static off_t stdin_plugin_seek (input_plugin_t *this_gen, off_t offset, int orig
stdin_input_plugin_t *this = (stdin_input_plugin_t *) this_gen;
- lprintf ("seek %lld offset, %d origin...\n", offset, origin);
+ lprintf ("seek %"PRId64" offset, %d origin...\n", offset, origin);
if ((origin == SEEK_CUR) && (offset >= 0)) {
diff --git a/src/input/mms.c b/src/input/mms.c
index 370b20759..74087f7c5 100644
--- a/src/input/mms.c
+++ b/src/input/mms.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: mms.c,v 1.64 2007/01/03 15:09:42 klan Exp $
+ * $Id: mms.c,v 1.65 2007/02/20 00:34:56 dgp85 Exp $
*
* MMS over TCP protocol
* based on work from major mms
@@ -385,7 +385,7 @@ static int get_packet_header (mms_t *this, mms_packet_header_t *header) {
return packet_type;
error:
- lprintf("read error, len=%d\n", len);
+ lprintf("read error, len=%zd\n", len);
return MMS_PACKET_ERR;
}