Fix some compile warnings and trailing whitespace

This commit is contained in:
Russell Belfer 2013-05-02 03:06:34 -07:00
parent d82d66c96d
commit 81b7dec4ee

View File

@ -212,6 +212,7 @@ static int conflict_name_cmp(const void *a, const void *b)
/**
* 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;
@ -231,6 +232,7 @@ static int conflict_name_icmp(const void *a, const void *b)
return strcasecmp(name_a->ours, name_b->ours);
}
#endif
static int reuc_srch(const void *key, const void *array_member)
{