mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-22 20:36:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

(move_dir_dir): variable clean up.

Browse Source 
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2013-12-30 10:51:28 +04:00
parent dab425e7fc
commit 04f8c63a72
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/filemanager/file.c
View File

@ -2252,7 +2252,7 @@ copy_dir_dir (FileOpTotalContext * tctx, file_op_context_t * ctx, const char *s,
FileProgressStatus FileProgressStatus
move_dir_dir (FileOpTotalContext * tctx, file_op_context_t * ctx, const char *s, const char *d) 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; FileProgressStatus return_status;
gboolean move_over = FALSE; gboolean move_over = FALSE;
gboolean dstat_ok; 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 */ /* Check if the user inputted an existing dir */
retry_dst_stat: retry_dst_stat:
if (mc_stat (dst_vpath, &destbuf) == 0) if (mc_stat (dst_vpath, &dbuf) == 0)
{ {
if (move_over) if (move_over)
{ {
@ -2312,7 +2312,7 @@ move_dir_dir (FileOpTotalContext * tctx, file_op_context_t * ctx, const char *s,
return_status = FILE_SKIPALL; return_status = FILE_SKIPALL;
else else
{ {
if (S_ISDIR (destbuf.st_mode)) if (S_ISDIR (dbuf.st_mode))
return_status = file_error (_("Cannot overwrite directory \"%s\"\n%s"), d); return_status = file_error (_("Cannot overwrite directory \"%s\"\n%s"), d);
else else
return_status = file_error (_("Cannot overwrite file \"%s\"\n%s"), d); return_status = file_error (_("Cannot overwrite file \"%s\"\n%s"), d);