From 0ccc9cc897ce821058e1fe8e9dd428137bbff55b Mon Sep 17 00:00:00 2001 From: kugel Date: Thu, 6 May 2010 21:37:03 +0000 Subject: [PATCH] Fix some more snprintf related warnings. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25853 a1c6a512-1295-4272-9138-f99709370657 --- apps/gui/skin_engine/skin_tokens.c | 2 +- apps/gui/usb_screen.c | 1 + apps/recorder/recording.c | 2 +- bootloader/iriver_h1x0.c | 2 +- firmware/target/arm/tcc780x/debug-tcc780x.c | 3 ++- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/apps/gui/skin_engine/skin_tokens.c b/apps/gui/skin_engine/skin_tokens.c index 6e5a2eae8..20206f011 100644 --- a/apps/gui/skin_engine/skin_tokens.c +++ b/apps/gui/skin_engine/skin_tokens.c @@ -1079,7 +1079,7 @@ const char *get_token_value(struct gui_wps *gwps, #endif /* HAVE_SPDIF_IN */ if (intval) *intval = freq+1; /* so the token gets a value 1<=x<=7 */ - snprintf(buf, buf_size, "%d\n", + snprintf(buf, buf_size, "%s\n", freq_strings[global_settings.rec_frequency]); #endif return buf; diff --git a/apps/gui/usb_screen.c b/apps/gui/usb_screen.c index 9895defc2..2873562ed 100644 --- a/apps/gui/usb_screen.c +++ b/apps/gui/usb_screen.c @@ -19,6 +19,7 @@ * ****************************************************************************/ +#include #include "action.h" #include "font.h" #ifdef HAVE_REMOTE_LCD diff --git a/apps/recorder/recording.c b/apps/recorder/recording.c index 0f1ff30cf..d5ac91000 100644 --- a/apps/recorder/recording.c +++ b/apps/recorder/recording.c @@ -976,7 +976,7 @@ static const char* reclist_get_name(int selected_item, void * data, #if CONFIG_CODEC == SWCODEC #ifdef HAVE_SPDIF_REC case ITEM_SAMPLERATE_D: - snprintf(buffer, buffer_len, "%s: %d", + snprintf(buffer, buffer_len, "%s: %lu", str(LANG_RECORDING_FREQUENCY), pcm_rec_sample_rate()); break; diff --git a/bootloader/iriver_h1x0.c b/bootloader/iriver_h1x0.c index 83e545540..f16a5128c 100644 --- a/bootloader/iriver_h1x0.c +++ b/bootloader/iriver_h1x0.c @@ -287,7 +287,7 @@ void failsafe_menu(void) printf("%s %s %s", arrow, options[i], def); } - snprintf(buf, sizeof(buf), "Time left: %ds", + snprintf(buf, sizeof(buf), "Time left: %lds", (TIMEOUT - (current_tick - start_tick)) / HZ); lcd_puts(0, 10, buf); lcd_update(); diff --git a/firmware/target/arm/tcc780x/debug-tcc780x.c b/firmware/target/arm/tcc780x/debug-tcc780x.c index 11d6d2aca..3afc5fafa 100644 --- a/firmware/target/arm/tcc780x/debug-tcc780x.c +++ b/firmware/target/arm/tcc780x/debug-tcc780x.c @@ -19,11 +19,12 @@ * ****************************************************************************/ +#include +#include #include "config.h" #include "cpu.h" #include "system.h" #include "string.h" -#include #include "button.h" #include "lcd.h" #include "font.h" -- 2.11.4.GIT