development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-11-05 18:59:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

is_dup_ref(): extract function from sort_ref_array()

Browse source 
Giving the function a name makes the code easier to understand.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Michael Haggerty 2011-12-12 06:38:15 +01:00 committed by Junio C Hamano
parent 6af1038bee
commit 202a56a924
1 changed files with 25 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
refs.c
View file

@ -84,9 +84,28 @@ static int ref_entry_cmp(const void *a, const void *b)
return strcmp(one->name, two->name); return strcmp(one->name, two->name);
} }
/*
* Emit a warning and return true iff ref1 and ref2 have the same name
* and the same sha1. Die if they have the same name but different
* sha1s.
*/
static int is_dup_ref(const struct ref_entry *ref1, const struct ref_entry *ref2)
{
if (!strcmp(ref1->name, ref2->name)) {
/* Duplicate name; make sure that the SHA1s match: */
if (hashcmp(ref1->sha1, ref2->sha1))
die("Duplicated ref, and SHA1s don't match: %s",
ref1->name);
warning("Duplicated ref: %s", ref1->name);
return 1;
} else {
return 0;
}
}
static void sort_ref_array(struct ref_array *array) static void sort_ref_array(struct ref_array *array)
{ {
int i = 0, j = 1; int i, j;
/* Nothing to sort unless there are at least two entries */ /* Nothing to sort unless there are at least two entries */
if (array->nr < 2) if (array->nr < 2)
@ -95,19 +114,13 @@ static void sort_ref_array(struct ref_array *array)
qsort(array->refs, array->nr, sizeof(*array->refs), ref_entry_cmp); qsort(array->refs, array->nr, sizeof(*array->refs), ref_entry_cmp);
/* Remove any duplicates from the ref_array */ /* Remove any duplicates from the ref_array */
for (; j < array->nr; j++) { i = 0;
struct ref_entry *a = array->refs[i]; for (j = 1; j < array->nr; j++) {
struct ref_entry *b = array->refs[j]; if (is_dup_ref(array->refs[i], array->refs[j])) {
if (!strcmp(a->name, b->name)) { free(array->refs[j]);
if (hashcmp(a->sha1, b->sha1))
die("Duplicated ref, and SHA1s don't match: %s",
a->name);
warning("Duplicated ref: %s", a->name);
free(b);
continue; continue;
} }
i++; array->refs[++i] = array->refs[j];
array->refs[i] = array->refs[j];
} }
array->nr = i + 1; array->nr = i + 1;
} }