X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Flist_window.c;h=3fbe531571584b13164a99cbbf55235732c50557;hb=43103df0787c799ddadeb1e4da6a7938127e4f88;hp=4cf2c1b9d61cf9f783ab853a66b9a685f067f991;hpb=1006a43225842d77e5fdb32e9d02bada5cdc2377;p=ncmpc.git

diff --git a/src/list_window.c b/src/list_window.c
index 4cf2c1b..3fbe531 100644
--- a/src/list_window.c
+++ b/src/list_window.c
@@ -1,5 +1,5 @@
 /* ncmpc (Ncurses MPD Client)
- * (c) 2004-2010 The Music Player Daemon Project
+ * (c) 2004-2017 The Music Player Daemon Project
  * Project homepage: http://musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -25,7 +25,7 @@
 #include "command.h"
 #include "colors.h"
 #include "paint.h"
-#include "screen_message.h"
+#include "screen_status.h"
 #include "i18n.h"
 
 #include <assert.h>
@@ -351,8 +351,6 @@ list_window_paint(const struct list_window *lw,
 		list_window_get_range(lw, &range);
 
 	for (unsigned i = 0; i < lw->rows; i++) {
-		const char *label;
-
 		wmove(lw->w, i, 0);
 
 		if (lw->start + i >= lw->length) {
@@ -360,7 +358,7 @@ list_window_paint(const struct list_window *lw,
 			break;
 		}
 
-		label = callback(lw->start + i, callback_data);
+		const char *label = callback(lw->start + i, callback_data);
 		assert(label != NULL);
 
 		list_window_paint_row(lw->w, lw->cols,
@@ -382,7 +380,7 @@ list_window_paint(const struct list_window *lw,
 void
 list_window_paint2(const struct list_window *lw,
 		   list_window_paint_callback_t paint_callback,
-		   void *callback_data)
+		   const void *callback_data)
 {
 	bool show_cursor = !lw->hide_cursor &&
 		(!options.hardware_cursor || lw->range_selection);
@@ -392,8 +390,6 @@ list_window_paint2(const struct list_window *lw,
 		list_window_get_range(lw, &range);
 
 	for (unsigned i = 0; i < lw->rows; i++) {
-		bool selected;
-
 		wmove(lw->w, i, 0);
 
 		if (lw->start + i >= lw->length) {
@@ -401,7 +397,7 @@ list_window_paint2(const struct list_window *lw,
 			break;
 		}
 
-		selected = show_cursor &&
+		bool selected = show_cursor &&
 			lw->start + i >= range.start &&
 			lw->start + i < range.end;
 
@@ -425,13 +421,12 @@ list_window_find(struct list_window *lw,
 		 bool bell_on_wrap)
 {
 	unsigned i = lw->selected + 1;
-	const char *label;
 
 	assert(str != NULL);
 
 	do {
 		while (i < lw->length) {
-			label = callback(i, callback_data);
+			const char *label = callback(i, callback_data);
 			assert(label != NULL);
 
 			if (match_line(label, str)) {
@@ -464,7 +459,6 @@ list_window_rfind(struct list_window *lw,
 		  bool bell_on_wrap)
 {
 	int i = lw->selected - 1;
-	const char *label;
 
 	assert(str != NULL);
 
@@ -473,7 +467,7 @@ list_window_rfind(struct list_window *lw,
 
 	do {
 		while (i >= 0) {
-			label = callback(i, callback_data);
+			const char *label = callback(i, callback_data);
 			assert(label != NULL);
 
 			if (match_line(label, str)) {
@@ -502,13 +496,10 @@ list_window_jump(struct list_window *lw,
 		 void *callback_data,
 		 const char *str)
 {
-	unsigned i;
-	const char *label;
-
 	assert(str != NULL);
 
-	for (i = 0; i < lw->length; i++) {
-		label = callback(i, callback_data);
+	for (unsigned i = 0; i < lw->length; i++) {
+		const char *label = callback(i, callback_data);
 		assert(label != NULL);
 
 		if (g_ascii_strncasecmp(label, str, strlen(str)) == 0) {
@@ -525,18 +516,14 @@ list_window_jump(struct list_window *lw,
 		 void *callback_data,
 		 const char *str)
 {
-	unsigned i;
-	const char *label;
-	GRegex *regex;
-
 	assert(str != NULL);
 
-	regex = compile_regex(str, options.jump_prefix_only);
+	GRegex *regex = compile_regex(str, options.jump_prefix_only);
 	if (regex == NULL)
 		return false;
 
-	for (i = 0; i < lw->length; i++) {
-		label = callback(i, callback_data);
+	for (unsigned i = 0; i < lw->length; i++) {
+		const char *label = callback(i, callback_data);
 		assert(label != NULL);
 
 		if (match_regex(regex, label)) {