From 3d829a8e595680083322a439c6ee5c452c38ddea Mon Sep 17 00:00:00 2001 From: Blue_Dude Date: Sat, 15 May 2010 01:57:32 +0000 Subject: [PATCH] Fix logf lines in codecs (type mismatches) git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26038 a1c6a512-1295-4272-9138-f99709370657 --- apps/codecs/aac.c | 2 +- apps/codecs/alac.c | 2 +- apps/codecs/ape.c | 4 ++-- apps/codecs/flac.c | 2 +- apps/codecs/shorten.c | 3 ++- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/apps/codecs/aac.c b/apps/codecs/aac.c index e9ff967d6..0f38ea114 100644 --- a/apps/codecs/aac.c +++ b/apps/codecs/aac.c @@ -247,7 +247,7 @@ next_track: err = CODEC_OK; done: - LOGF("AAC: Decoded %lu samples\n", sound_samples_done); + LOGF("AAC: Decoded %lu samples\n", (unsigned long)sound_samples_done); if (ci->request_next_track()) goto next_track; diff --git a/apps/codecs/alac.c b/apps/codecs/alac.c index 1de127db2..0ac6b1ec8 100644 --- a/apps/codecs/alac.c +++ b/apps/codecs/alac.c @@ -146,7 +146,7 @@ enum codec_status codec_main(void) retval = CODEC_OK; done: - LOGF("ALAC: Decoded %ld samples\n",samplesdone); + LOGF("ALAC: Decoded %lu samples\n",(unsigned long)samplesdone); if (ci->request_next_track()) goto next_track; diff --git a/apps/codecs/ape.c b/apps/codecs/ape.c index ef3d94e1a..06e8842d0 100644 --- a/apps/codecs/ape.c +++ b/apps/codecs/ape.c @@ -281,7 +281,7 @@ frame_start: blockstodecode)) < 0) { /* Frame decoding error, abort */ - LOGF("APE: Frame %lu, error %d\n",currentframe,res); + LOGF("APE: Frame %lu, error %d\n",(unsigned long)currentframe,res); retval = CODEC_ERROR; goto done; } @@ -322,7 +322,7 @@ frame_start: retval = CODEC_OK; done: - LOGF("APE: Decoded %ld samples\n",samplesdone); + LOGF("APE: Decoded %lu samples\n",(unsigned long)samplesdone); if (ci->request_next_track()) goto next_track; diff --git a/apps/codecs/flac.c b/apps/codecs/flac.c index 3f2f369a8..14ddd3cb0 100644 --- a/apps/codecs/flac.c +++ b/apps/codecs/flac.c @@ -502,7 +502,7 @@ enum codec_status codec_main(void) retval = CODEC_OK; done: - LOGF("FLAC: Decoded %ld samples\n",samplesdone); + LOGF("FLAC: Decoded %lu samples\n",(unsigned long)samplesdone); if (ci->request_next_track()) goto next_track; diff --git a/apps/codecs/shorten.c b/apps/codecs/shorten.c index 9b5c2e2f1..ddc2f9a78 100644 --- a/apps/codecs/shorten.c +++ b/apps/codecs/shorten.c @@ -126,7 +126,8 @@ seek_start: bytesleft, ci->yield); if (res == FN_ERROR) { - LOGF("Shorten: shorten_decode_frames error (%ld)\n", samplesdone); + LOGF("Shorten: shorten_decode_frames error (%lu)\n", + (unsigned long)samplesdone); break; } else { /* Insert decoded samples in pcmbuf */ -- 2.11.4.GIT