diff options
| author | Russell Belfer <rb@github.com> | 2013-05-02 14:06:34 +0400 |
|---|---|---|
| committer | Russell Belfer <rb@github.com> | 2013-05-02 14:06:34 +0400 |
| commit | 81b7dec4ee21454775f932717273a90a46f78e1f (patch) | |
| tree | 642337a4be2b5ded0ed2f85939d8af00806bb2c2 /src/index.c | |
| parent | d82d66c96d11131440deb8f79443ee0b44d40eff (diff) | |
Fix some compile warnings and trailing whitespace
Diffstat (limited to 'src/index.c')
| -rw-r--r-- | src/index.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/src/index.c b/src/index.c index 1771f2957..d4aa475a9 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) { |