diff options
| author | René Scharfe <rene.scharfe@lsrfire.ath.cx> | 2013-06-02 17:46:56 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-02 15:31:14 -0700 |
| commit | 5828e8352c07753a1f751322800524bf9dff8679 (patch) | |
| tree | 267b32e002843b0f77172d62c9057c92ba1b5b47 /builtin/read-tree.c | |
| parent | eb9ae4b505bfacc4974a9ef4f4e6996c78d04a4c (diff) | |
| download | git-5828e8352c07753a1f751322800524bf9dff8679.tar.gz | |
diff-lib, read-tree, unpack-trees: mark cache_entry array paramters const
Change the type merge_fn_t to accept the array of cache_entry pointers
as const pointers to const pointers. This documents the fact that the
merge functions don't modify the cache_entry contents or replace any of
the pointers in the array.
Only a single cast is necessary in unpack_nondirectories because adding
two const modifiers at once is not allowed in C. The cast is safe in
that it doesn't mask any modfication; call_unpack_fn only needs the
array for reading.
Signed-off-by: René Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/read-tree.c')
| -rw-r--r-- | builtin/read-tree.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/read-tree.c b/builtin/read-tree.c index b847486cba..0f5d7fe23f 100644 --- a/builtin/read-tree.c +++ b/builtin/read-tree.c @@ -80,7 +80,8 @@ static void debug_stage(const char *label, const struct cache_entry *ce, sha1_to_hex(ce->sha1)); } -static int debug_merge(struct cache_entry **stages, struct unpack_trees_options *o) +static int debug_merge(const struct cache_entry * const *stages, + struct unpack_trees_options *o) { int i; |