From ba03cb4aea212553f47a9da672fdd897e9f2e620 Mon Sep 17 00:00:00 2001 From: Bertrik Sikken Date: Sat, 31 Dec 2011 20:29:08 +0000 Subject: Make local functions static in clock and chessbox plugin git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31505 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/clock/clock.c | 4 ++-- apps/plugins/clock/clock_counter.c | 2 +- apps/plugins/clock/clock_draw.c | 10 +++++----- apps/plugins/clock/clock_draw_analog.c | 22 +++++++++++----------- apps/plugins/clock/clock_draw_binary.c | 2 +- apps/plugins/clock/clock_menu.c | 11 ++++++----- apps/plugins/clock/clock_settings.c | 14 +++++++------- 7 files changed, 33 insertions(+), 32 deletions(-) (limited to 'apps/plugins/clock') diff --git a/apps/plugins/clock/clock.c b/apps/plugins/clock/clock.c index 641a1e7ad3..d287c75598 100644 --- a/apps/plugins/clock/clock.c +++ b/apps/plugins/clock/clock.c @@ -57,7 +57,7 @@ const struct button_mapping* plugin_contexts[]={ /************************** * Cleanup on plugin return *************************/ -void cleanup(void) +static void cleanup(void) { clock_draw_restore_colors(); if(clock_settings.general.save_settings == 1) @@ -68,7 +68,7 @@ void cleanup(void) } /* puts the current time into the time struct */ -void clock_update_time( struct time* time){ +static void clock_update_time( struct time* time){ struct tm* current_time = rb->get_time(); time->hour = current_time->tm_hour; time->minute = current_time->tm_min; diff --git a/apps/plugins/clock/clock_counter.c b/apps/plugins/clock/clock_counter.c index 7137eeaf38..ce29e4ce91 100644 --- a/apps/plugins/clock/clock_counter.c +++ b/apps/plugins/clock/clock_counter.c @@ -7,7 +7,7 @@ void counter_init(struct counter* counter){ counter->paused=true; } -int counter_get_ticks_since_last_pause(struct counter* counter){ +static int counter_get_ticks_since_last_pause(struct counter* counter){ if(!counter->paused) return(*rb->current_tick - counter->ticks_at_last_unpause); return(0); diff --git a/apps/plugins/clock/clock_draw.c b/apps/plugins/clock/clock_draw.c index 411a7f1545..ce5006d46d 100644 --- a/apps/plugins/clock/clock_draw.c +++ b/apps/plugins/clock/clock_draw.c @@ -26,7 +26,7 @@ #include "clock_draw_binary.h" #include "clock_settings.h" -void black_background(struct screen* display){ +static void black_background(struct screen* display){ #if (LCD_DEPTH > 1) || (defined(LCD_REMOTE_DEPTH) && (LCD_REMOTE_DEPTH > 1)) if(display->depth>1){ display->set_background(LCD_BLACK); @@ -39,7 +39,7 @@ void black_background(struct screen* display){ } } -void white_background(struct screen* display){ +static void white_background(struct screen* display){ #if (LCD_DEPTH > 1) || (defined(LCD_REMOTE_DEPTH) && (LCD_REMOTE_DEPTH > 1)) if(display->depth>1){ #if defined(HAVE_LCD_COLOR) @@ -53,18 +53,18 @@ void white_background(struct screen* display){ display->clear_display(); } -bool skin_require_black_background(int mode, int skin){ +static bool skin_require_black_background(int mode, int skin){ return((mode==BINARY && skin==2) || (mode==DIGITAL && skin==1 )); } -void skin_set_background(struct screen* display, int mode, int skin){ +static void skin_set_background(struct screen* display, int mode, int skin){ if(skin_require_black_background(mode, skin) ) black_background(display); else white_background(display); } -void skin_restore_background(struct screen* display, int mode, int skin){ +static void skin_restore_background(struct screen* display, int mode, int skin){ if(skin_require_black_background(mode, skin) ) white_background(display); } diff --git a/apps/plugins/clock/clock_draw_analog.c b/apps/plugins/clock/clock_draw_analog.c index b8ec308eed..bda7241d33 100644 --- a/apps/plugins/clock/clock_draw_analog.c +++ b/apps/plugins/clock/clock_draw_analog.c @@ -37,7 +37,7 @@ #define SECOND_ANGLE(second) (6 * (second)) /* Note that the given angle's origin is midday and not 3 o'clock */ -void polar_to_cartesian(int a, int r, int* x, int* y) +static void polar_to_cartesian(int a, int r, int* x, int* y) { #if CONFIG_LCD == LCD_SSD1815 /* Correct non-square pixel aspect of archos recorder LCD */ @@ -48,7 +48,7 @@ void polar_to_cartesian(int a, int r, int* x, int* y) *y = (fp14_sin(a-90) * r) >> 14; } -void polar_to_cartesian_screen_centered(struct screen * display, +static void polar_to_cartesian_screen_centered(struct screen * display, int a, int r, int* x, int* y) { polar_to_cartesian(a, r, x, y); @@ -56,7 +56,7 @@ void polar_to_cartesian_screen_centered(struct screen * display, *y+=display->getheight()/2; } -void angle_to_square(int square_width, int square_height, +static void angle_to_square(int square_width, int square_height, int a, int* x, int* y) { a = (a+360-90)%360; @@ -82,7 +82,7 @@ void angle_to_square(int square_width, int square_height, } } -void angle_to_square_screen_centered(struct screen * display, +static void angle_to_square_screen_centered(struct screen * display, int square_width, int square_height, int a, int* x, int* y) { @@ -91,7 +91,7 @@ void angle_to_square_screen_centered(struct screen * display, *y+=display->getheight()/2; } -void draw_hand(struct screen* display, int angle, +static void draw_hand(struct screen* display, int angle, int radius, int thickness, bool round) { int x1, y1; /* the longest */ @@ -115,7 +115,7 @@ void draw_hand(struct screen* display, int angle, rb->lcd_drawline(x1, y1, x3, y3); } -void draw_hands(struct screen* display, int hour, int minute, int second, +static void draw_hands(struct screen* display, int hour, int minute, int second, int thickness, bool round, bool draw_seconds) { if(draw_seconds){ @@ -128,7 +128,7 @@ void draw_hands(struct screen* display, int hour, int minute, int second, ANALOG_HOUR_RADIUS(display, round), thickness+2, round); } -void draw_counter(struct screen* display, struct counter* counter) +static void draw_counter(struct screen* display, struct counter* counter) { char buffer[10]; int second_str_w, hour_str_w, str_h; @@ -150,7 +150,7 @@ void draw_counter(struct screen* display, struct counter* counter) display->getheight()-str_h); } -void draw_date(struct screen* display, struct time* time, int date_format) +static void draw_date(struct screen* display, struct time* time, int date_format) { char buffer[10]; int year_str_w, monthday_str_w, str_h; @@ -176,7 +176,7 @@ void draw_date(struct screen* display, struct time* time, int date_format) display->getheight()-monthday_line*str_h); } -void draw_border(struct screen* display, int skin) +static void draw_border(struct screen* display, int skin) { /* Draws square dots every 5 minutes */ int i; @@ -197,7 +197,7 @@ void draw_border(struct screen* display, int skin) } } -void draw_hour(struct screen* display, struct time* time, +static void draw_hour(struct screen* display, struct time* time, bool show_seconds, int skin) { int hour=time->hour; @@ -220,7 +220,7 @@ void draw_hour(struct screen* display, struct time* time, 0, skin, show_seconds); } -void draw_center_cover(struct screen* display) +static void draw_center_cover(struct screen* display) { display->hline((display->getwidth()/2)-1, (display->getwidth()/2)+1, (display->getheight()/2)+3); diff --git a/apps/plugins/clock/clock_draw_binary.c b/apps/plugins/clock/clock_draw_binary.c index 620788dc5e..611ab1b371 100644 --- a/apps/plugins/clock/clock_draw_binary.c +++ b/apps/plugins/clock/clock_draw_binary.c @@ -25,7 +25,7 @@ const struct picture* binary_skin[]={binary,digits,segments}; -void print_binary(char* buffer, int number, int nb_bits){ +static void print_binary(char* buffer, int number, int nb_bits){ int i; int mask=1; buffer[nb_bits]='\0'; diff --git a/apps/plugins/clock/clock_menu.c b/apps/plugins/clock/clock_menu.c index ed0027305b..a597664f49 100644 --- a/apps/plugins/clock/clock_menu.c +++ b/apps/plugins/clock/clock_menu.c @@ -22,6 +22,7 @@ #include "clock.h" #include "clock_bitmaps.h" #include "clock_settings.h" +#include "clock_menu.h" #include "lib/playback_control.h" /* Option structs (possible selections per each option) */ @@ -57,7 +58,7 @@ static const struct opt_items hour_format_text[] = { * Select a mode, returs true when the mode has been selected * (we go back to clock display then) **************/ -bool menu_mode_selector(void){ +static bool menu_mode_selector(void){ MENUITEM_STRINGLIST(menu,"Mode Selector",NULL, "Analog", "Digital", "Binary"); if(rb->do_menu(&menu, &clock_settings.mode, NULL, false) >=0) @@ -68,7 +69,7 @@ bool menu_mode_selector(void){ /********************** * Analog settings menu *********************/ -void menu_analog_settings(void) +static void menu_analog_settings(void) { int selection=0, result=0; @@ -99,7 +100,7 @@ void menu_analog_settings(void) /*********************** * Digital settings menu **********************/ -void menu_digital_settings(void){ +static void menu_digital_settings(void){ int selection=0, result=0; MENUITEM_STRINGLIST(menu,"Digital Mode Settings",NULL,"Show Seconds", @@ -125,7 +126,7 @@ void menu_digital_settings(void){ /*********************************************************** * Confirm resetting of settings, used in general_settings() **********************************************************/ -void confirm_reset(void){ +static void confirm_reset(void){ int result=0; rb->set_option("Reset all settings?", &result, INT, noyes_text, 2, NULL); @@ -141,7 +142,7 @@ void confirm_reset(void){ /************************************ * General settings. Reset, save, etc ***********************************/ -void menu_general_settings(void){ +static void menu_general_settings(void){ int selection=0, result=0; MENUITEM_STRINGLIST(menu,"General Settings",NULL, diff --git a/apps/plugins/clock/clock_settings.c b/apps/plugins/clock/clock_settings.c index 6dd1b5ee65..e559e1fe1b 100644 --- a/apps/plugins/clock/clock_settings.c +++ b/apps/plugins/clock/clock_settings.c @@ -51,7 +51,7 @@ struct clock_settings clock_settings; * we can know at saving time if changes have been made */ struct clock_settings hdd_clock_settings; -bool settings_needs_saving(struct clock_settings* settings){ +static bool settings_needs_saving(struct clock_settings* settings){ return(rb->memcmp(settings, &hdd_clock_settings, sizeof(*settings))); } @@ -99,8 +99,8 @@ void clock_settings_skin_previous(struct clock_settings* settings){ settings->skin[settings->mode]=max_skin[settings->mode]-1; } -enum settings_file_status clock_settings_load(struct clock_settings* settings, - char* filename){ +static enum settings_file_status clock_settings_load( + struct clock_settings* settings,char* filename){ int fd = rb->open(filename, O_RDONLY); if(fd >= 0){ /* does file exist? */ /* basic consistency check */ @@ -117,8 +117,8 @@ enum settings_file_status clock_settings_load(struct clock_settings* settings, return(ERRLOAD); } -enum settings_file_status clock_settings_save(struct clock_settings* settings, - char* filename){ +static enum settings_file_status clock_settings_save( + struct clock_settings* settings, char* filename){ int fd = rb->creat(filename, 0666); if(fd >= 0){ /* does file exist? */ rb->write (fd, settings, sizeof(*settings)); @@ -128,7 +128,7 @@ enum settings_file_status clock_settings_save(struct clock_settings* settings, return(ERRSAVE); } -void draw_logo(struct screen* display){ +static void draw_logo(struct screen* display){ #ifdef HAVE_LCD_COLOR if(display->is_color){ display->set_foreground(LCD_BLACK); @@ -141,7 +141,7 @@ void draw_logo(struct screen* display){ picture_draw(display, logo, 0, 0); } -void draw_message(struct screen* display, int msg, int y){ +static void draw_message(struct screen* display, int msg, int y){ const struct picture* message = &(messages[display->screen_type]); display->set_drawmode(DRMODE_SOLID|DRMODE_INVERSEVID); display->fillrect(0, display->getheight()-message->slide_height, -- cgit v1.2.3