From 93c1e23c479397fb14740d76746d6da4c6f8961c Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 18 Feb 2010 09:26:00 +0000 Subject: Mark some more functions that are not used outside of their files as static. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30632 b3059339-0415-0410-9bf9-f77b7e298cf2 --- asxparser.c | 4 ++-- input/input.c | 4 ++-- libao2/ao_sdl.c | 3 ++- libmenu/menu.c | 6 ++++-- playtree.c | 4 ++-- spudec.c | 5 +++-- 6 files changed, 15 insertions(+), 11 deletions(-) diff --git a/asxparser.c b/asxparser.c index 1505e8a625..931482e339 100644 --- a/asxparser.c +++ b/asxparser.c @@ -36,7 +36,7 @@ extern m_config_t* mconfig; ////// List utils -void +static void asx_list_add(void* list_ptr,void* entry){ void** list = *(void***)list_ptr; int c = 0; @@ -53,7 +53,7 @@ asx_list_add(void* list_ptr,void* entry){ } -void +static void asx_list_remove(void* list_ptr,void* entry,ASX_FreeFunc free_func) { void** list = *(void***)list_ptr; int c,e = -1; diff --git a/input/input.c b/input/input.c index b8ccca308d..baf0723a16 100644 --- a/input/input.c +++ b/input/input.c @@ -1494,7 +1494,7 @@ mp_input_get_input_from_name(char* name,int* keys) { #define BS_MAX 256 #define SPACE_CHAR " \n\r\t" -void +static void mp_input_bind_keys(const int keys[MP_MAX_KEY_DOWN+1], char* cmd) { int i = 0,j; mp_cmd_bind_t* bind = NULL; @@ -1538,7 +1538,7 @@ mp_input_bind_keys(const int keys[MP_MAX_KEY_DOWN+1], char* cmd) { memcpy(bind->input,keys,(MP_MAX_KEY_DOWN+1)*sizeof(int)); } -void +static void mp_input_add_binds(const mp_cmd_bind_t* list) { int i; for(i = 0 ; list[i].cmd ; i++) diff --git a/libao2/ao_sdl.c b/libao2/ao_sdl.c index 8df8c0ccf2..914e05eca7 100644 --- a/libao2/ao_sdl.c +++ b/libao2/ao_sdl.c @@ -120,7 +120,8 @@ static int control(int cmd,void *arg){ } // SDL Callback function -void outputaudio(void *unused, Uint8 *stream, int len) { +static void outputaudio(void *unused, Uint8 *stream, int len) +{ //SDL_MixAudio(stream, read_buffer(buffers, len), len, SDL_MIX_MAXVOLUME); //if(!full_buffers) printf("SDL: Buffer underrun!\n"); diff --git a/libmenu/menu.c b/libmenu/menu.c index c8cf349c94..a262d7a960 100644 --- a/libmenu/menu.c +++ b/libmenu/menu.c @@ -94,7 +94,8 @@ static menu_cmd_bindings_t *cmd_bindings = NULL; static int cmd_bindings_num = 0; -menu_cmd_bindings_t *get_cmd_bindings(const char *name) { +static menu_cmd_bindings_t *get_cmd_bindings(const char *name) +{ int i; for (i = 0; i < cmd_bindings_num; ++i) if (!strcasecmp(cmd_bindings[i].name, name)) @@ -725,7 +726,8 @@ int menu_text_num_lines(char* txt, int max_width) { return l; } -char* menu_text_get_next_line(char* txt, int max_width) { +static char* menu_text_get_next_line(char* txt, int max_width) +{ int i = 0; render_txt(txt); while (*txt) { diff --git a/playtree.c b/playtree.c index f06d1eebea..f6f068ec33 100644 --- a/playtree.c +++ b/playtree.c @@ -415,7 +415,7 @@ play_tree_set_params_from(play_tree_t* dest,play_tree_t* src) { } // all children if deep < 0 -void +static void play_tree_set_flag(play_tree_t* pt, int flags , int deep) { play_tree_t* i; @@ -428,7 +428,7 @@ play_tree_set_flag(play_tree_t* pt, int flags , int deep) { } } -void +static void play_tree_unset_flag(play_tree_t* pt, int flags , int deep) { play_tree_t* i; diff --git a/spudec.c b/spudec.c index 51a70ec708..a79d708e38 100644 --- a/spudec.c +++ b/spudec.c @@ -767,8 +767,9 @@ static void scale_image(int x, int y, scale_pixel* table_x, scale_pixel* table_y } } -void sws_spu_image(unsigned char *d1, unsigned char *d2, int dw, int dh, int ds, - unsigned char *s1, unsigned char *s2, int sw, int sh, int ss) +static void sws_spu_image(unsigned char *d1, unsigned char *d2, int dw, int dh, + int ds, unsigned char *s1, unsigned char *s2, int sw, + int sh, int ss) { struct SwsContext *ctx; static SwsFilter filter; -- cgit v1.2.3