Merge branch 'mc-4.6'

ChangeLog

@@ -1,3 +1,13 @@
+2009-01-18 Patrick Winnertz <winnie@debian.org
+
+	* edit/editdraw.c: Moved var into if clause as it's only used
+	there
+	* edit/editlock.c: Removed unnecessary arguement to if condition
+	* src/cmd.c: Removed unused pointer
+	* src/hotlist.c: Removed unused function save_group
+	* src/main.c: Removed unused function do_mc_filename_rename
+	* src/util.c: Removed unused struct whentm
+
 2009-01-14 Slava Zanko <slavazanko@gmail.com>
 
 	* lib/mc.ext.in: change filemask for recognize 7z-files

edit/editdraw.c

@@ -282,7 +282,7 @@ edit_draw_this_line (WEdit *edit, long b, long row, long start_col,
 {
     static unsigned int line[MAX_LINE_LEN];
     unsigned int *p = line;
-    long m1 = 0, m2 = 0, q, c1, c2, tws;
+    long m1 = 0, m2 = 0, q, c1, c2;
     int col, start_col_real;
     unsigned int c;
     int color;
@@ -300,6 +300,7 @@ edit_draw_this_line (WEdit *edit, long b, long row, long start_col,
 	eval_marks (edit, &m1, &m2);
 
 	if (row <= edit->total_lines - edit->start_line) {
+		long tws;
 	    if (use_colors && visible_tws) {
 		tws = edit_eol (edit, b);
 		while (tws > b && ((c = edit_get_byte (edit, tws - 1)) == ' '

edit/editlock.c

@@ -142,8 +142,7 @@ lock_get_info (const char *lockfname)
     int cnt;
     static char buf[BUF_SIZE];
 
-    if ((cnt = readlink (lockfname, buf, BUF_SIZE - 1)) == -1 || !buf
-	|| !*buf)
+    if ((cnt = readlink (lockfname, buf, BUF_SIZE - 1)) == -1 || !*buf)
 	return NULL;
     buf[cnt] = '\0';
     return buf;

src/cmd.c

@@ -1223,8 +1223,6 @@ dirsizes_cmd (void)
 void
 save_setup_cmd (void)
 {
-    char *str;
-    
     save_setup ();
     sync_profiles ();
     

src/hotlist.c

@@ -1491,36 +1491,6 @@ load_hotlist (void)
     current_group = hotlist;
 }
 
-static void
-save_group (struct hotlist *grp)
-{
-    struct hotlist *current = grp->head;
-    char           *group_section;
-
-    group_section = find_group_section (grp);
-    
-    profile_clean_section (group_section, profile_name);
-    for (;current && current->type == HL_TYPE_GROUP; current = current->next){
-	WritePrivateProfileString (group_section,
-				   current->directory,
-				   current->label,
-				   profile_name);
-    }
-    g_free (group_section);
-
-    for (current = grp->head;
-	 current && current->type == HL_TYPE_GROUP;
-	 current = current->next)
-	 save_group (current);
-    
-    profile_clean_section (grp->directory, profile_name);
-    for (;current; current = current->next){
-	WritePrivateProfileString (grp->directory,
-				   current->directory,
-				   current->label,
-				   profile_name);
-    }
-}
 
 static int  list_level = 0;
 

src/main.c

@@ -2114,19 +2114,6 @@ handle_args (int argc, char *argv[])
     poptFreeContext (ctx);
 }
 
-static int
-do_mc_filename_rename (const char *o_name, const char *n_name)
-{
-    char *full_o_name = concat_dir_and_file (home_dir, o_name);
-    char *full_n_name = g_strconcat (home_dir, MC_BASE, n_name, (char *) NULL);
-    int move;
-
-    move = 0 == rename (full_o_name, full_n_name);
-    g_free (full_o_name);
-    g_free (full_n_name);
-    return move;
-}
-
 int
 main (int argc, char *argv[])
 {

src/util.c

@@ -755,7 +755,6 @@ file_date (time_t when)
     static size_t i18n_timelength = 0;
     static const char *fmtyear, *fmttime;
     const char *fmt;
-    struct tm *whentm;
 
     if (i18n_timelength == 0){
 	i18n_timelength = i18n_checktimelength() + 1;