summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-06-23 06:19:43 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-06-23 06:19:43 (GMT)
commit63daae47e59b72ebec3595ca3e9917e6c595c814 (patch)
tree9db85db2ee8e1ec15477df20814adf07be5d4af2
parent0ce396431ee710aa406f7e41ad9578dcac54085f (diff)
downloadgit-63daae47e59b72ebec3595ca3e9917e6c595c814.zip
git-63daae47e59b72ebec3595ca3e9917e6c595c814.tar.gz
git-63daae47e59b72ebec3595ca3e9917e6c595c814.tar.bz2
Two trivial -Wcast-qual fixes
Luiz Fernando N. Capitulino noticed the one in tree-walk.h where we cast away constness while computing the legnth of a tree entry. Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--cache-tree.c2
-rw-r--r--tree-walk.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/cache-tree.c b/cache-tree.c
index 350a79b..077f034 100644
--- a/cache-tree.c
+++ b/cache-tree.c
@@ -478,7 +478,7 @@ static struct cache_tree *read_one(const char **buffer, unsigned long *size_p)
if (0 <= it->entry_count) {
if (size < 20)
goto free_return;
- hashcpy(it->sha1, (unsigned char*)buf);
+ hashcpy(it->sha1, (const unsigned char*)buf);
buf += 20;
size -= 20;
}
diff --git a/tree-walk.h b/tree-walk.h
index ee747ab..db0fbdc 100644
--- a/tree-walk.h
+++ b/tree-walk.h
@@ -22,7 +22,7 @@ static inline const unsigned char *tree_entry_extract(struct tree_desc *desc, co
static inline int tree_entry_len(const char *name, const unsigned char *sha1)
{
- return (char *)sha1 - (char *)name - 1;
+ return (const char *)sha1 - name - 1;
}
void update_tree_entry(struct tree_desc *);