forked from len0rd/rockbox
Eliminate %zd tag in printf format strings, replace them with %ld. The %z formatter kept generating type mismatch warnings.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26040 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
ff548fad86
commit
6ef04a7f0e
5 changed files with 25 additions and 21 deletions
|
@ -366,9 +366,9 @@ static off_t mpeg_parser_seek_PTS(uint32_t time, unsigned id)
|
|||
pos = pos_new;
|
||||
|
||||
DEBUGF("Seeking stream 0x%02x\n", id);
|
||||
DEBUGF("$$ tl:%u t:%u ct:?? tr:%u\n pl:%zd pn:%zd pr:%zd\n",
|
||||
DEBUGF("$$ tl:%u t:%u ct:?? tr:%u\n pl:%ld pn:%ld pr:%ld\n",
|
||||
(unsigned)time_left, (unsigned)time, (unsigned)time_right,
|
||||
pos_left, pos_new, pos_right);
|
||||
(long)pos_left, (long)pos_new, (long)pos_right);
|
||||
|
||||
sk.dir = SSCAN_REVERSE;
|
||||
|
||||
|
@ -425,9 +425,10 @@ static off_t mpeg_parser_seek_PTS(uint32_t time, unsigned id)
|
|||
state = STATE2; /* Last scan was early */
|
||||
sk.dir = SSCAN_REVERSE;
|
||||
|
||||
DEBUGF(">> tl:%u t:%u ct:%u tr:%u\n pl:%zd pn:%zd pr:%zd\n",
|
||||
DEBUGF(">> tl:%u t:%u ct:%u tr:%u\n pl:%ld pn:%ld pr:%ld\n",
|
||||
(unsigned)time_left, (unsigned)time, (unsigned)currpts,
|
||||
(unsigned)time_right, pos_left, pos_new, pos_right);
|
||||
(unsigned)time_right, (long)pos_left, (long)pos_new,
|
||||
(long)pos_right);
|
||||
}
|
||||
else if (currpts > time)
|
||||
{
|
||||
|
@ -453,16 +454,18 @@ static off_t mpeg_parser_seek_PTS(uint32_t time, unsigned id)
|
|||
state = STATE3; /* Last scan was late */
|
||||
sk.dir = SSCAN_REVERSE;
|
||||
|
||||
DEBUGF("<< tl:%u t:%u ct:%u tr:%u\n pl:%zd pn:%zd pr:%zd\n",
|
||||
DEBUGF("<< tl:%u t:%u ct:%u tr:%u\n pl:%ld pn:%ld pr:%ld\n",
|
||||
(unsigned)time_left, (unsigned)time, (unsigned)currpts,
|
||||
(unsigned)time_right, pos_left, pos_new, pos_right);
|
||||
(unsigned)time_right, (long)pos_left, (long)pos_new,
|
||||
pos_right);
|
||||
}
|
||||
else
|
||||
{
|
||||
/* Exact match - it happens */
|
||||
DEBUGF("|| tl:%u t:%u ct:%u tr:%u\n pl:%zd pn:%zd pr:%zd\n",
|
||||
DEBUGF("|| tl:%u t:%u ct:%u tr:%u\n pl:%ld pn:%ld pr:%ld\n",
|
||||
(unsigned)time_left, (unsigned)time, (unsigned)currpts,
|
||||
(unsigned)time_right, pos_left, pos_new, pos_right);
|
||||
(unsigned)time_right, (long)pos_left, (long)pos_new,
|
||||
(long)pos_right);
|
||||
pts = currpts;
|
||||
pos = sk.pos;
|
||||
state = STATE9;
|
||||
|
@ -492,9 +495,10 @@ static off_t mpeg_parser_seek_PTS(uint32_t time, unsigned id)
|
|||
* will find it. */
|
||||
pos_new = pos_left;
|
||||
sk.dir = SSCAN_FORWARD;
|
||||
DEBUGF("?? tl:%u t:%u ct:%u tr:%u\n pl:%zd pn:%zd pr:%zd\n",
|
||||
DEBUGF("?? tl:%u t:%u ct:%u tr:%u\n pl:%ld pn:%ld pr:%ld\n",
|
||||
(unsigned)time_left, (unsigned)time, (unsigned)currpts,
|
||||
(unsigned)time_right, pos_left, pos_new, pos_right);
|
||||
(unsigned)time_right, (long)pos_left, (long)pos_new,
|
||||
(long)pos_right);
|
||||
state = STATE1;
|
||||
break;
|
||||
default:
|
||||
|
@ -521,8 +525,8 @@ static off_t mpeg_parser_seek_PTS(uint32_t time, unsigned id)
|
|||
sk.dir = SSCAN_FORWARD;
|
||||
|
||||
uint32_t nextpts = mpeg_parser_scan_pts(&sk, id);
|
||||
DEBUGF("Seek pos:%zd pts:%u t:%u next pts:%u \n",
|
||||
pos, (unsigned)pts, (unsigned)time, (unsigned)nextpts);
|
||||
DEBUGF("Seek pos:%ld pts:%u t:%u next pts:%u \n",
|
||||
(long)pos, (unsigned)pts, (unsigned)time, (unsigned)nextpts);
|
||||
|
||||
if (pts <= time && time < nextpts)
|
||||
{
|
||||
|
@ -608,8 +612,8 @@ try_again:
|
|||
str_parser.parms.sd.sk.len = 1024*1024;
|
||||
str_parser.parms.sd.sk.dir = SSCAN_FORWARD;
|
||||
|
||||
DEBUGF("thumb pos:%ld len:%zd\n", str_parser.parms.sd.sk.pos,
|
||||
str_parser.parms.sd.sk.len);
|
||||
DEBUGF("thumb pos:%ld len:%ld\n", str_parser.parms.sd.sk.pos,
|
||||
(long)str_parser.parms.sd.sk.len);
|
||||
|
||||
result = str_send_msg(&video_str, STREAM_SYNC,
|
||||
(intptr_t)&str_parser.parms.sd);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue