mirror of
https://git.proxmox.com/git/libgit2
synced 2025-05-21 22:21:37 +00:00
Fix some compile warnings and trailing whitespace
This commit is contained in:
parent
d82d66c96d
commit
81b7dec4ee
@ -212,6 +212,7 @@ static int conflict_name_cmp(const void *a, const void *b)
|
|||||||
/**
|
/**
|
||||||
* TODO: enable this when resolving case insensitive conflicts
|
* TODO: enable this when resolving case insensitive conflicts
|
||||||
*/
|
*/
|
||||||
|
#if 0
|
||||||
static int conflict_name_icmp(const void *a, const void *b)
|
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_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);
|
return strcasecmp(name_a->ours, name_b->ours);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
static int reuc_srch(const void *key, const void *array_member)
|
static int reuc_srch(const void *key, const void *array_member)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user