Skip to content

Commit

Permalink
calloc() and xcalloc() takes nmemb and then size
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Arjun Sreedharan authored and Junio C Hamano committed Sep 3, 2014
1 parent 96db324 commit 693eb02
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion builtin/for-each-ref.c
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down
2 changes: 1 addition & 1 deletion imap-send.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit 693eb02

Please sign in to comment.