sort_ref_dir(): simplify logic

Use the more usual indexing idiom for clarity.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/refs.c b/refs.c
index 4e0cfb2af7c0057df8a15d76dac64ca2d057c344..91f0225931858b83765d5339cc242bb1c5b1dbc3 100644 (file)
--- a/refs.c
+++ b/refs.c
@@ -227,11 +227,13 @@ static int is_dup_ref(const struct ref_entry *ref1, const struct ref_entry *ref2
 }
 
 /*
 }
 
 /*

- * Sort the entries in dir (if they are not already sorted).
+ * Sort the entries in dir (if they are not already sorted)
+ * and remove any duplicate entries.

  */
 static void sort_ref_dir(struct ref_dir *dir)
 {
        int i, j;
  */
 static void sort_ref_dir(struct ref_dir *dir)
 {
        int i, j;

+       struct ref_entry *last = NULL;

 
        /*
         * This check also prevents passing a zero-length array to qsort(),
 
        /*
         * This check also prevents passing a zero-length array to qsort(),


@@ -242,16 +244,15 @@ static void sort_ref_dir(struct ref_dir *dir)
 
        qsort(dir->entries, dir->nr, sizeof(*dir->entries), ref_entry_cmp);
 
 
        qsort(dir->entries, dir->nr, sizeof(*dir->entries), ref_entry_cmp);
 

-       /* Remove any duplicates from the ref_dir */
-       i = 0;
-       for (j = 1; j < dir->nr; j++) {
-               if (is_dup_ref(dir->entries[i], dir->entries[j])) {
-                       free_ref_entry(dir->entries[j]);
-                       continue;
-               }
-               dir->entries[++i] = dir->entries[j];
+       /* Remove any duplicates: */
+       for (i = 0, j = 0; j < dir->nr; j++) {
+               struct ref_entry *entry = dir->entries[j];
+               if (last && is_dup_ref(last, entry))
+                       free_ref_entry(entry);
+               else
+                       last = dir->entries[i++] = entry;

        }
        }

-       dir->sorted = dir->nr = i + 1;
+       dir->sorted = dir->nr = i;

 }
 
 #define DO_FOR_EACH_INCLUDE_BROKEN 01
 }
 
 #define DO_FOR_EACH_INCLUDE_BROKEN 01