mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ob/sequencer-rearrange-cleanup' into next

Browse Source 
Code clean-up.

* ob/sequencer-rearrange-cleanup:
  sequencer: simplify allocation of result array in todo_list_rearrange_squash()
This commit is contained in:
Junio C Hamano
2023-08-09 16:21:04 -07:00
parent 4b5708df7c 82dc42cbd1
commit df4360945c
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sequencer.c
View File

@ -6245,7 +6245,7 @@ static int skip_fixupish(const char *subject, const char **p) {
int todo_list_rearrange_squash(struct todo_list *todo_list) int todo_list_rearrange_squash(struct todo_list *todo_list)
{ {
struct hashmap subject2item; struct hashmap subject2item;
int rearranged = 0, *next, *tail, i, nr = 0, alloc = 0; int rearranged = 0, *next, *tail, i, nr = 0;
char **subjects; char **subjects;
struct commit_todo_item commit_todo; struct commit_todo_item commit_todo;
struct todo_item *items = NULL; struct todo_item *items = NULL;
@ -6357,6 +6357,8 @@ int todo_list_rearrange_squash(struct todo_list *todo_list)
} }
if (rearranged) { if (rearranged) {
ALLOC_ARRAY(items, todo_list->nr);
for (i = 0; i < todo_list->nr; i++) { for (i = 0; i < todo_list->nr; i++) {
enum todo_command command = todo_list->items[i].command; enum todo_command command = todo_list->items[i].command;
int cur = i; int cur = i;
@ -6369,16 +6371,15 @@ int todo_list_rearrange_squash(struct todo_list *todo_list)
continue; continue;
while (cur >= 0) { while (cur >= 0) {
ALLOC_GROW(items, nr + 1, alloc);
items[nr++] = todo_list->items[cur]; items[nr++] = todo_list->items[cur];
cur = next[cur]; cur = next[cur];
} }
} }
assert(nr == todo_list->nr);
todo_list->alloc = nr;
FREE_AND_NULL(todo_list->items); FREE_AND_NULL(todo_list->items);
todo_list->items = items; todo_list->items = items;
todo_list->nr = nr;
todo_list->alloc = alloc;
} }
free(next); free(next);