summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArjun Sreedharan <arjun024@gmail.com>2014-08-30 12:24:23 +0530
committerJunio C Hamano <gitster@pobox.com>2014-09-03 14:35:37 -0700
commit693eb02a5e152668dacc7c6ff0f1c63d70c0a82a (patch)
tree8952b72fa82f945bf7335e140509eea935ce25eb
parent96db324a73fdada6fbe7b63221986f8f18cc63b0 (diff)
downloadgit-as/calloc-takes-nmemb-then-size.tar.gz
calloc() and xcalloc() takes nmemb and then sizeas/calloc-takes-nmemb-then-size
There are a handful more instances of this in compat/regex/ but they are borrowed code taht we do not want to touch with a change that really affects correctness, which this change is not. Signed-off-by: Arjun Sreedharan <arjun024@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--builtin/for-each-ref.c2
-rw-r--r--imap-send.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c
index 47bd624696..69bba06718 100644
--- a/builtin/for-each-ref.c
+++ b/builtin/for-each-ref.c
@@ -633,7 +633,7 @@ static void populate_value(struct refinfo *ref)
unsigned long size;
const unsigned char *tagged;
- ref->value = xcalloc(sizeof(struct atom_value), used_atom_cnt);
+ ref->value = xcalloc(used_atom_cnt, sizeof(struct atom_value));
if (need_symref && (ref->flag & REF_ISSYMREF) && !ref->symref) {
unsigned char unused1[20];
diff --git a/imap-send.c b/imap-send.c
index 524fbabc96..02eb3e095e 100644
--- a/imap-send.c
+++ b/imap-send.c
@@ -954,7 +954,7 @@ static struct imap_store *imap_open_store(struct imap_server_conf *srvc)
ctx = xcalloc(1, sizeof(*ctx));
- ctx->imap = imap = xcalloc(sizeof(*imap), 1);
+ ctx->imap = imap = xcalloc(1, sizeof(*imap));
imap->buf.sock.fd[0] = imap->buf.sock.fd[1] = -1;
imap->in_progress_append = &imap->in_progress;