proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-21 14:39:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix some compile warnings and trailing whitespace

Browse Source
This commit is contained in:
Russell Belfer 2013-05-02 03:06:34 -07:00
parent d82d66c96d
commit 81b7dec4ee
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/index.c
View File

@ -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_a = a;
const git_index_name_entry *name_b = b; const git_index_name_entry *name_b = b;
if (name_a->ancestor && !name_b->ancestor) if (name_a->ancestor && !name_b->ancestor)
return 1; return 1;
if (!name_a->ancestor && name_b->ancestor) if (!name_a->ancestor && name_b->ancestor)
return -1; return -1;
if (name_a->ancestor) if (name_a->ancestor)
return strcmp(name_a->ancestor, name_b->ancestor); return strcmp(name_a->ancestor, name_b->ancestor);
if (!name_a->ours || !name_b->ours) if (!name_a->ours || !name_b->ours)
return 0; return 0;
return strcmp(name_a->ours, name_b->ours); return strcmp(name_a->ours, name_b->ours);
} }
/** /**
* 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;
const git_index_name_entry *name_b = b; const git_index_name_entry *name_b = b;
if (name_a->ancestor && !name_b->ancestor) if (name_a->ancestor && !name_b->ancestor)
return 1; return 1;
if (!name_a->ancestor && name_b->ancestor) if (!name_a->ancestor && name_b->ancestor)
return -1; return -1;
if (name_a->ancestor) if (name_a->ancestor)
return strcasecmp(name_a->ancestor, name_b->ancestor); return strcasecmp(name_a->ancestor, name_b->ancestor);
if (!name_a->ours || !name_b->ours) if (!name_a->ours || !name_b->ours)
return 0; return 0;
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)
{ {