Merge branch 'jc/calloc-pathspec'

* jc/calloc-pathspec:
ps_matched: xcalloc() takes nmemb and then element size

diff --git a/builtin/checkout.c b/builtin/checkout.c
index e1403bec272c332160e0346782436167fa016d93..52d59eba80048f507267002a6a88135ca46376b8 100644 (file)
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -280,7 +280,7 @@ static int checkout_paths(const struct checkout_opts *opts,
        if (opts->source_tree)
                read_tree_some(opts->source_tree, &opts->pathspec);
 
-       ps_matched = xcalloc(1, opts->pathspec.nr);
+       ps_matched = xcalloc(opts->pathspec.nr, 1);
 
        /*
         * Make sure all pathspecs participated in locating the paths

diff --git a/builtin/ls-files.c b/builtin/ls-files.c
index 6fa2205734e435c9db787193dcf8c0392d9d2a24..b6a7cb0c7c48293c6348806cb342a9289f146740 100644 (file)
--- a/builtin/ls-files.c
+++ b/builtin/ls-files.c
@@ -516,7 +516,7 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)
 
        /* Treat unmatching pathspec elements as errors */
        if (pathspec.nr && error_unmatch)
-               ps_matched = xcalloc(1, pathspec.nr);
+               ps_matched = xcalloc(pathspec.nr, 1);
 
        if ((dir.flags & DIR_SHOW_IGNORED) && !exc_given)
                die("ls-files --ignored needs some exclude pattern");