diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-12-13 11:13:56 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-12-13 11:13:56 -0800 |
| commit | 790c83cda92f95f1b4b91e2ddc056a52a99a055d (patch) | |
| tree | 8c4f7450ba7f91ed307e42a19f910937b54cabd2 /builtin/pack-redundant.c | |
| parent | Merge branch 'mh/doc-remote-helpers' (diff) | |
| parent | Fix sizeof usage in get_permutations (diff) | |
| download | tgif-790c83cda92f95f1b4b91e2ddc056a52a99a055d.tar.xz | |
Merge branch 'maint'
Diffstat (limited to 'builtin/pack-redundant.c')
| -rw-r--r-- | builtin/pack-redundant.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/pack-redundant.c b/builtin/pack-redundant.c index f5c6afc5dd..649c3aaa93 100644 --- a/builtin/pack-redundant.c +++ b/builtin/pack-redundant.c @@ -301,14 +301,14 @@ static void pll_free(struct pll *l) */ static struct pll * get_permutations(struct pack_list *list, int n) { - struct pll *subset, *ret = NULL, *new_pll = NULL, *pll; + struct pll *subset, *ret = NULL, *new_pll = NULL; if (list == NULL || pack_list_size(list) < n || n == 0) return NULL; if (n == 1) { while (list) { - new_pll = xmalloc(sizeof(pll)); + new_pll = xmalloc(sizeof(*new_pll)); new_pll->pl = NULL; pack_list_insert(&new_pll->pl, list); new_pll->next = ret; @@ -321,7 +321,7 @@ static struct pll * get_permutations(struct pack_list *list, int n) while (list->next) { subset = get_permutations(list->next, n - 1); while (subset) { - new_pll = xmalloc(sizeof(pll)); + new_pll = xmalloc(sizeof(*new_pll)); new_pll->pl = subset->pl; pack_list_insert(&new_pll->pl, list); new_pll->next = ret; |