[PATCH 5/8] mv: remove an "if" that's always true
- From
Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
- Date
- Aug 8, 2014, 13:10 UTC
- Message-ID
- <1407503462-32632-6-git-send-email-pclouds@gmail.com>
- In-Reply-To
- <1407503462-32632-1-git-send-email-pclouds@gmail.com>
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> --- builtin/mv.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-)
diff --git a/builtin/mv.c b/builtin/mv.c index e192f2d..a45226e 100644 --- a/builtin/mv.c +++ b/builtin/mv.c @@ -179,22 +179,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);
-- 2.1.0.rc0.78.gc0d8480