Make "insert_by_date()" match "commit_list_insert()"

Same argument order, same return type.  This allows us to use a function
pointer to choose one over the other.

diff --git a/commit.c b/commit.c
index 03f8ca87960bff7694f9eac5640bd42d928f1b25..254c902716e08266a89a9df245bcda5808737b6a 100644 (file)
--- a/commit.c
+++ b/commit.c
@@ -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;
 {
        struct commit_list **pp = list;
        struct commit_list *p;


@@ -157,7 +157,7 @@ void insert_by_date(struct commit_list **list, struct commit *item)
                }
                pp = &p->next;
        }
                }
                pp = &p->next;
        }

-       commit_list_insert(item, pp);
+       return commit_list_insert(item, pp);

 }
 
        
 }
 
        


@@ -165,7 +165,7 @@ void sort_by_date(struct commit_list **list)
 {
        struct commit_list *ret = NULL;
        while (*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;
                *list = (*list)->next;
        }
        *list = ret;


@@ -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;
                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;
        }
                }
                parents = parents->next;
        }

diff --git a/commit.h b/commit.h
index 1339231255f243857519595630cf65432dfc0628..491b2c148f2d1dfe5db8695fecb4fc5e848a0229 100644 (file)
--- a/commit.h
+++ b/commit.h
@@ -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);
 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);
 
 
 void free_commit_list(struct commit_list *list);
 


@@ -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);
 
 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.
  **/
 /** Removes the first commit from a list sorted by date, and adds all
  * of its parents.
  **/

diff --git a/epoch.c b/epoch.c
index 6dbcfb34a5a8762608e99fe79f1a4f17475d6f8a..abfd594bb9c9cb0abc427dd35c29a0a6bc929978 100644 (file)
--- a/epoch.c
+++ b/epoch.c
@@ -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);
 
                                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()))
                                        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);
                                }
                        }
                                        add(&parent_node->pending, &parent_node->pending, &distribution);
                                }
                        }

diff --git a/rev-list.c b/rev-list.c
index 0d3c7741a59254f62a135a3bd749e38e1b8dfe71..8117caf569cb8b5275075a63506e41f0478abe08 100644 (file)
--- a/rev-list.c
+++ b/rev-list.c
@@ -482,7 +482,7 @@ int main(int argc, char **argv)
                commit = get_commit_reference(arg, flags);
                if (!commit)
                        continue;
                commit = get_commit_reference(arg, flags);
                if (!commit)
                        continue;

-               insert_by_date(&list, commit);
+               insert_by_date(commit, &list);

        }
 
        if (!merge_order) {             
        }
 
        if (!merge_order) {