From cb972abc488fa4c06d16ba9ebeb030a0b8d45ed2 Mon Sep 17 00:00:00 2001 From: Bertrik Sikken Date: Tue, 20 Dec 2011 20:35:28 +0000 Subject: Another round of making local functions static git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31384 a1c6a512-1295-4272-9138-f99709370657 --- apps/gui/skin_engine/skin_engine.c | 2 +- apps/root_menu.c | 2 -- apps/screen_access.c | 4 ++-- apps/shortcuts.c | 6 +++--- firmware/font.c | 2 +- 5 files changed, 7 insertions(+), 9 deletions(-) diff --git a/apps/gui/skin_engine/skin_engine.c b/apps/gui/skin_engine/skin_engine.c index 74abd92fdf..1d73b3266b 100644 --- a/apps/gui/skin_engine/skin_engine.c +++ b/apps/gui/skin_engine/skin_engine.c @@ -73,7 +73,7 @@ static struct gui_skin { } skins[SKINNABLE_SCREENS_COUNT][NB_SCREENS]; -void gui_skin_reset(struct gui_skin *skin) +static void gui_skin_reset(struct gui_skin *skin) { skin->filename[0] = '\0'; skin->buffer_start = NULL; diff --git a/apps/root_menu.c b/apps/root_menu.c index e78c02759b..aaddfa885a 100644 --- a/apps/root_menu.c +++ b/apps/root_menu.c @@ -378,8 +378,6 @@ static int load_bmarks(void* param) return GO_TO_PREVIOUS; } -int time_screen(void* ignored); - /* These are all static const'd from apps/menus/ *.c so little hack so we can use them */ extern struct menu_item_ex diff --git a/apps/screen_access.c b/apps/screen_access.c index b7dc90b5bd..e47a815b82 100644 --- a/apps/screen_access.c +++ b/apps/screen_access.c @@ -77,7 +77,7 @@ void screen_helper_setfont(int font) #endif } -int screen_helper_getuifont(void) +static int screen_helper_getuifont(void) { #ifdef HAVE_LCD_BITMAP return global_status.font_id[SCREEN_MAIN]; @@ -86,7 +86,7 @@ int screen_helper_getuifont(void) #endif } -void screen_helper_setuifont(int font) +static void screen_helper_setuifont(int font) { #ifdef HAVE_LCD_BITMAP global_status.font_id[SCREEN_MAIN] = font; diff --git a/apps/shortcuts.c b/apps/shortcuts.c index 75e005b166..33c22f2262 100644 --- a/apps/shortcuts.c +++ b/apps/shortcuts.c @@ -168,7 +168,7 @@ static void init_shortcut(struct shortcut* sc) } static int first_idx_to_writeback = -1; -void shortcuts_ata_idle_callback(void* data) +static void shortcuts_ata_idle_callback(void* data) { (void)data; int fd; @@ -223,7 +223,7 @@ void shortcuts_add(enum shortcut_type type, const char* value) register_storage_idle_func(shortcuts_ata_idle_callback); } -int readline_cb(int n, char *buf, void *parameters) +static int readline_cb(int n, char *buf, void *parameters) { (void)n; (void)parameters; @@ -388,7 +388,7 @@ static enum themable_icons shortcut_menu_get_icon(int selected_item, void * data return sc->icon; } -int shortcut_menu_speak_item(int selected_item, void * data) +static int shortcut_menu_speak_item(int selected_item, void * data) { (void)data; struct shortcut *sc = get_shortcut(selected_item); diff --git a/firmware/font.c b/firmware/font.c index 64bbf50d76..895ce15446 100644 --- a/firmware/font.c +++ b/firmware/font.c @@ -348,7 +348,7 @@ const char* font_filename(int font_id) return NULL; } -size_t font_glyphs_to_bufsize(struct font *pf, int glyphs) +static size_t font_glyphs_to_bufsize(struct font *pf, int glyphs) { size_t bufsize; -- cgit v1.2.3