avoid unnecessarily exporting functions to public

mark them static

src/midi/fluid_midi.c

@@ -25,6 +25,9 @@
 
 
 static int fluid_midi_event_length(unsigned char event);
+static int fluid_isasciistring(char* s);
+static long fluid_getlength(unsigned char *s);
+
 
 /* Read the entire contents of a file into memory, allocating enough memory
  * for the file, and returning the length and the buffer.
@@ -35,6 +38,43 @@ static char* fluid_file_read_full(fluid_file fp, size_t* length);
 static void fluid_midi_event_set_sysex_LOCAL(fluid_midi_event_t *evt, int type, void *data, int size, int dynamic);
 #define READ_FULL_INITIAL_BUFLEN 1024
 
+static fluid_track_t* new_fluid_track(int num);
+static void delete_fluid_track(fluid_track_t* track);
+static int fluid_track_set_name(fluid_track_t* track, char* name);
+static int fluid_track_add_event(fluid_track_t* track, fluid_midi_event_t* evt);
+static fluid_midi_event_t* fluid_track_next_event(fluid_track_t* track);
+static int fluid_track_get_duration(fluid_track_t* track);
+static int fluid_track_reset(fluid_track_t* track);
+
+static int fluid_track_send_events(fluid_track_t* track,
+			   fluid_synth_t* synth,
+			   fluid_player_t* player,
+			   unsigned int ticks);
+
+
+static int fluid_player_add_track(fluid_player_t* player, fluid_track_t* track);
+static int fluid_player_callback(void* data, unsigned int msec);
+static int fluid_player_reset(fluid_player_t* player);
+static int fluid_player_load(fluid_player_t* player, fluid_playlist_item *item);
+static void fluid_player_advancefile(fluid_player_t *player);
+static void fluid_player_playlist_load(fluid_player_t *player, unsigned int msec);
+
+static fluid_midi_file* new_fluid_midi_file(const char* buffer, size_t length);
+static void delete_fluid_midi_file(fluid_midi_file* mf);
+static int fluid_midi_file_read_mthd(fluid_midi_file* midifile);
+static int fluid_midi_file_load_tracks(fluid_midi_file* midifile, fluid_player_t* player);
+static int fluid_midi_file_read_track(fluid_midi_file* mf, fluid_player_t* player, int num);
+static int fluid_midi_file_read_event(fluid_midi_file* mf, fluid_track_t* track);
+static int fluid_midi_file_read_varlen(fluid_midi_file* mf);
+static int fluid_midi_file_getc(fluid_midi_file* mf);
+static int fluid_midi_file_push(fluid_midi_file* mf, int c);
+static int fluid_midi_file_read(fluid_midi_file* mf, void* buf, int len);
+static int fluid_midi_file_skip(fluid_midi_file* mf, int len);
+static int fluid_midi_file_eof(fluid_midi_file* mf);
+static int fluid_midi_file_read_tracklen(fluid_midi_file* mf);
+static int fluid_midi_file_eot(fluid_midi_file* mf);
+static int fluid_midi_file_get_division(fluid_midi_file* midifile);
+
 
 /***************************************************************
  *
@@ -274,6 +314,9 @@ fluid_midi_file_load_tracks(fluid_midi_file *mf, fluid_player_t *player)
 int
 fluid_isasciistring(char *s)
 {
+    /* From ctype.h */
+    #define fluid_isascii(c)    (((c) & ~0x7f) == 0)
+
     int i;
     int len = (int) FLUID_STRLEN(s);
     for (i = 0; i < len; i++) {
@@ -282,6 +325,8 @@ fluid_isasciistring(char *s)
         }
     }
     return 1;
+    
+    #undef fluid_isascii
 }
 
 /*

src/midi/fluid_midi.h

@@ -215,11 +215,6 @@ enum fluid_driver_status
  *         TYPE DEFINITIONS & FUNCTION DECLARATIONS
  */
 
-/* From ctype.h */
-#define fluid_isascii(c)    (((c) & ~0x7f) == 0)
-
-
-
 /*
  * fluid_midi_event_t
  */
@@ -248,19 +243,6 @@ struct _fluid_track_t {
 
 typedef struct _fluid_track_t fluid_track_t;
 
-fluid_track_t* new_fluid_track(int num);
-void delete_fluid_track(fluid_track_t* track);
-int fluid_track_set_name(fluid_track_t* track, char* name);
-int fluid_track_add_event(fluid_track_t* track, fluid_midi_event_t* evt);
-fluid_midi_event_t* fluid_track_next_event(fluid_track_t* track);
-int fluid_track_get_duration(fluid_track_t* track);
-int fluid_track_reset(fluid_track_t* track);
-
-int fluid_track_send_events(fluid_track_t* track,
-			   fluid_synth_t* synth,
-			   fluid_player_t* player,
-			   unsigned int ticks);
-
 #define fluid_track_eot(track)  ((track)->cur == NULL)
 
 
@@ -309,11 +291,6 @@ struct _fluid_player_t {
   void* playback_userdata; /* pointer to user-defined data passed to playback_callback function */
 };
 
-int fluid_player_add_track(fluid_player_t* player, fluid_track_t* track);
-int fluid_player_callback(void* data, unsigned int msec);
-int fluid_player_reset(fluid_player_t* player);
-int fluid_player_load(fluid_player_t* player, fluid_playlist_item *item);
-
 void fluid_player_settings(fluid_settings_t* settings);
 
 
@@ -342,21 +319,6 @@ typedef struct {
   int dtime;
 } fluid_midi_file;
 
-fluid_midi_file* new_fluid_midi_file(const char* buffer, size_t length);
-void delete_fluid_midi_file(fluid_midi_file* mf);
-int fluid_midi_file_read_mthd(fluid_midi_file* midifile);
-int fluid_midi_file_load_tracks(fluid_midi_file* midifile, fluid_player_t* player);
-int fluid_midi_file_read_track(fluid_midi_file* mf, fluid_player_t* player, int num);
-int fluid_midi_file_read_event(fluid_midi_file* mf, fluid_track_t* track);
-int fluid_midi_file_read_varlen(fluid_midi_file* mf);
-int fluid_midi_file_getc(fluid_midi_file* mf);
-int fluid_midi_file_push(fluid_midi_file* mf, int c);
-int fluid_midi_file_read(fluid_midi_file* mf, void* buf, int len);
-int fluid_midi_file_skip(fluid_midi_file* mf, int len);
-int fluid_midi_file_eof(fluid_midi_file* mf);
-int fluid_midi_file_read_tracklen(fluid_midi_file* mf);
-int fluid_midi_file_eot(fluid_midi_file* mf);
-int fluid_midi_file_get_division(fluid_midi_file* midifile);
 
 
 #define FLUID_MIDI_PARSER_MAX_DATA_SIZE 1024    /**< Maximum size of MIDI parameters/data (largest is SYSEX data) */
@@ -373,8 +335,5 @@ struct _fluid_midi_parser_t {
   fluid_midi_event_t event;        /* The event, that is returned to the MIDI driver. */
 };
 
-int fluid_isasciistring(char* s);
-long fluid_getlength(unsigned char *s);
-
 
 #endif /* _FLUID_MIDI_H */

src/synth/fluid_synth.c

@@ -496,7 +496,7 @@ struct _fluid_sample_timer_t
 /*
  * fluid_sample_timer_process - called when synth->ticks is updated
  */
-void fluid_sample_timer_process(fluid_synth_t* synth)
+static void fluid_sample_timer_process(fluid_synth_t* synth)
 {
 	fluid_sample_timer_t* st, *stnext;
 	long msec;

src/utils/fluid_hash.c

@@ -93,7 +93,7 @@ static const unsigned int primes[] =
 
 static const unsigned int nprimes = FLUID_N_ELEMENTS(primes);
 
-unsigned int
+static unsigned int
 spaced_primes_closest (unsigned int num)
 {
   unsigned int i;
@@ -984,6 +984,7 @@ fluid_hashtable_foreach_remove_or_steal (fluid_hashtable_t *hashtable,
   return deleted;
 }
 
+#if 0
 /**
  * fluid_hashtable_foreach_remove:
  * @hashtable: a #fluid_hashtable_t.
@@ -1001,7 +1002,7 @@ fluid_hashtable_foreach_remove_or_steal (fluid_hashtable_t *hashtable,
  *
  * Return value: the number of key/value pairs removed.
  **/
-unsigned int
+static unsigned int
 fluid_hashtable_foreach_remove (fluid_hashtable_t *hashtable,
                                 fluid_hr_func_t func, void *user_data)
 {
@@ -1010,6 +1011,7 @@ fluid_hashtable_foreach_remove (fluid_hashtable_t *hashtable,
 
   return fluid_hashtable_foreach_remove_or_steal (hashtable, func, user_data, TRUE);
 }
+#endif
 
 /**
  * fluid_hashtable_foreach_steal:

src/utils/fluid_sys.c

@@ -1066,7 +1066,7 @@ fluid_thread_join(fluid_thread_t* thread)
 }
 
 
-fluid_thread_return_t
+static fluid_thread_return_t
 fluid_timer_run (void *data)
 {
   fluid_timer_t *timer;