diff options
| author | Kirill A. Shutemov <kirill@shutemov.name> | 2011-07-15 17:56:48 +0300 |
|---|---|---|
| committer | Vicent Marti <tanoku@gmail.com> | 2011-07-25 21:12:47 +0200 |
| commit | 0cbbdc26a975ef73bba1f7161bd9c7313d5cab24 (patch) | |
| tree | 5bd1c8519ef07cc93d9f769511a1f77f1e3b1b77 /src/tree.c | |
| parent | 2ba222c5c5c406dd49492e0b5ac69d75ec997e35 (diff) | |
| download | libgit2-0cbbdc26a975ef73bba1f7161bd9c7313d5cab24.tar.gz | |
tree: fix cast warnings
/home/kas/git/public/libgit2/src/tree.c: In function ‘entry_search_cmp’:
/home/kas/git/public/libgit2/src/tree.c:47:36: warning: cast discards ‘__attribute__((const))’ qualifier from pointer target type [-Wcast-qual]
/home/kas/git/public/libgit2/src/tree.c: In function ‘git_treebuilder_remove’:
/home/kas/git/public/libgit2/src/tree.c:443:31: warning: cast discards ‘__attribute__((const))’ qualifier from pointer target type [-Wcast-qual]
Signed-off-by: Kirill A. Shutemov <kirill@shutemov.name>
Diffstat (limited to 'src/tree.c')
| -rw-r--r-- | src/tree.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/tree.c b/src/tree.c index 975d36a70..8e370667d 100644 --- a/src/tree.c +++ b/src/tree.c @@ -44,8 +44,8 @@ struct tree_key_search { int entry_search_cmp(const void *key, const void *array_member) { - struct tree_key_search *ksearch = (struct tree_key_search *)key; - const git_tree_entry *entry = (const git_tree_entry *)(array_member); + const struct tree_key_search *ksearch = key; + const git_tree_entry *entry = array_member; int result = git_futils_cmp_path( @@ -415,7 +415,7 @@ int git_treebuilder_insert(git_tree_entry **entry_out, git_treebuilder *bld, con return GIT_SUCCESS; } -const git_tree_entry *git_treebuilder_get(git_treebuilder *bld, const char *filename) +static git_tree_entry *treebuilder_get(git_treebuilder *bld, const char *filename) { int idx; git_tree_entry *entry; @@ -438,9 +438,14 @@ const git_tree_entry *git_treebuilder_get(git_treebuilder *bld, const char *file return entry; } +const git_tree_entry *git_treebuilder_get(git_treebuilder *bld, const char *filename) +{ + return treebuilder_get(bld, filename); +} + int git_treebuilder_remove(git_treebuilder *bld, const char *filename) { - git_tree_entry *remove_ptr = (git_tree_entry *)git_treebuilder_get(bld, filename); + git_tree_entry *remove_ptr = treebuilder_get(bld, filename); if (remove_ptr == NULL || remove_ptr->removed) return git__throw(GIT_ENOTFOUND, "Failed to remove entry. File isn't in the tree"); |