Skip to content

Commit

Permalink
(move_dir_dir): variable clean up.
Browse files Browse the repository at this point in the history
Signed-off-by: Andrew Borodin <[email protected]>
  • Loading branch information
aborodin committed Feb 10, 2014
1 parent dab425e commit 04f8c63
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/filemanager/file.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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)
{
Expand All @@ -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);
Expand Down

0 comments on commit 04f8c63

Please sign in to comment.