From 1b75ea27b64ad1e5c7303c8b3ab35447b79f02b0 Mon Sep 17 00:00:00 2001
From: Slava Zanko <slavazanko@gmail.com>
Date: Wed, 24 Feb 2010 12:51:56 +0200
Subject: [PATCH] Cleanup of code for master

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
---
 lib/vfs/mc-vfs/extfs.c       | 2 +-
 src/chown.c                  | 1 -
 src/editor/editcmd.c         | 2 +-
 src/editor/editcmd_dialogs.c | 4 +++-
 src/fileopctx.c              | 1 +
 src/viewer/display.c         | 2 +-
 6 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/lib/vfs/mc-vfs/extfs.c b/lib/vfs/mc-vfs/extfs.c
index a8f086c4b..94b6c35a1 100644
--- a/lib/vfs/mc-vfs/extfs.c
+++ b/lib/vfs/mc-vfs/extfs.c
@@ -210,7 +210,7 @@ extfs_find_entry_int (struct entry *dir, char *name, GSList *list,
 
     if (g_path_is_absolute (name)) {
 	/* Handle absolute paths */
-	name = g_path_skip_root (name);
+	name = (char *) g_path_skip_root (name);
 	dir = dir->inode->archive->root_entry;
     }
 
diff --git a/src/chown.c b/src/chown.c
index 0d922b0a2..c1c80b124 100644
--- a/src/chown.c
+++ b/src/chown.c
@@ -249,7 +249,6 @@ chown_cmd (void)
 {
     char *fname;
     struct stat sf_stat;
-    WLEntry *fe;
     Dlg_head *ch_dlg;
     uid_t new_user;
     gid_t new_group;
diff --git a/src/editor/editcmd.c b/src/editor/editcmd.c
index d4f7c8387..52961d0d0 100644
--- a/src/editor/editcmd.c
+++ b/src/editor/editcmd.c
@@ -2415,7 +2415,7 @@ static int edit_find_word_start (WEdit *edit, long *word_start, gsize *word_len)
 /* search start of word to be completed */
     for (i = 2;; i++) {
 /* return if at begin of file */
-	if (edit->curs1 - i < 0)
+	if ((gsize)edit->curs1 < i)
 	    return 0;
 
 	last = c;
diff --git a/src/editor/editcmd_dialogs.c b/src/editor/editcmd_dialogs.c
index 7851e58c5..486a50adc 100644
--- a/src/editor/editcmd_dialogs.c
+++ b/src/editor/editcmd_dialogs.c
@@ -151,6 +151,8 @@ editcmd_dialog_replace_show (WEdit * edit, const char *search_default, const cha
 void
 editcmd_dialog_search_show (WEdit * edit, char **search_text)
 {
+    (void) edit;
+
     if (*search_text == '\0')
         *search_text = INPUT_LAST_TEXT;
 
@@ -466,7 +468,7 @@ editcmd_dialog_select_definition_show (WEdit * edit, char *match_expr, int max_l
         char *tmp_curr_def = (char *) curr_def;
         int do_moveto = 0;
 
-        listbox_get_current (def_list, &curr, &tmp_curr_def);
+        listbox_get_current (def_list, &curr, (void **) &tmp_curr_def);
         curr_def = (etags_hash_t *) tmp_curr_def;
         if (edit->modified) {
             if (!edit_query_dialog2
diff --git a/src/fileopctx.c b/src/fileopctx.c
index 604796150..1fdac2700 100644
--- a/src/fileopctx.c
+++ b/src/fileopctx.c
@@ -34,6 +34,7 @@
 
 #include "lib/global.h"
 #include "fileopctx.h"
+#include "filegui.h"
 #include "lib/search.h"
 #include "lib/vfs/mc-vfs/vfs.h"
 
diff --git a/src/viewer/display.c b/src/viewer/display.c
index d027cc25a..b6e06dda0 100644
--- a/src/viewer/display.c
+++ b/src/viewer/display.c
@@ -129,7 +129,7 @@ mcview_display_status (mcview_t * view)
     const screen_dimen width = view->status_area.width;
     const screen_dimen height = view->status_area.height;
     const char *file_label;
-    screen_dimen file_label_width, i = 0;
+    screen_dimen file_label_width;
 
     if (height < 1)
         return;
-- 
2.11.4.GIT