Skip to content

Commit

Permalink
mv: remove an "if" that's always true
Browse files Browse the repository at this point in the history
This is inside an "else" block of "if (last - first < 1)", so we know
that "last - first >= 1" when we come here. No need to check
"last - first > 0".

While at there, save "argc + last - first" to a variable to shorten
the statements a bit.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Nguyễn Thái Ngọc Duy authored and Junio C Hamano committed Sep 3, 2014
1 parent 3af05a6 commit 42de4b1
Showing 1 changed file with 7 additions and 15 deletions.
22 changes: 7 additions & 15 deletions builtin/mv.c
Original file line number Diff line number Diff line change
Expand Up @@ -176,22 +176,14 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
if (last - first < 1)
bad = _("source directory is empty");
else {
int j, dst_len;
int j, dst_len, n;

if (last - first > 0) {
source = xrealloc(source,
(argc + last - first)
* sizeof(char *));
destination = xrealloc(destination,
(argc + last - first)
* sizeof(char *));
modes = xrealloc(modes,
(argc + last - first)
* sizeof(enum update_mode));
submodule_gitfile = xrealloc(submodule_gitfile,
(argc + last - first)
* sizeof(char *));
}
n = argc + last - first;
source = xrealloc(source, n * sizeof(char *));
destination = xrealloc(destination, n * sizeof(char *));
modes = xrealloc(modes, n * sizeof(enum update_mode));
submodule_gitfile =
xrealloc(submodule_gitfile, n * sizeof(char *));

dst = add_slash(dst);
dst_len = strlen(dst);
Expand Down

0 comments on commit 42de4b1

Please sign in to comment.