[MPlayer-cvslog] r30632 - in trunk: asxparser.c input/input.c libao2/ao_sdl.c libmenu/menu.c playtree.c spudec.c

[diego]

Author: diego
Date: Thu Feb 18 10:26:00 2010
New Revision: 30632

Log:
Mark some more functions that are not used outside of their files as static.

Modified:
   trunk/asxparser.c
   trunk/input/input.c
   trunk/libao2/ao_sdl.c
   trunk/libmenu/menu.c
   trunk/playtree.c
   trunk/spudec.c

Modified: trunk/asxparser.c
==============================================================================
--- trunk/asxparser.c	Thu Feb 18 01:18:50 2010	(r30631)
+++ trunk/asxparser.c	Thu Feb 18 10:26:00 2010	(r30632)
@@ -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;

Modified: trunk/input/input.c
==============================================================================
--- trunk/input/input.c	Thu Feb 18 01:18:50 2010	(r30631)
+++ trunk/input/input.c	Thu Feb 18 10:26:00 2010	(r30632)
@@ -1494,7 +1494,7 @@ mp_input_get_input_from_name(char* name,
 #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
   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++)

Modified: trunk/libao2/ao_sdl.c
==============================================================================
--- trunk/libao2/ao_sdl.c	Thu Feb 18 01:18:50 2010	(r30631)
+++ trunk/libao2/ao_sdl.c	Thu Feb 18 10:26:00 2010	(r30632)
@@ -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");
 

Modified: trunk/libmenu/menu.c
==============================================================================
--- trunk/libmenu/menu.c	Thu Feb 18 01:18:50 2010	(r30631)
+++ trunk/libmenu/menu.c	Thu Feb 18 10:26:00 2010	(r30632)
@@ -94,7 +94,8 @@ static menu_cmd_bindings_t *cmd_bindings
 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 m
   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) {

Modified: trunk/playtree.c
==============================================================================
--- trunk/playtree.c	Thu Feb 18 01:18:50 2010	(r30631)
+++ trunk/playtree.c	Thu Feb 18 10:26:00 2010	(r30632)
@@ -415,7 +415,7 @@ play_tree_set_params_from(play_tree_t* d
 }
 
 // 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 
   }
 }
 
-void
+static void
 play_tree_unset_flag(play_tree_t* pt, int flags , int deep) {
   play_tree_t*  i;
 

Modified: trunk/spudec.c
==============================================================================
--- trunk/spudec.c	Thu Feb 18 01:18:50 2010	(r30631)
+++ trunk/spudec.c	Thu Feb 18 10:26:00 2010	(r30632)
@@ -767,8 +767,9 @@ static void scale_image(int x, int y, sc
   }
 }
 
-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;