Merge branch 'rs/alias-use-copy-array'
authorJunio C Hamano <gitster@pobox.com>
Mon, 7 Oct 2019 02:33:01 +0000 (11:33 +0900)
committerJunio C Hamano <gitster@pobox.com>
Mon, 7 Oct 2019 02:33:01 +0000 (11:33 +0900)
Code cleanup.

* rs/alias-use-copy-array:
  git: use COPY_ARRAY and MOVE_ARRAY in handle_alias()

git.c

diff --git a/git.c b/git.c
index c1ee712..ce6ab0e 100644 (file)
--- a/git.c
+++ b/git.c
@@ -369,8 +369,7 @@ static int handle_alias(int *argcp, const char ***argv)
                        die(_("alias '%s' changes environment variables.\n"
                              "You can use '!git' in the alias to do this"),
                            alias_command);
-               memmove(new_argv - option_count, new_argv,
-                               count * sizeof(char *));
+               MOVE_ARRAY(new_argv - option_count, new_argv, count);
                new_argv -= option_count;
 
                if (count < 1)
@@ -385,7 +384,7 @@ static int handle_alias(int *argcp, const char ***argv)
 
                REALLOC_ARRAY(new_argv, count + *argcp);
                /* insert after command name */
-               memcpy(new_argv + count, *argv + 1, sizeof(char *) * *argcp);
+               COPY_ARRAY(new_argv + count, *argv + 1, *argcp);
 
                trace2_cmd_alias(alias_command, new_argv);
                trace2_cmd_list_config();