From 04f8c63a7286ab468cae33e462bd040180e03d10 Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Mon, 30 Dec 2013 10:51:28 +0400 Subject: [PATCH] (move_dir_dir): variable clean up. Signed-off-by: Andrew Borodin --- src/filemanager/file.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/filemanager/file.c b/src/filemanager/file.c index 1ca1cedae..abc570042 100644 --- a/src/filemanager/file.c +++ b/src/filemanager/file.c @@ -2252,7 +2252,7 @@ copy_dir_dir (FileOpTotalContext * tctx, file_op_context_t * ctx, const char *s, FileProgressStatus move_dir_dir (FileOpTotalContext * tctx, file_op_context_t * ctx, const char *s, const char *d) { - struct stat sbuf, dbuf, destbuf; + struct stat sbuf, dbuf; FileProgressStatus return_status; gboolean move_over = FALSE; gboolean dstat_ok; @@ -2298,7 +2298,7 @@ move_dir_dir (FileOpTotalContext * tctx, file_op_context_t * ctx, const char *s, /* Check if the user inputted an existing dir */ retry_dst_stat: - if (mc_stat (dst_vpath, &destbuf) == 0) + if (mc_stat (dst_vpath, &dbuf) == 0) { if (move_over) { @@ -2312,7 +2312,7 @@ move_dir_dir (FileOpTotalContext * tctx, file_op_context_t * ctx, const char *s, return_status = FILE_SKIPALL; else { - if (S_ISDIR (destbuf.st_mode)) + if (S_ISDIR (dbuf.st_mode)) return_status = file_error (_("Cannot overwrite directory \"%s\"\n%s"), d); else return_status = file_error (_("Cannot overwrite file \"%s\"\n%s"), d);