Fix sizeof usage in get_permutations

Currently it gets the size of an otherwise unrelated, unused variable
instead of the expected struct size.

Signed-off-by: Matthew Daley <mattjd@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/pack-redundant.c b/builtin/pack-redundant.c
index f5c6afc5dd46c8f856d0f125287724bbfdc65db7..649c3aaa93ccdaae21b7884209bd4f28fb558f3e 100644 (file)
--- 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)
 {
  */
 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) {
 
        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;
                        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) {
        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;
                        new_pll->pl = subset->pl;
                        pack_list_insert(&new_pll->pl, list);
                        new_pll->next = ret;