more warning fixes

git-svn-id: http://svn.irssi.org/repos/irssi/trunk@863 dbcabf3a-b0e7-0310-adc4-f8d773084564

5 files changed, 7 insertions, 13 deletions

diff --git a/src/fe-common/core/themes.c b/src/fe-common/core/themes.c
index 076e0489..08bb99a8 100644
--- a/src/fe-common/core/themes.c
+++ b/src/fe-common/core/themes.c
@@ -861,12 +861,10 @@ static void cmd_save(void)
 
 static void complete_format_list(THEME_SEARCH_REC *rec, const char *key, GList **list)
 {
-	MODULE_THEME_REC *theme;
 	FORMAT_REC *formats;
 	int n, len;
 
 	formats = g_hash_table_lookup(default_formats, rec->name);
-	theme = g_hash_table_lookup(current_theme->modules, rec->name);
 
 	len = strlen(key);
 	for (n = 1; formats[n].def != NULL; n++) {
diff --git a/src/fe-text/gui-printtext.c b/src/fe-text/gui-printtext.c
index 624d779c..b539f654 100644
--- a/src/fe-text/gui-printtext.c
+++ b/src/fe-text/gui-printtext.c
@@ -130,16 +130,16 @@ static TEXT_CHUNK_REC *text_chunk_find(GUI_WINDOW_REC *gui, const char *data)
 void gui_window_line_text_free(GUI_WINDOW_REC *gui, LINE_REC *line)
 {
 	TEXT_CHUNK_REC *chunk;
-        const unsigned char *text;
+        const char *text;
 
 	text = line->text;
 	for (;;) {
 		if (*text == '\0') {
                         text++;
-			if (*text == LINE_CMD_EOL)
+			if ((unsigned char) *text == LINE_CMD_EOL)
 				break;
 
-			if (*text == LINE_CMD_CONTINUE) {
+			if ((unsigned char) *text == LINE_CMD_CONTINUE) {
 				unsigned char *tmp;
 
 				memcpy(&tmp, text+1, sizeof(char *));
@@ -152,7 +152,7 @@ void gui_window_line_text_free(GUI_WINDOW_REC *gui, LINE_REC *line)
 				text = tmp;
 				continue;
 			}
-			if (*text & 0x80)
+			if ((unsigned char) *text & 0x80)
 				text++;
 		}
 
diff --git a/src/fe-text/gui-readline.c b/src/fe-text/gui-readline.c
index 1e04c16b..4a82dfee 100644
--- a/src/fe-text/gui-readline.c
+++ b/src/fe-text/gui-readline.c
@@ -35,6 +35,7 @@
 
 #include <signal.h>
 
+#undef CTRL
 #define CTRL(x) ((x) & 0x1f)	/* Ctrl+x */
 
 typedef void (*ENTRY_REDIRECT_KEY_FUNC) (int key, void *data, SERVER_REC *server, WI_ITEM_REC *item);
diff --git a/src/fe-text/gui-windows.c b/src/fe-text/gui-windows.c
index 3021485b..386484d5 100644
--- a/src/fe-text/gui-windows.c
+++ b/src/fe-text/gui-windows.c
@@ -945,7 +945,7 @@ static char *gui_window_line_get_format(WINDOW_REC *window, LINE_REC *line,
 	TEXT_DEST_REC dest;
 	int formatnum, argcount;
 
-	text = line->text;
+	text = (const unsigned char *) line->text;
 
 	/* skip the beginning of the line until we find the format */
 	g_free(line_read_format(&text));
@@ -975,11 +975,6 @@ static char *gui_window_line_get_format(WINDOW_REC *window, LINE_REC *line,
 	if (formatnum == -1)
 		ret = NULL;
 	else {
-		THEME_REC *theme;
-
-		theme = window->theme == NULL ? current_theme :
-			window->theme;
-
 		argcount = 0;
 		while (*text != '\0' || text[1] != LINE_CMD_EOL) {
 			args[argcount] = line_read_format(&text);
diff --git a/src/perl/perl.c b/src/perl/perl.c
index 9d31fa11..699cbcd5 100644
--- a/src/perl/perl.c
+++ b/src/perl/perl.c
@@ -488,7 +488,7 @@ int perl_input_add(int source, int condition,
 	rec = g_new(PERL_SOURCE_REC, 1);
 	rec->func = g_strdup_printf("%s::%s", perl_get_package(), func);
 	rec->data = g_strdup(data);
-	rec->tag = g_input_add(source, condition,
+	rec->tag = g_input_add(source, (GInputCondition) condition,
 			       (GInputFunction) perl_source_event, rec);
 
 	perl_sources = g_slist_append(perl_sources, rec);