From 0b2eee9489a8acef3cdee6f6fa0df6d167c53b8d Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Fri, 3 Oct 2008 14:30:59 +0200
Subject: [PATCH] screen: don't pass mpdclient pointer to method paint()

None of the paint() implementations acutally uses the mpdclient
pointer.  Remove it from the method signature.
---
 src/screen.c        |  2 +-
 src/screen.h        |  2 +-
 src/screen_artist.c |  6 +++---
 src/screen_file.c   |  7 +++----
 src/screen_help.c   |  2 +-
 src/screen_keydef.c |  6 +++---
 src/screen_lyrics.c |  6 +++---
 src/screen_play.c   | 28 ++++++++++++++--------------
 src/screen_search.c |  6 +++---
 9 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/src/screen.c b/src/screen.c
index 90788b0..5345f49 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -546,7 +546,7 @@ screen_paint(mpdclient_t *c)
 	/* paint the main window */
 	wclear(screen.main_window.w);
 	if (mode_fn->paint != NULL)
-		mode_fn->paint(c);
+		mode_fn->paint();
 
 	paint_progress_window(c);
 	paint_status_window(c);
diff --git a/src/screen.h b/src/screen.h
index 4ad376b..976c75c 100644
--- a/src/screen.h
+++ b/src/screen.h
@@ -62,7 +62,7 @@ typedef struct screen_functions {
 	void (*open)(struct screen *screen, mpdclient_t *c);
 	void (*close)(void);
 	void (*resize)(int cols, int rows);
-	void (*paint)(mpdclient_t *c);
+	void (*paint)(void);
 	void (*update)(mpdclient_t *c);
 	int (*cmd)(struct screen *scr, mpdclient_t *c, command_t cmd);
 	const char *(*get_title)(char *s, size_t size);
diff --git a/src/screen_artist.c b/src/screen_artist.c
index 86291d8..52b7eee 100644
--- a/src/screen_artist.c
+++ b/src/screen_artist.c
@@ -94,12 +94,12 @@ artist_lw_callback(unsigned idx, mpd_unused int *highlight, mpd_unused void *dat
 }
 
 static void
-paint(mpdclient_t *c);
+paint(void);
 
 static void
 artist_repaint(void)
 {
-	paint(NULL);
+	paint();
 	wrefresh(browser.lw->w);
 }
 
@@ -352,7 +352,7 @@ resize(int cols, int rows)
 }
 
 static void
-paint(mpd_unused mpdclient_t *c)
+paint(void)
 {
 	if (browser.filelist) {
 		list_window_paint(browser.lw, browser_lw_callback,
diff --git a/src/screen_file.c b/src/screen_file.c
index 3029165..9dfe4ac 100644
--- a/src/screen_file.c
+++ b/src/screen_file.c
@@ -37,12 +37,12 @@
 static struct screen_browser browser;
 
 static void
-browse_paint(mpdclient_t *c);
+browse_paint(void);
 
 static void
 file_repaint(void)
 {
-	browse_paint(NULL);
+	browse_paint();
 	wrefresh(browser.lw->w);
 }
 
@@ -190,7 +190,7 @@ browse_title(char *str, size_t size)
 }
 
 static void
-browse_paint(mpd_unused mpdclient_t *c)
+browse_paint(void)
 {
 	list_window_paint(browser.lw, browser_lw_callback, browser.filelist);
 }
@@ -266,4 +266,3 @@ const struct screen_functions screen_browse = {
 	.cmd = browse_cmd,
 	.get_title = browse_title,
 };
-
diff --git a/src/screen_help.c b/src/screen_help.c
index adf9a03..fbcbf2b 100644
--- a/src/screen_help.c
+++ b/src/screen_help.c
@@ -207,7 +207,7 @@ help_title(mpd_unused char *str, mpd_unused size_t size)
 }
 
 static void
-help_paint(mpd_unused mpdclient_t *c)
+help_paint(void)
 {
 	list_window_paint(lw, list_callback, NULL);
 }
diff --git a/src/screen_keydef.c b/src/screen_keydef.c
index 268bc48..b84289d 100644
--- a/src/screen_keydef.c
+++ b/src/screen_keydef.c
@@ -121,12 +121,12 @@ check_subcmd_length(void)
 }
 
 static void
-keydef_paint(mpdclient_t *c);
+keydef_paint(void);
 
 static void
 keydef_repaint(void)
 {
-	keydef_paint(NULL);
+	keydef_paint();
 	wrefresh(lw->w);
 }
 
@@ -288,7 +288,7 @@ keydef_title(char *str, size_t size)
 }
 
 static void
-keydef_paint(mpd_unused mpdclient_t *c)
+keydef_paint(void)
 {
 	list_window_paint(lw, list_callback, NULL);
 }
diff --git a/src/screen_lyrics.c b/src/screen_lyrics.c
index b1812de..be99e6b 100644
--- a/src/screen_lyrics.c
+++ b/src/screen_lyrics.c
@@ -84,7 +84,7 @@ screen_lyrics_clear(void)
 }
 
 static void
-lyrics_paint(mpdclient_t *c);
+lyrics_paint(void);
 
 /**
  * Repaint and update the screen.
@@ -92,7 +92,7 @@ lyrics_paint(mpdclient_t *c);
 static void
 lyrics_repaint(void)
 {
-	lyrics_paint(NULL);
+	lyrics_paint();
 	wrefresh(lw->w);
 }
 
@@ -291,7 +291,7 @@ lyrics_title(char *str, size_t size)
 }
 
 static void
-lyrics_paint(mpd_unused mpdclient_t *c)
+lyrics_paint(void)
 {
 	list_window_paint(lw, list_callback, NULL);
 }
diff --git a/src/screen_play.c b/src/screen_play.c
index 0fdf367..4b285c5 100644
--- a/src/screen_play.c
+++ b/src/screen_play.c
@@ -54,20 +54,20 @@ static list_window_t *lw = NULL;
 static guint timer_hide_cursor_id;
 
 static void
-play_paint(struct mpdclient *c);
+play_paint(void);
 
 static void
-playlist_repaint(struct mpdclient *c)
+playlist_repaint(void)
 {
-	play_paint(c);
+	play_paint();
 	wrefresh(lw->w);
 }
 
 static void
-playlist_repaint_if_active(struct mpdclient *c)
+playlist_repaint_if_active(void)
 {
 	if (screen_is_visible(&screen_playlist))
-		playlist_repaint(c);
+		playlist_repaint();
 }
 
 static void
@@ -86,7 +86,7 @@ playlist_changed_callback(mpdclient_t *c, int event, gpointer data)
 	}
 
 	list_window_check_selected(lw, c->playlist.list->len);
-	playlist_repaint_if_active(c);
+	playlist_repaint_if_active();
 }
 
 static const char *
@@ -344,7 +344,7 @@ timer_hide_cursor(gpointer data)
 
 	if (c->status != NULL && c->status->state == MPD_STATUS_STATE_PLAY) {
 		lw->flags |= LW_HIDE_CURSOR;
-		playlist_repaint(c);
+		playlist_repaint();
 	} else
 		timer_hide_cursor_id = g_timeout_add(options.hide_cursor * 1000,
 						     timer_hide_cursor, c);
@@ -406,7 +406,7 @@ play_title(char *str, size_t size)
 }
 
 static void
-play_paint(mpd_unused mpdclient_t *c)
+play_paint(void)
 {
 	list_window_paint(lw, list_callback, NULL);
 }
@@ -426,7 +426,7 @@ play_update(mpdclient_t *c)
 		if (options.auto_center && current_song_id != -1)
 			center_playing_item(c);
 
-		playlist_repaint(c);
+		playlist_repaint();
 	}
 }
 
@@ -440,7 +440,7 @@ handle_mouse_event(struct mpdclient *c)
 
 	if (screen_get_mouse_event(c, &bstate, &row) ||
 	    list_window_mouse(lw, playlist_length(playlist), bstate, row)) {
-		playlist_repaint(c);
+		playlist_repaint();
 		return 1;
 	}
 
@@ -464,7 +464,7 @@ handle_mouse_event(struct mpdclient *c)
 
 	lw->selected = selected;
 	list_window_check_selected(lw, playlist_length(playlist));
-	playlist_repaint(c);
+	playlist_repaint();
 
 	return 1;
 }
@@ -483,7 +483,7 @@ play_cmd(screen_t *screen, mpdclient_t *c, command_t cmd)
 	}
 
 	if (list_window_cmd(lw, playlist_length(&c->playlist), cmd)) {
-		playlist_repaint(c);
+		playlist_repaint();
 		return 1;
 	}
 
@@ -502,7 +502,7 @@ play_cmd(screen_t *screen, mpdclient_t *c, command_t cmd)
 		return 1;
 	case CMD_SCREEN_UPDATE:
 		center_playing_item(c);
-		playlist_repaint(c);
+		playlist_repaint();
 		return 0;
 
 	case CMD_LIST_MOVE_UP:
@@ -518,7 +518,7 @@ play_cmd(screen_t *screen, mpdclient_t *c, command_t cmd)
 		screen_find(screen,
 			    lw, playlist_length(&c->playlist),
 			    cmd, list_callback, NULL);
-		playlist_repaint(c);
+		playlist_repaint();
 		return 1;
 
 #ifdef HAVE_GETMOUSE
diff --git a/src/screen_search.c b/src/screen_search.c
index 989ac7e..bf9278b 100644
--- a/src/screen_search.c
+++ b/src/screen_search.c
@@ -122,12 +122,12 @@ lw_search_help_callback(unsigned idx, mpd_unused int *highlight,
 }
 
 static void
-paint(mpdclient_t *c);
+paint(void);
 
 static void
 search_repaint(void)
 {
-	paint(NULL);
+	paint();
 	wrefresh(browser.lw->w);
 }
 
@@ -378,7 +378,7 @@ resize(int cols, int rows)
 }
 
 static void
-paint(mpd_unused mpdclient_t *c)
+paint(void)
 {
 	if (browser.filelist) {
 		browser.lw->flags = 0;
-- 
2.30.2