diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-03-19 15:25:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-03-19 15:25:38 -0700 |
| commit | 92ccd7b7529a852583c5033ba28b4414cd2f7654 (patch) | |
| tree | bce1548bcd2cd806a4524b812fb56f19b397b7d2 /http-push.c | |
| parent | a8a0ac3234317e47b2510f054a3a5b3d02564c98 (diff) | |
| parent | 1c57cc70ec26529a26392539fc888486bb89b7fd (diff) | |
| download | git-92ccd7b7529a852583c5033ba28b4414cd2f7654.tar.xz | |
Merge branch 'rs/calloc-array'
CALLOC_ARRAY() macro replaces many uses of xcalloc().
* rs/calloc-array:
cocci: allow xcalloc(1, size)
use CALLOC_ARRAY
git-compat-util.h: drop trailing semicolon from macro definition
Diffstat (limited to 'http-push.c')
| -rw-r--r-- | http-push.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/http-push.c b/http-push.c index 6a4a43e07f..b60d5fcc85 100644 --- a/http-push.c +++ b/http-push.c @@ -896,7 +896,7 @@ static struct remote_lock *lock_remote(const char *path, long timeout) curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers); curl_easy_setopt(slot->curl, CURLOPT_FILE, &in_buffer); - lock = xcalloc(1, sizeof(*lock)); + CALLOC_ARRAY(lock, 1); lock->timeout = -1; if (start_active_slot(slot)) { @@ -1713,7 +1713,7 @@ int cmd_main(int argc, const char **argv) int new_refs; struct ref *ref, *local_refs; - repo = xcalloc(1, sizeof(*repo)); + CALLOC_ARRAY(repo, 1); argv++; for (i = 1; i < argc; i++, argv++) { |