diff options
author | Bertrik Sikken <bertrik@sikken.nl> | 2011-12-20 20:35:28 +0000 |
---|---|---|
committer | Bertrik Sikken <bertrik@sikken.nl> | 2011-12-20 20:35:28 +0000 |
commit | cb972abc488fa4c06d16ba9ebeb030a0b8d45ed2 (patch) | |
tree | ae2abf8ed076d240cbb07bd8164d5ab7cca7bebf | |
parent | 0cb0b502367380b73506a251f1d4841d340c3325 (diff) | |
download | rockbox-cb972abc488fa4c06d16ba9ebeb030a0b8d45ed2.tar.gz rockbox-cb972abc488fa4c06d16ba9ebeb030a0b8d45ed2.zip |
Another round of making local functions static
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31384 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/gui/skin_engine/skin_engine.c | 2 | ||||
-rw-r--r-- | apps/root_menu.c | 2 | ||||
-rw-r--r-- | apps/screen_access.c | 4 | ||||
-rw-r--r-- | apps/shortcuts.c | 6 | ||||
-rw-r--r-- | 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 { | |||
73 | } skins[SKINNABLE_SCREENS_COUNT][NB_SCREENS]; | 73 | } skins[SKINNABLE_SCREENS_COUNT][NB_SCREENS]; |
74 | 74 | ||
75 | 75 | ||
76 | void gui_skin_reset(struct gui_skin *skin) | 76 | static void gui_skin_reset(struct gui_skin *skin) |
77 | { | 77 | { |
78 | skin->filename[0] = '\0'; | 78 | skin->filename[0] = '\0'; |
79 | skin->buffer_start = NULL; | 79 | 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) | |||
378 | return GO_TO_PREVIOUS; | 378 | return GO_TO_PREVIOUS; |
379 | } | 379 | } |
380 | 380 | ||
381 | int time_screen(void* ignored); | ||
382 | |||
383 | /* These are all static const'd from apps/menus/ *.c | 381 | /* These are all static const'd from apps/menus/ *.c |
384 | so little hack so we can use them */ | 382 | so little hack so we can use them */ |
385 | extern struct menu_item_ex | 383 | 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) | |||
77 | #endif | 77 | #endif |
78 | } | 78 | } |
79 | 79 | ||
80 | int screen_helper_getuifont(void) | 80 | static int screen_helper_getuifont(void) |
81 | { | 81 | { |
82 | #ifdef HAVE_LCD_BITMAP | 82 | #ifdef HAVE_LCD_BITMAP |
83 | return global_status.font_id[SCREEN_MAIN]; | 83 | return global_status.font_id[SCREEN_MAIN]; |
@@ -86,7 +86,7 @@ int screen_helper_getuifont(void) | |||
86 | #endif | 86 | #endif |
87 | } | 87 | } |
88 | 88 | ||
89 | void screen_helper_setuifont(int font) | 89 | static void screen_helper_setuifont(int font) |
90 | { | 90 | { |
91 | #ifdef HAVE_LCD_BITMAP | 91 | #ifdef HAVE_LCD_BITMAP |
92 | global_status.font_id[SCREEN_MAIN] = font; | 92 | 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) | |||
168 | } | 168 | } |
169 | 169 | ||
170 | static int first_idx_to_writeback = -1; | 170 | static int first_idx_to_writeback = -1; |
171 | void shortcuts_ata_idle_callback(void* data) | 171 | static void shortcuts_ata_idle_callback(void* data) |
172 | { | 172 | { |
173 | (void)data; | 173 | (void)data; |
174 | int fd; | 174 | int fd; |
@@ -223,7 +223,7 @@ void shortcuts_add(enum shortcut_type type, const char* value) | |||
223 | register_storage_idle_func(shortcuts_ata_idle_callback); | 223 | register_storage_idle_func(shortcuts_ata_idle_callback); |
224 | } | 224 | } |
225 | 225 | ||
226 | int readline_cb(int n, char *buf, void *parameters) | 226 | static int readline_cb(int n, char *buf, void *parameters) |
227 | { | 227 | { |
228 | (void)n; | 228 | (void)n; |
229 | (void)parameters; | 229 | (void)parameters; |
@@ -388,7 +388,7 @@ static enum themable_icons shortcut_menu_get_icon(int selected_item, void * data | |||
388 | return sc->icon; | 388 | return sc->icon; |
389 | } | 389 | } |
390 | 390 | ||
391 | int shortcut_menu_speak_item(int selected_item, void * data) | 391 | static int shortcut_menu_speak_item(int selected_item, void * data) |
392 | { | 392 | { |
393 | (void)data; | 393 | (void)data; |
394 | struct shortcut *sc = get_shortcut(selected_item); | 394 | 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) | |||
348 | return NULL; | 348 | return NULL; |
349 | } | 349 | } |
350 | 350 | ||
351 | size_t font_glyphs_to_bufsize(struct font *pf, int glyphs) | 351 | static size_t font_glyphs_to_bufsize(struct font *pf, int glyphs) |
352 | { | 352 | { |
353 | size_t bufsize; | 353 | size_t bufsize; |
354 | 354 | ||