summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-08-06 22:21:53 +0000
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-11-02 04:15:48 +0200
commit26541aeb8b0c8e17118896195d9948501d2ed049 (patch)
tree38ad4a761fcdc899b95ed3bc29e162dc2cc8c58d
parent7e57bfd853285f39330d0122e5d8cde3a7cef7fa (diff)
downloadmpv-26541aeb8b0c8e17118896195d9948501d2ed049.tar.bz2
mpv-26541aeb8b0c8e17118896195d9948501d2ed049.tar.xz
printf format fixes ("%d" -> "%zd")
Add 'z' length modifier to %d printf format specifier for size_t argument. stream/http.c:675: warning: format '%d' expects type 'int', but argument 4 has type 'size_t' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31933 b3059339-0415-0410-9bf9-f77b7e298cf2 Add 'z' length modifier to %d printf format specifiers for size_t arguments. libmpdemux/demux_avi.c:553: warning: format '%u' expects type 'unsigned int', but argument 5 has type 'size_t' libmpdemux/demux_avi.c:553: warning: format '%u' expects type 'unsigned int', but argument 7 has type 'size_t' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31935 b3059339-0415-0410-9bf9-f77b7e298cf2 Add 'z' length modifier to %d printf format specifiers for size_t arguments. libmpdemux/demux_lmlm4.c:75: warning: format '%d' expects type 'int', but argument 5 has type 'ssize_t' libmpdemux/demux_lmlm4.c:163: warning: format '%d' expects type 'int', but argument 6 has type 'ssize_t' libmpdemux/demux_lmlm4.c:163: warning: format '%d' expects type 'int', but argument 7 has type 'ssize_t' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31937 b3059339-0415-0410-9bf9-f77b7e298cf2 Add 'z' length modifier to %d printf format specifier for size_t argument. stream/asf_streaming.c:676: warning: format '%d' expects type 'int', but argument 5 has type 'size_t' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31938 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--libmpdemux/demux_avi.c4
-rw-r--r--libmpdemux/demux_lmlm4.c6
-rw-r--r--stream/asf_streaming.c2
-rw-r--r--stream/http.c2
4 files changed, 9 insertions, 5 deletions
diff --git a/libmpdemux/demux_avi.c b/libmpdemux/demux_avi.c
index 0d5e59078c..fea37e5062 100644
--- a/libmpdemux/demux_avi.c
+++ b/libmpdemux/demux_avi.c
@@ -553,7 +553,9 @@ static demuxer_t* demux_open_avi(demuxer_t* demuxer){
asamples+=(len+priv->audio_block_size-1)/priv->audio_block_size;
}
}
- mp_msg(MSGT_DEMUX,MSGL_V,"AVI video size=%"PRId64" (%u) audio size=%"PRId64" (%u)\n",vsize,vsamples,asize,asamples);
+ mp_msg(MSGT_DEMUX, MSGL_V,
+ "AVI video size=%"PRId64" (%zu) audio size=%"PRId64" (%zu)\n",
+ vsize, vsamples, asize, asamples);
priv->numberofframes=vsamples;
sh_video->i_bps=((float)vsize/(float)vsamples)*(float)sh_video->video.dwRate/(float)sh_video->video.dwScale;
if(sh_audio) sh_audio->i_bps=((float)asize/(float)asamples)*(float)sh_audio->audio.dwRate/(float)sh_audio->audio.dwScale;
diff --git a/libmpdemux/demux_lmlm4.c b/libmpdemux/demux_lmlm4.c
index 46bb167ef1..7f95e36de0 100644
--- a/libmpdemux/demux_lmlm4.c
+++ b/libmpdemux/demux_lmlm4.c
@@ -71,7 +71,9 @@ static int imeHeaderValid(FrameInfo *frame)
if ( frame->channelNo > 7 ||
frame->frameSize > MAX_PACKET_SIZE || frame->frameSize <= 0)
{
- mp_msg(MSGT_DEMUX, MSGL_V, "Invalid packet in LMLM4 stream: ch=%d size=%d\n", frame->channelNo, frame->frameSize);
+ mp_msg(MSGT_DEMUX, MSGL_V,
+ "Invalid packet in LMLM4 stream: ch=%d size=%zd\n",
+ frame->channelNo, frame->frameSize);
return 0;
}
switch (frame->frameType) {
@@ -155,7 +157,7 @@ static int getFrame(demuxer_t *demuxer, FrameInfo *frameInfo)
frameInfo->frameSize = packetSize - 8; //sizeof(IME6400Header);
frameInfo->paddingSize = (packetSize & PACKET_BLOCK_LAST) ? PACKET_BLOCK_SIZE - (packetSize & PACKET_BLOCK_LAST) : 0;
- mp_msg(MSGT_DEMUX, MSGL_DBG2, "typ: %d chan: %d size: %d pad: %d\n",
+ mp_msg(MSGT_DEMUX, MSGL_DBG2, "typ: %d chan: %d size: %zd pad: %zd\n",
frameInfo->frameType,
frameInfo->channelNo,
frameInfo->frameSize,
diff --git a/stream/asf_streaming.c b/stream/asf_streaming.c
index 94563ef0f1..c50d373cab 100644
--- a/stream/asf_streaming.c
+++ b/stream/asf_streaming.c
@@ -672,7 +672,7 @@ static int asf_http_parse_response(asf_http_streaming_ctrl_t *asf_http_ctrl, HTT
len = (unsigned int)(end-pragma);
}
if(len > sizeof(features) - 1) {
- mp_tmsg(MSGT_NETWORK,MSGL_WARN,"ASF HTTP PARSE WARNING : Pragma %s cut from %d bytes to %d\n",pragma,len,sizeof(features) - 1);
+ mp_tmsg(MSGT_NETWORK,MSGL_WARN,"ASF HTTP PARSE WARNING : Pragma %s cut from %zd bytes to %d\n",pragma,len,sizeof(features) - 1);
len = sizeof(features) - 1;
}
strncpy( features, pragma, len );
diff --git a/stream/http.c b/stream/http.c
index dda668e5f4..5523622f8f 100644
--- a/stream/http.c
+++ b/stream/http.c
@@ -672,7 +672,7 @@ http_debug_hdr( HTTP_header_t *http_hdr ) {
mp_msg(MSGT_NETWORK,MSGL_V,"method: [%s]\n", http_hdr->method );
mp_msg(MSGT_NETWORK,MSGL_V,"status code: [%d]\n", http_hdr->status_code );
mp_msg(MSGT_NETWORK,MSGL_V,"reason phrase: [%s]\n", http_hdr->reason_phrase );
- mp_msg(MSGT_NETWORK,MSGL_V,"body size: [%d]\n", http_hdr->body_size );
+ mp_msg(MSGT_NETWORK,MSGL_V,"body size: [%zd]\n", http_hdr->body_size );
mp_msg(MSGT_NETWORK,MSGL_V,"Fields:\n");
field = http_hdr->first_field;