From e71750b7a398197f3884819d0713107b2ce04f08 Mon Sep 17 00:00:00 2001 From: Bertrik Sikken Date: Thu, 3 Nov 2011 23:32:49 +0000 Subject: Make local functions and variables static where possible git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30897 a1c6a512-1295-4272-9138-f99709370657 --- apps/dsp.c | 2 +- firmware/font.c | 3 +-- firmware/font_cache.c | 2 +- firmware/target/arm/ipod/button-clickwheel.c | 8 ++++---- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/apps/dsp.c b/apps/dsp.c index 2113d251a1..d9c097af66 100644 --- a/apps/dsp.c +++ b/apps/dsp.c @@ -344,7 +344,7 @@ static int move_callback(int handle, void* current, void* new) return BUFLIB_CB_OK; } -void lock_sample_buf( bool lock ) +static void lock_sample_buf( bool lock ) { if ( lock ) big_sample_locks++; diff --git a/firmware/font.c b/firmware/font.c index eb15bb7420..8e576016bd 100644 --- a/firmware/font.c +++ b/firmware/font.c @@ -801,8 +801,7 @@ const unsigned char* font_get_bits(struct font* pf, unsigned short char_code) return bits; } -void font_path_to_glyph_path( const char *font_path, char *glyph_path) - +static void font_path_to_glyph_path( const char *font_path, char *glyph_path) { /* take full file name, cut extension, and add .glyphcache */ strlcpy(glyph_path, font_path, MAX_PATH); diff --git a/firmware/font_cache.c b/firmware/font_cache.c index 24a5faf385..4624b1866e 100644 --- a/firmware/font_cache.c +++ b/firmware/font_cache.c @@ -76,7 +76,7 @@ void font_cache_create( * search and new search. Returns a negative of insertion point if * not found. ************************************************************************/ -int search( struct font_cache* fcache, +static int search(struct font_cache* fcache, unsigned short char_code, int *p_insertion_point ) { diff --git a/firmware/target/arm/ipod/button-clickwheel.c b/firmware/target/arm/ipod/button-clickwheel.c index 2c15e0ebd7..2abe25f2e3 100644 --- a/firmware/target/arm/ipod/button-clickwheel.c +++ b/firmware/target/arm/ipod/button-clickwheel.c @@ -68,16 +68,16 @@ int old_wheel_value = -1; int new_wheel_value = 0; -int repeat = 0; +static int repeat = 0; int wheel_delta = 0; bool wheel_is_touched = false; unsigned int accumulated_wheel_delta = 0; -unsigned int wheel_repeat = 0; +static unsigned int wheel_repeat = 0; unsigned int wheel_velocity = 0; -unsigned long last_wheel_usec = 0; +static unsigned long last_wheel_usec = 0; /* Variable to use for setting button status in interrupt handler */ -int int_btn = BUTTON_NONE; +static int int_btn = BUTTON_NONE; #ifdef HAVE_WHEEL_POSITION static int wheel_position = -1; static bool send_events = true; -- cgit v1.2.3