include cleanup

[ncmpc.git] / src / screen_lyrics.c

diff --git a/src/screen_lyrics.c b/src/screen_lyrics.c
index ec028a3924c558540828682c2c88b1d4f1634439..2dd5e12b76ab43828fbab40f2acb66e4f1ecc991 100644 (file)
--- a/src/screen_lyrics.c
+++ b/src/screen_lyrics.c
@@ -19,16 +19,6 @@
  *
  */
 
-#define _GNU_SOURCE
-#include <stdlib.h>
-#include <string.h>
-#include <glib.h>
-#include <ncurses.h>
-#include <expat.h>
-#include <unistd.h>
-#include <glib/gstdio.h>
-#include <stdio.h>
-
 #include "config.h"
 #ifndef DISABLE_LYRICS_SCREEN
 #include <sys/stat.h>
@@ -42,11 +32,21 @@
 #include "strfsong.h"
 #include "src_lyrics.h"
 
+#define _GNU_SOURCE
+#include <stdlib.h>
+#include <string.h>
+#include <glib.h>
+#include <ncurses.h>
+#include <expat.h>
+#include <unistd.h>
+#include <glib/gstdio.h>
+#include <stdio.h>
+
 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;
@@ -151,7 +151,7 @@ gpointer get_lyr(void *c)
        return &lyr_text;
 }
 
-static char *
+static const char *
 list_callback(int index, int *highlight, void *data)
 {
        static char buf[512];
@@ -204,7 +204,7 @@ lyrics_exit(void)
 }
 
 
-static char *
+static const char *
 lyrics_title(char *str, size_t size)
 {
        static GString *msg;