Skip to content

Commit

Permalink
Make "insert_by_date()" match "commit_list_insert()"
Browse files Browse the repository at this point in the history
Same argument order, same return type.  This allows us to use a function
pointer to choose one over the other.
  • Loading branch information
Linus Torvalds committed Jul 6, 2005
1 parent f6069c5 commit f755494
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 9 deletions.
8 changes: 4 additions & 4 deletions commit.c
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ void free_commit_list(struct commit_list *list)
}
}

void insert_by_date(struct commit_list **list, struct commit *item)
struct commit_list * insert_by_date(struct commit *item, struct commit_list **list)
{
struct commit_list **pp = list;
struct commit_list *p;
Expand All @@ -157,15 +157,15 @@ void insert_by_date(struct commit_list **list, struct commit *item)
}
pp = &p->next;
}
commit_list_insert(item, pp);
return commit_list_insert(item, pp);
}


void sort_by_date(struct commit_list **list)
{
struct commit_list *ret = NULL;
while (*list) {
insert_by_date(&ret, (*list)->item);
insert_by_date((*list)->item, &ret);
*list = (*list)->next;
}
*list = ret;
Expand All @@ -186,7 +186,7 @@ struct commit *pop_most_recent_commit(struct commit_list **list,
parse_commit(commit);
if (!(commit->object.flags & mark)) {
commit->object.flags |= mark;
insert_by_date(list, commit);
insert_by_date(commit, list);
}
parents = parents->next;
}
Expand Down
3 changes: 1 addition & 2 deletions commit.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ int parse_commit_buffer(struct commit *item, void *buffer, unsigned long size);
int parse_commit(struct commit *item);

struct commit_list * commit_list_insert(struct commit *item, struct commit_list **list_p);
struct commit_list * insert_by_date(struct commit *item, struct commit_list **list);

void free_commit_list(struct commit_list *list);

Expand All @@ -44,8 +45,6 @@ enum cmit_fmt {
extern enum cmit_fmt get_commit_format(const char *arg);
extern unsigned long pretty_print_commit(enum cmit_fmt fmt, const char *msg, unsigned long len, char *buf, unsigned long space);

void insert_by_date(struct commit_list **list, struct commit *item);

/** Removes the first commit from a list sorted by date, and adds all
* of its parents.
**/
Expand Down
4 changes: 2 additions & 2 deletions epoch.c
Original file line number Diff line number Diff line change
Expand Up @@ -255,11 +255,11 @@ static int find_base_for_list(struct commit_list *list, struct commit **boundary

if (!parent_node) {
parent_node = new_mass_counter(parent, &distribution);
insert_by_date(&pending, parent);
insert_by_date(parent, &pending);
commit_list_insert(parent, &cleaner);
} else {
if (!compare(&parent_node->pending, get_zero()))
insert_by_date(&pending, parent);
insert_by_date(parent, &pending);
add(&parent_node->pending, &parent_node->pending, &distribution);
}
}
Expand Down
2 changes: 1 addition & 1 deletion rev-list.c
Original file line number Diff line number Diff line change
Expand Up @@ -482,7 +482,7 @@ int main(int argc, char **argv)
commit = get_commit_reference(arg, flags);
if (!commit)
continue;
insert_by_date(&list, commit);
insert_by_date(commit, &list);
}

if (!merge_order) {
Expand Down

0 comments on commit f755494

Please sign in to comment.