From 50a6ca39ad4ed01922aa4f755f0ca579788226cf Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Thu, 6 May 2010 21:04:40 +0000 Subject: Move c/h files implementing/defining standard library stuff into a new libc directory, also standard'ify some parts of the code base (almost entirely #include fixes). This is to a) to cleanup firmware/common and firmware/include a bit, but also b) for Rockbox as an application which should use the host system's c library and headers, separating makes it easy to exclude our files from the build. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25850 a1c6a512-1295-4272-9138-f99709370657 --- apps/gui/bitmap/list.c | 1 - apps/gui/charcell/list.c | 1 - apps/gui/list.c | 2 +- apps/gui/option_select.c | 3 +-- apps/gui/pitchscreen.c | 15 +++++++-------- apps/gui/skin_engine/skin_backdrops.c | 3 +-- apps/gui/skin_engine/skin_display.c | 2 +- apps/gui/skin_engine/skin_tokens.c | 14 +++++++------- apps/gui/statusbar.c | 2 +- apps/gui/usb_screen.c | 1 - apps/gui/viewport.c | 1 - apps/gui/wps.c | 1 - 12 files changed, 19 insertions(+), 27 deletions(-) (limited to 'apps/gui') diff --git a/apps/gui/bitmap/list.c b/apps/gui/bitmap/list.c index 10616c9df4..0da67c7c1e 100644 --- a/apps/gui/bitmap/list.c +++ b/apps/gui/bitmap/list.c @@ -25,7 +25,6 @@ #include "lcd.h" #include "font.h" #include "button.h" -#include "sprintf.h" #include "string.h" #include "settings.h" #include "kernel.h" diff --git a/apps/gui/charcell/list.c b/apps/gui/charcell/list.c index f36d3c9f7d..8eebfe7fa1 100644 --- a/apps/gui/charcell/list.c +++ b/apps/gui/charcell/list.c @@ -25,7 +25,6 @@ #include "lcd.h" #include "font.h" #include "button.h" -#include "sprintf.h" #include "string.h" #include "settings.h" #include "kernel.h" diff --git a/apps/gui/list.c b/apps/gui/list.c index 11a4c36015..de76310e0b 100644 --- a/apps/gui/list.c +++ b/apps/gui/list.c @@ -19,11 +19,11 @@ * ****************************************************************************/ +#include #include "config.h" #include "lcd.h" #include "font.h" #include "button.h" -#include "sprintf.h" #include "string.h" #include "settings.h" #include "kernel.h" diff --git a/apps/gui/option_select.c b/apps/gui/option_select.c index 71a28cb520..feed1dc2db 100644 --- a/apps/gui/option_select.c +++ b/apps/gui/option_select.c @@ -20,10 +20,9 @@ * ****************************************************************************/ #include -#include +#include "string-extra.h" #include "config.h" #include "option_select.h" -#include "sprintf.h" #include "kernel.h" #include "lang.h" #include "talk.h" diff --git a/apps/gui/pitchscreen.c b/apps/gui/pitchscreen.c index 77b5739be1..a0058724ec 100644 --- a/apps/gui/pitchscreen.c +++ b/apps/gui/pitchscreen.c @@ -23,9 +23,8 @@ #include #include #include -#include /* for ABS() */ +#include /* for abs() */ #include "config.h" -#include "sprintf.h" #include "action.h" #include "dsp.h" #include "sound.h" @@ -248,10 +247,10 @@ static void pitchscreen_draw(struct screen *display, int max_lines, /* Pitch:XXX.X% */ if(global_settings.pitch_mode_semitone) { - snprintf(buf, sizeof(buf), "%s: %s%ld.%02ld", str(LANG_PITCH), + snprintf(buf, sizeof(buf), "%s: %s%d.%02d", str(LANG_PITCH), semitone >= 0 ? "+" : "-", - ABS(semitone / PITCH_SPEED_PRECISION), - ABS((semitone % PITCH_SPEED_PRECISION) / + abs(semitone / PITCH_SPEED_PRECISION), + abs((semitone % PITCH_SPEED_PRECISION) / (PITCH_SPEED_PRECISION / 100)) ); } @@ -290,10 +289,10 @@ static void pitchscreen_draw(struct screen *display, int max_lines, { if(global_settings.pitch_mode_semitone) { - snprintf(buf, sizeof(buf), "%s%ld.%02ld", + snprintf(buf, sizeof(buf), "%s%d.%02d", semitone >= 0 ? "+" : "-", - ABS(semitone / PITCH_SPEED_PRECISION), - ABS((semitone % PITCH_SPEED_PRECISION) / + abs(semitone / PITCH_SPEED_PRECISION), + abs((semitone % PITCH_SPEED_PRECISION) / (PITCH_SPEED_PRECISION / 100)) ); } diff --git a/apps/gui/skin_engine/skin_backdrops.c b/apps/gui/skin_engine/skin_backdrops.c index fd786a7882..77de8bdc1a 100644 --- a/apps/gui/skin_engine/skin_backdrops.c +++ b/apps/gui/skin_engine/skin_backdrops.c @@ -21,9 +21,8 @@ #include "config.h" #include -#include #include - +#include "string-extra.h" #include "settings.h" #include "skin_buffer.h" #include "wps_internals.h" diff --git a/apps/gui/skin_engine/skin_display.c b/apps/gui/skin_engine/skin_display.c index 0d7824aaf6..d3169be43a 100644 --- a/apps/gui/skin_engine/skin_display.c +++ b/apps/gui/skin_engine/skin_display.c @@ -21,7 +21,7 @@ ****************************************************************************/ #include "config.h" #include -#include +#include "string-extra.h" #include "misc.h" #include "font.h" #include "system.h" diff --git a/apps/gui/skin_engine/skin_tokens.c b/apps/gui/skin_engine/skin_tokens.c index 4ee8c74cdd..6e5a2eae85 100644 --- a/apps/gui/skin_engine/skin_tokens.c +++ b/apps/gui/skin_engine/skin_tokens.c @@ -21,7 +21,7 @@ ****************************************************************************/ #include "font.h" #include -#include +#include "string-extra.h" #include #include "action.h" #include "system.h" @@ -247,7 +247,7 @@ const char *get_id3_token(struct wps_token *token, struct mp3entry *id3, { *intval = limit * elapsed / length + 1; } - snprintf(buf, buf_size, "%d", 100 * elapsed / length); + snprintf(buf, buf_size, "%lu", 100 * elapsed / length); return buf; @@ -269,7 +269,7 @@ const char *get_id3_token(struct wps_token *token, struct mp3entry *id3, if ((id3->frequency % 1000) < 100) snprintf(buf, buf_size, "%ld", id3->frequency / 1000); else - snprintf(buf, buf_size, "%ld.%d", + snprintf(buf, buf_size, "%ld.%lu", id3->frequency / 1000, (id3->frequency % 1000) / 100); return buf; @@ -302,12 +302,12 @@ const char *get_id3_token(struct wps_token *token, struct mp3entry *id3, case WPS_TOKEN_DATABASE_RATING: if (intval) *intval = id3->rating + 1; - snprintf(buf, buf_size, "%ld", id3->rating); + snprintf(buf, buf_size, "%d", id3->rating); return buf; case WPS_TOKEN_DATABASE_AUTOSCORE: if (intval) *intval = id3->score + 1; - snprintf(buf, buf_size, "%ld", id3->score); + snprintf(buf, buf_size, "%d", id3->score); return buf; #endif @@ -1064,7 +1064,7 @@ const char *get_token_value(struct gui_wps *gwps, break;) } } - snprintf(buf, buf_size, "%d.%1d", samprk/1000,samprk%1000); + snprintf(buf, buf_size, "%lu.%1lu", samprk/1000,samprk%1000); #else /* HWCODEC */ static const char * const freq_strings[] = @@ -1164,7 +1164,7 @@ const char *get_token_value(struct gui_wps *gwps, #endif *intval = global_settings.mp3_enc_config.bitrate+1; } - snprintf(buf, buf_size, "%d", global_settings.mp3_enc_config.bitrate+1); + snprintf(buf, buf_size, "%lu", global_settings.mp3_enc_config.bitrate+1); return buf; } else diff --git a/apps/gui/statusbar.c b/apps/gui/statusbar.c index bc5570ee4e..901615d98a 100644 --- a/apps/gui/statusbar.c +++ b/apps/gui/statusbar.c @@ -19,11 +19,11 @@ * ****************************************************************************/ +#include #include "config.h" #include "font.h" #include "kernel.h" #include "string.h" /* for memcmp oO*/ -#include "sprintf.h" #include "sound.h" #include "settings.h" #include "viewport.h" diff --git a/apps/gui/usb_screen.c b/apps/gui/usb_screen.c index 019aec61ff..9895defc2b 100644 --- a/apps/gui/usb_screen.c +++ b/apps/gui/usb_screen.c @@ -30,7 +30,6 @@ #include "usb_core.h" #ifdef USB_ENABLE_HID #include "usb_keymaps.h" -#include "sprintf.h" #endif #endif #include "settings.h" diff --git a/apps/gui/viewport.c b/apps/gui/viewport.c index 03f004ba87..7d128188c3 100644 --- a/apps/gui/viewport.c +++ b/apps/gui/viewport.c @@ -41,7 +41,6 @@ /* all below isn't needed for pc tools (i.e. checkwps/wps editor) * only viewport_parse_viewport() is */ #ifndef __PCTOOL__ -#include "sprintf.h" #include "string.h" #include "kernel.h" #include "system.h" diff --git a/apps/gui/wps.c b/apps/gui/wps.c index afd7f3f2d0..916ca2cbcf 100644 --- a/apps/gui/wps.c +++ b/apps/gui/wps.c @@ -31,7 +31,6 @@ #include "action.h" #include "kernel.h" #include "filetypes.h" -#include "sprintf.h" #include "settings.h" #include "skin_engine/skin_engine.h" #include "mp3_playback.h" -- cgit v1.2.3