From: Andrew Borodin <aborodin@vmail.ru>
Date: Thu, 29 Nov 2012 07:47:57 +0000 (+0400)
Subject: (copy_dir_dir): get rid of extra string duplication.
X-Git-Tag: 4.8.7~14^2
X-Git-Url: https://repo.or.cz/w/midnight-commander.git/commitdiff_plain/33dbb1338eafda7665660824746dd1ce9b825d82

(copy_dir_dir): get rid of extra string duplication.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
---

diff --git a/src/filemanager/file.c b/src/filemanager/file.c
index 79ec70c99..5b960ddcb 100644
--- a/src/filemanager/file.c
+++ b/src/filemanager/file.c
@@ -1933,7 +1933,7 @@ copy_file_file (FileOpTotalContext * tctx, FileOpContext * ctx,
    function calls */
 
 FileProgressStatus
-copy_dir_dir (FileOpTotalContext * tctx, FileOpContext * ctx, const char *s, const char *_d,
+copy_dir_dir (FileOpTotalContext * tctx, FileOpContext * ctx, const char *s, const char *d,
               gboolean toplevel, gboolean move_over, gboolean do_delete, GSList * parent_dirs)
 {
     struct dirent *next;
@@ -1943,14 +1943,11 @@ copy_dir_dir (FileOpTotalContext * tctx, FileOpContext * ctx, const char *s, con
     FileProgressStatus return_status = FILE_CONT;
     struct utimbuf utb;
     struct link *lp;
-    char *d;
     vfs_path_t *src_vpath, *dst_vpath, *dest_dir_vpath = NULL;
     gboolean do_mkdir = TRUE;
 
-    d = g_strdup (_d);
-
     src_vpath = vfs_path_from_str (s);
-    dst_vpath = vfs_path_from_str (_d);
+    dst_vpath = vfs_path_from_str (d);
 
     /* First get the mode of the source dir */
 
@@ -2031,8 +2028,7 @@ copy_dir_dir (FileOpTotalContext * tctx, FileOpContext * ctx, const char *s, con
                 goto ret;
             }
         }
-        dest_dir = d;
-        d = NULL;
+        dest_dir = g_strdup (d);
     }
     else
     {
@@ -2063,8 +2059,7 @@ copy_dir_dir (FileOpTotalContext * tctx, FileOpContext * ctx, const char *s, con
             dest_dir = mc_build_filename (d, x_basename (s), NULL);
         else
         {
-            dest_dir = d;
-            d = NULL;
+            dest_dir = g_strdup (d);
             do_mkdir = FALSE;
         }
     }
@@ -2199,7 +2194,6 @@ copy_dir_dir (FileOpTotalContext * tctx, FileOpContext * ctx, const char *s, con
     free_link (parent_dirs->data);
     g_slist_free_1 (parent_dirs);
   ret_fast:
-    g_free (d);
     vfs_path_free (src_vpath);
     vfs_path_free (dst_vpath);
     return return_status;