diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2016-11-22 17:00:44 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-11-23 08:53:11 -0800 |
| commit | f054996d8370c3213f8c8cbde908545ba6c0f854 (patch) | |
| tree | 39cda3bab3d01a3568e5dda153271efada5a676b | |
| parent | 1e37181391e305a7ab0c382ca3c3b2de998d4138 (diff) | |
| download | git-f054996d8370c3213f8c8cbde908545ba6c0f854.tar.gz | |
worktree.c: zero new 'struct worktree' on allocation
This keeps things a bit simpler when we add more fields, knowing that
default values are always zero.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | worktree.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/worktree.c b/worktree.c index f7869f8d60..f7c1b5e24d 100644 --- a/worktree.c +++ b/worktree.c @@ -91,16 +91,11 @@ static struct worktree *get_main_worktree(void) if (parse_ref(path.buf, &head_ref, &is_detached) < 0) goto done; - worktree = xmalloc(sizeof(struct worktree)); + worktree = xcalloc(1, sizeof(*worktree)); worktree->path = strbuf_detach(&worktree_path, NULL); - worktree->id = NULL; worktree->is_bare = is_bare; - worktree->head_ref = NULL; worktree->is_detached = is_detached; - worktree->is_current = 0; add_head_info(&head_ref, worktree); - worktree->lock_reason = NULL; - worktree->lock_reason_valid = 0; done: strbuf_release(&path); @@ -138,16 +133,11 @@ static struct worktree *get_linked_worktree(const char *id) if (parse_ref(path.buf, &head_ref, &is_detached) < 0) goto done; - worktree = xmalloc(sizeof(struct worktree)); + worktree = xcalloc(1, sizeof(*worktree)); worktree->path = strbuf_detach(&worktree_path, NULL); worktree->id = xstrdup(id); - worktree->is_bare = 0; - worktree->head_ref = NULL; worktree->is_detached = is_detached; - worktree->is_current = 0; add_head_info(&head_ref, worktree); - worktree->lock_reason = NULL; - worktree->lock_reason_valid = 0; done: strbuf_release(&path); |