fix function prototypes

Add missing prototypes, and fix wrong prototypes.  Convert lots of
functions to "static" when they are only used within the current
source file.

diff --git a/src/command.c b/src/command.c
index 4f4a8e938b0a6f0f23951f2abb63315d33729763..733bf6a314567d26a04b78a4c84e26848b1f5640 100644 (file)
--- a/src/command.c
+++ b/src/command.c
@@ -30,6 +30,8 @@
 #include "config.h"
 #include "ncmpc.h"
 #include "command.h"
+#include "mpdclient.h"
+#include "screen.h"
 
 #undef DEBUG_KEYS
 
@@ -39,9 +41,6 @@
 #define DK(x)
 #endif
 
-extern void sigstop(void);
-extern void screen_resize(void);
-
 #define BS   KEY_BACKSPACE
 #define DEL  KEY_DC
 #define UP   KEY_UP
@@ -289,7 +288,7 @@ command_dump_keys(void)
     }
 }
 
-int
+static int
 set_key_flags(command_definition_t *cp, command_t command, int flags)
 {
   int i;

diff --git a/src/main.c b/src/main.c
index 022802c8027d31b2d252d2c7075b1cc1f21ac713..6a6ba34f36bf4ff5c3b9ca8adfe3e8c414a10cfc 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -108,7 +108,7 @@ update_xterm_title(void)
     }
 }
 
-void
+static void
 exit_and_cleanup(void)
 {
   screen_exit();
@@ -128,14 +128,15 @@ exit_and_cleanup(void)
     g_timer_destroy(timer);
 }
 
-void
+static void
 catch_sigint( int sig )
 {
        printf("\n%s\n", _("Exiting..."));
        exit(EXIT_SUCCESS);
 }
 
-void
+
+static void
 catch_sigcont( int sig )
 {
        D("catch_sigcont()\n");

diff --git a/src/mpdclient.h b/src/mpdclient.h
index 5f231c3833386ae10a661210fa1dbe626d8776c1..c8cb8686b6b1d0fce6e6f07362970e86f2c62945 100644 (file)
--- a/src/mpdclient.h
+++ b/src/mpdclient.h
@@ -69,6 +69,10 @@ typedef struct
 } mpdclient_t;
 
 /** functions ***************************************************************/
+
+gint
+mpdclient_finish_command(mpdclient_t *c);
+
 mpdclient_t *mpdclient_new(void);
 mpdclient_t *mpdclient_free(mpdclient_t *c);
 gint mpdclient_connect(mpdclient_t *c, gchar *host, gint port,

diff --git a/src/ncmpc.h b/src/ncmpc.h
index 9caf8601a2aa45795f4b46c6770e8f0b082095c1..0d87ebaecd6a32f8b965442af42f98934575a67b 100644 (file)
--- a/src/ncmpc.h
+++ b/src/ncmpc.h
@@ -82,4 +82,7 @@ void D(const char *format, ...);
 #define DEFAULT_SCROLL TRUE
 #define DEFAULT_SCROLL_SEP " *** "
 
+void
+sigstop(void);
+
 #endif /* NCMPC_H */

diff --git a/src/screen.c b/src/screen.c
index af3417a3ed104e8079fc732e656b21c84302a489..4624974c1ad6e157db1fe58189119b32b8ae6b4d 100644 (file)
--- a/src/screen.c
+++ b/src/screen.c
@@ -126,7 +126,7 @@ lookup_mode(gint id)
        return -1;
 }
 
-gint get_cur_mode_id()
+gint get_cur_mode_id(void)
 {
        return screens[screen->mode].id;
 }
@@ -525,7 +525,7 @@ screen_status_printf(const char *format, ...)
 }
 
 void
-ncurses_init()
+ncurses_init(void)
 {
 
        /* initialize the curses library */
@@ -623,6 +623,7 @@ ncurses_init()
                }
 }
 
+int
 screen_init(mpdclient_t *c)
 {
        gint i;

diff --git a/src/screen.h b/src/screen.h
index 4f3057df8172b7ba4292c71d9a1a7f3f3f52bd17..0ecd9ef2c2a33f3fa7d34cd7f7b04f0196479287 100644 (file)
--- a/src/screen.h
+++ b/src/screen.h
@@ -65,6 +65,8 @@ typedef struct {
        screen_get_lw_fn_t get_lw;
 } screen_functions_t;
 
+void
+ncurses_init(void);
 
 int screen_init(mpdclient_t *c);
 int screen_exit(void);
@@ -79,9 +81,30 @@ void screen_cmd(mpdclient_t *c, command_t cmd);
 gint screen_get_id(const char *name);
 
 
-gint get_cur_mode_id();
+gint get_cur_mode_id(void);
 int screen_get_mouse_event(mpdclient_t *c,
                           list_window_t *lw, int lw_length, 
                           unsigned long *bstate, int *row);
 
+screen_functions_t *
+get_screen_search(void);
+
+screen_functions_t *
+get_screen_browse(void);
+
+screen_functions_t *
+get_screen_playlist(void);
+
+screen_functions_t *
+get_screen_help(void);
+
+screen_functions_t *
+get_screen_lyrics(void);
+
+screen_functions_t *
+get_screen_keydef(void);
+
+screen_functions_t *
+get_screen_clock(void);
+
 #endif

diff --git a/src/screen_file.c b/src/screen_file.c
index 35245a194f6050fea2e59ef53688dcbf809126d1..0dbaab45c64bd47896f93f8813bfb42f461e2a58 100644 (file)
--- a/src/screen_file.c
+++ b/src/screen_file.c
@@ -740,8 +740,8 @@ browse_cmd(screen_t *screen, mpdclient_t *c, command_t cmd)
        return list_window_cmd(lw, filelist->length, cmd);
 }
 
-list_window_t *
-get_filelist_window()
+static list_window_t *
+get_filelist_window(void)
 {
        return lw;
 }

diff --git a/src/screen_lyrics.c b/src/screen_lyrics.c
index 4417d138596a9dad125e3b56c9fb8c6c89b80ae7..793eae7eeb672f53aef2d9f81ec27d6e4012f11d 100644 (file)
--- a/src/screen_lyrics.c
+++ b/src/screen_lyrics.c
@@ -46,7 +46,7 @@ int src_selection;
 
 static void lyrics_paint(screen_t *screen, mpdclient_t *c);
 
-FILE *create_lyr_file(char *artist, char *title)
+static FILE *create_lyr_file(char *artist, char *title)
 {
        char path[1024];
 
@@ -65,7 +65,7 @@ FILE *create_lyr_file(char *artist, char *title)
 }
 
 
-int store_lyr_hd()
+static int store_lyr_hd(void)
 {
        char artist[512];
        char title[512];
@@ -96,13 +96,13 @@ int store_lyr_hd()
 }
 
 
-void check_repaint()
+static void check_repaint(void)
 {
         if(screen_get_id("lyrics") == get_cur_mode_id())lyrics_paint(NULL, NULL);
 }
 
 
-gpointer get_lyr(void *c)
+static gpointer get_lyr(void *c)
 {
        mpd_Status *status = ((retrieval_spec*)c)->client->status;
        mpd_Song *cur = ((retrieval_spec*)c)->client->song;

diff --git a/src/screen_play.c b/src/screen_play.c
index 1878bd9ce8ae9bd85854a67773657834539d7e39..6cd28d6ace2c8997a5b8628d001ab31faf77d901 100644 (file)
--- a/src/screen_play.c
+++ b/src/screen_play.c
@@ -37,6 +37,7 @@
 #include "colors.h"
 #include "screen.h"
 #include "screen_utils.h"
+#include "screen_play.h"
 
 #define MAX_SONG_LENGTH 512
 
@@ -120,7 +121,8 @@ center_playing_item(screen_t *screen, mpdclient_t *c)
        return 0;
 }
 
-void save_pre_completion_cb(GCompletion *gcmp, gchar *line, void *data)
+static void
+save_pre_completion_cb(GCompletion *gcmp, gchar *line, void *data)
 {
        completion_callback_data_t *tmp = (completion_callback_data_t *)data;
        GList **list = tmp->list;
@@ -133,8 +135,9 @@ void save_pre_completion_cb(GCompletion *gcmp, gchar *line, void *data)
        }
 }
 
-void save_post_completion_cb(GCompletion *gcmp, gchar *line, GList *items,
-                            void *data)
+static void
+save_post_completion_cb(GCompletion *gcmp, gchar *line, GList *items,
+                       void *data)
 {
        completion_callback_data_t *tmp = (completion_callback_data_t *)data;
        screen_t *screen = tmp->screen;
@@ -227,8 +230,8 @@ playlist_save(screen_t *screen, mpdclient_t *c, char *name, char *defaultname)
   return 0;
 }
 
-void add_dir(GCompletion *gcmp, gchar *dir, GList **dir_list, GList **list,
-             mpdclient_t *c)
+static void add_dir(GCompletion *gcmp, gchar *dir, GList **dir_list,
+                    GList **list, mpdclient_t *c)
 {
   g_completion_remove_items(gcmp, *list);
   *list = string_list_remove(*list, dir);
@@ -237,7 +240,7 @@ void add_dir(GCompletion *gcmp, gchar *dir, GList **dir_list, GList **list,
   *dir_list = g_list_append(*dir_list, g_strdup(dir));
 }
 
-void add_pre_completion_cb(GCompletion *gcmp, gchar *line, void *data)
+static void add_pre_completion_cb(GCompletion *gcmp, gchar *line, void *data)
 {
   completion_callback_data_t *tmp = (completion_callback_data_t *)data;
   GList **dir_list = tmp->dir_list;
@@ -259,8 +262,8 @@ void add_pre_completion_cb(GCompletion *gcmp, gchar *line, void *data)
     }
 }
 
-void add_post_completion_cb(GCompletion *gcmp, gchar *line, GList *items,
-                            void *data)
+static void add_post_completion_cb(GCompletion *gcmp, gchar *line,
+                                   GList *items, void *data)
 {
   completion_callback_data_t *tmp = (completion_callback_data_t *)data;
   GList **dir_list = tmp->dir_list;

diff --git a/src/screen_search.c b/src/screen_search.c
index 816968619bc3c5f248da7641eae8f6f4390e8601..a74ef6092ccedf1669ada7f2a0940e22f97867b5 100644 (file)
--- a/src/screen_search.c
+++ b/src/screen_search.c
@@ -188,7 +188,7 @@ search_clear(screen_t *screen, mpdclient_t *c, gboolean clear_pattern)
 }
 
 #ifdef FUTURE
-mpdclient_filelist_t *
+static mpdclient_filelist_t *
 filelist_search(mpdclient_t *c, int exact_match, int table, gchar *pattern)
 {
   mpdclient_filelist_t *list, *list2;
@@ -454,7 +454,7 @@ get_title(char *str, size_t size)
 }
 
 static list_window_t *
-get_filelist_window()
+get_filelist_window(void)
 {
        return lw;
 }

diff --git a/src/screen_utils.c b/src/screen_utils.c
index 9b3bfa26628d7f311f679917c74d108cf821c604..a1cdedb2c24d26f854f721d10ac045cce82b5895 100644 (file)
--- a/src/screen_utils.c
+++ b/src/screen_utils.c
@@ -102,7 +102,7 @@ screen_getstr(WINDOW *w, const char *prompt)
   return screen_readln(w, prompt, NULL, NULL, NULL);
 }
 
-char *
+static char *
 screen_read_password(WINDOW *w, const char *prompt)
 {
   if(w == NULL)
@@ -124,7 +124,7 @@ screen_read_password(WINDOW *w, const char *prompt)
   curs_set(0);
 }
     
-gint
+static gint
 _screen_auth(mpdclient_t *c, gint recursion)
 {
    mpd_clearError(c->connection);

diff --git a/src/src_lyrics.c b/src/src_lyrics.c
index ecacef250f85c76f1f5fa7b918608b80547d50eb..4d41aea3752db1aba0459a9c076bbd75b2ae1cd3 100644 (file)
--- a/src/src_lyrics.c
+++ b/src/src_lyrics.c
@@ -103,7 +103,9 @@ int deregister_lyr_hd ();
 int register_lyr_hd (src_lyr *source_descriptor);
 #endif
 
-int src_lyr_stack_init ()
+static int src_lyr_plugins_load(void);
+
+void src_lyr_stack_init(void)
 {
        src_lyr_stack = g_array_new (TRUE, FALSE, sizeof (src_lyr*));
 
@@ -124,7 +126,7 @@ int src_lyr_stack_init ()
 #endif
 }
 
-int src_lyr_init ()
+int src_lyr_init(void)
 {
        src_lyr_stack_init ();
 
@@ -145,7 +147,7 @@ int get_lyr_by_src (int priority, char *artist, char *title)
        return 0;
 }
 
-int src_lyr_load_plugin_file (const char *file)
+static int src_lyr_load_plugin_file(const char *file)
 {
        GString *path;
        path = g_string_new (PLUGIN_DIR_SYSTEM);
@@ -162,7 +164,7 @@ int src_lyr_load_plugin_file (const char *file)
        return 0;
 }
 
-void src_lyr_plugins_load_from_dir (GDir *plugin_dir)
+static void src_lyr_plugins_load_from_dir(GDir *plugin_dir)
 {
        const gchar *cur_file;
 
@@ -173,7 +175,7 @@ void src_lyr_plugins_load_from_dir (GDir *plugin_dir)
        }
 }
 
-int src_lyr_plugins_load ()
+static int src_lyr_plugins_load(void)
 {
        GDir *plugin_dir;
 

diff --git a/src/src_lyrics.h b/src/src_lyrics.h
index 140906e26f4259ca36f6add45791e9e015cb6e16..7a2e7eaee322b98de4dc7476c43cbd145f9270b6 100644 (file)
--- a/src/src_lyrics.h
+++ b/src/src_lyrics.h
@@ -55,11 +55,11 @@ struct src_lyr
   char *description;
   
   int (*register_src_lyr) (src_lyr *source_descriptor);
-  int (*deregister_src_lyr) ();
+  int (*deregister_src_lyr)(void);
 
   int (*check_lyr) (char *artist, char *title, char *url);
   int (*get_lyr) (char *artist, char *title);
-  int (*state_lyr) ();
+  int (*state_lyr)(void);
 
 #ifndef DISABLE_PLUGIN_SYSTEM
   GModule *module;
@@ -70,8 +70,10 @@ typedef int (*src_lyr_plugin_register) (src_lyr *source_descriptor);
 
 GArray *src_lyr_stack;
 
-int src_lyr_stack_init ();
-int src_lyr_init ();
+int get_text_line(formed_text *text, int num, char *dest, int len);
+
+void src_lyr_stack_init(void);
+int src_lyr_init(void);
 int get_lyr_by_src (int priority, char *artist, char *title);
 
 #endif

diff --git a/src/wreadln.c b/src/wreadln.c
index e49308a3f78cd4cd1810d7cacf2ac3928683b3df..f6b848cdd86788df9ade64319e474e8c8f052fad 100644 (file)
--- a/src/wreadln.c
+++ b/src/wreadln.c
@@ -123,7 +123,7 @@ static inline void drawline(gint cursor,
 
 /* libcurses version */
 
-gchar *
+static gchar *
 _wreadln(WINDOW *w,
         const gchar *prompt,
         const gchar *initial_value,
@@ -475,7 +475,7 @@ static inline void drawline(gint cursor,
 
 /* libcursesw version */ 
 
-gchar *
+static gchar *
 _wreadln(WINDOW *w,
         const gchar *prompt,
         const gchar *initial_value,

diff --git a/src/wreadln.h b/src/wreadln.h
index 35e91bcf2a90006acc0735ee87c75ad50e948c98..d448f4119bd71e105597f160cc3ab57c3b2b360f 100644 (file)
--- a/src/wreadln.h
+++ b/src/wreadln.h
@@ -34,5 +34,12 @@ gchar *wreadln(WINDOW *w,            /* the curses window to use */
               GCompletion *gcmp    /* a GCompletion structure or NULL */
               );
 
+gchar *
+wreadln_masked(WINDOW *w,
+              const gchar *prompt,
+              const gchar *initial_value,
+              gint x1,
+              GList **history,
+              GCompletion *gcmp);
 
 #endif