summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-09-19 18:38:37 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-09-19 18:38:37 (GMT)
commit14e2ae6126509feeb379f490d925cccd3dd9f7c0 (patch)
tree14b36b1e0239ef1e915802cd0287a6bbda226aa5
parent70f003e1070f16594529d9fb0cc6c670c1e415e2 (diff)
parent693eb02a5e152668dacc7c6ff0f1c63d70c0a82a (diff)
downloadgit-14e2ae6126509feeb379f490d925cccd3dd9f7c0.zip
git-14e2ae6126509feeb379f490d925cccd3dd9f7c0.tar.gz
git-14e2ae6126509feeb379f490d925cccd3dd9f7c0.tar.bz2
Merge branch 'as/calloc-takes-nmemb-then-size'
Code clean-up. * as/calloc-takes-nmemb-then-size: calloc() and xcalloc() takes nmemb and then size
-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 47bd624..69bba06 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 f33e56d..70bcc7a 100644
--- a/imap-send.c
+++ b/imap-send.c
@@ -919,7 +919,7 @@ static struct imap_store *imap_open_store(struct imap_server_conf *srvc, char *f
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;