Update of /cvsroot/xine/xine-lib/src/input
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv25254/src/input
Modified Files:
input_http.c input_mms.c input_pnm.c input_rtsp.c
input_stdin_fifo.c mms.c
Log Message:
Fix a lot of format warnings in lprintf calls (mostly %ldd -> %"PRId64").
Index: input_http.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/input/input_http.c,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- input_http.c 19 Jan 2007 01:05:25 -0000 1.127
+++ input_http.c 20 Feb 2007 00:34:56 -0000 1.128
@@ -363,7 +363,7 @@
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 @@
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 @@
return -12;
}
- lprintf("preview_size=%lld\n", this->preview_size);
+ lprintf("preview_size=%"PRId64"\n", this->preview_size);
this->curpos = 0;
return 1;
Index: input_mms.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/input/input_mms.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- input_mms.c 19 Jan 2007 01:05:25 -0000 1.68
+++ input_mms.c 20 Feb 2007 00:34:56 -0000 1.69
@@ -102,7 +102,7 @@
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 @@
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 @@
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 @@
break;
}
- lprintf ("length is %lld\n", length);
+ lprintf ("length is %"PRId64"\n", length);
return length;
Index: input_pnm.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/input/input_pnm.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- input_pnm.c 19 Jan 2007 01:05:25 -0000 1.29
+++ input_pnm.c 20 Feb 2007 00:34:56 -0000 1.30
@@ -80,7 +80,7 @@
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 @@
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 @@
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;
Index: input_rtsp.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/input/input_rtsp.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- input_rtsp.c 19 Jan 2007 01:05:25 -0000 1.28
+++ input_rtsp.c 20 Feb 2007 00:34:56 -0000 1.29
@@ -81,7 +81,7 @@
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 @@
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 @@
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 @@
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;
Index: input_stdin_fifo.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/input/input_stdin_fifo.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- input_stdin_fifo.c 19 Jan 2007 01:05:25 -0000 1.69
+++ input_stdin_fifo.c 20 Feb 2007 00:34:56 -0000 1.70
@@ -86,14 +86,14 @@
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 @@
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 @@
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)) {
Index: mms.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/input/mms.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- mms.c 3 Jan 2007 15:09:42 -0000 1.64
+++ mms.c 20 Feb 2007 00:34:56 -0000 1.65
@@ -385,7 +385,7 @@
return packet_type;
error:
- lprintf("read error, len=%d\n", len);
+ lprintf("read error, len=%zd\n", len);
return MMS_PACKET_ERR;
}
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Xine-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xine-cvslog
