Changeset 782 for git/branches/dmik/builtin/pack-redundant.c

Timestamp:

Jun 23, 2014, 9:45:51 PM (11 years ago)

Author:

dmik

Message:

git: Merge version 2.0.0 from vendor to dmik branch.

Location:

git/branches/dmik

Files:

• . (modified) (1 prop)
• builtin/pack-redundant.c (modified) (3 diffs)

git/branches/dmik/builtin/pack-redundant.c ¶

@@ -302 +302 @@
 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)
@@ -309 +309 @@
         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);
@@ -322 +322 @@
                 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);