Commit 81b7dec4ee21454775f932717273a90a46f78e1f
2013-05-02T03:06:34
Fix some compile warnings and trailing whitespace
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61
diff --git a/src/index.c b/src/index.c
index 1771f29..d4aa475 100644
--- a/src/index.c
+++ b/src/index.c
@@ -193,44 +193,46 @@ static int conflict_name_cmp(const void *a, const void *b)
{
const git_index_name_entry *name_a = a;
const git_index_name_entry *name_b = b;
-
+
if (name_a->ancestor && !name_b->ancestor)
return 1;
-
+
if (!name_a->ancestor && name_b->ancestor)
return -1;
-
+
if (name_a->ancestor)
return strcmp(name_a->ancestor, name_b->ancestor);
-
+
if (!name_a->ours || !name_b->ours)
return 0;
-
+
return strcmp(name_a->ours, name_b->ours);
}
/**
* TODO: enable this when resolving case insensitive conflicts
*/
+#if 0
static int conflict_name_icmp(const void *a, const void *b)
{
const git_index_name_entry *name_a = a;
const git_index_name_entry *name_b = b;
-
+
if (name_a->ancestor && !name_b->ancestor)
return 1;
-
+
if (!name_a->ancestor && name_b->ancestor)
return -1;
-
+
if (name_a->ancestor)
return strcasecmp(name_a->ancestor, name_b->ancestor);
-
+
if (!name_a->ours || !name_b->ours)
return 0;
-
+
return strcasecmp(name_a->ours, name_b->ours);
}
+#endif
static int reuc_srch(const void *key, const void *array_member)
{