mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'as/calloc-takes-nmemb-then-size'

Browse Source 
Code clean-up.

* as/calloc-takes-nmemb-then-size:
  calloc() and xcalloc() takes nmemb and then size
This commit is contained in:
Junio C Hamano
2014-09-19 11:38:37 -07:00
parent 70f003e107 693eb02a5e
commit 14e2ae6126
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/for-each-ref.c
View File

@ -633,7 +633,7 @@ static void populate_value(struct refinfo *ref)
unsigned long size; unsigned long size;
const unsigned char *tagged; 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) { if (need_symref && (ref->flag & REF_ISSYMREF) && !ref->symref) {
unsigned char unused1[20]; unsigned char unused1[20];

2
imap-send.c
View File

@ -919,7 +919,7 @@ static struct imap_store *imap_open_store(struct imap_server_conf *srvc, char *f
ctx = xcalloc(1, sizeof(*ctx)); 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->buf.sock.fd[0] = imap->buf.sock.fd[1] = -1;
imap->in_progress_append = &imap->in_progress; imap->in_progress_append = &imap->in_progress;