summaryrefslogtreecommitdiff
path: root/unpack-trees.h
diff options
context:
space:
mode:
authorRené Scharfe <rene.scharfe@lsrfire.ath.cx>2013-06-02 17:46:56 +0200
committerJunio C Hamano <gitster@pobox.com>2013-06-02 15:31:14 -0700
commit5828e8352c07753a1f751322800524bf9dff8679 (patch)
tree267b32e002843b0f77172d62c9057c92ba1b5b47 /unpack-trees.h
parenteb9ae4b505bfacc4974a9ef4f4e6996c78d04a4c (diff)
downloadgit-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 'unpack-trees.h')
-rw-r--r--unpack-trees.h14
1 files changed, 9 insertions, 5 deletions
diff --git a/unpack-trees.h b/unpack-trees.h
index 5e432f576e..36a73a6d00 100644
--- a/unpack-trees.h
+++ b/unpack-trees.h
@@ -8,7 +8,7 @@
struct unpack_trees_options;
struct exclude_list;
-typedef int (*merge_fn_t)(struct cache_entry **src,
+typedef int (*merge_fn_t)(const struct cache_entry * const *src,
struct unpack_trees_options *options);
enum unpack_trees_error_types {
@@ -77,9 +77,13 @@ struct unpack_trees_options {
extern int unpack_trees(unsigned n, struct tree_desc *t,
struct unpack_trees_options *options);
-int threeway_merge(struct cache_entry **stages, struct unpack_trees_options *o);
-int twoway_merge(struct cache_entry **src, struct unpack_trees_options *o);
-int bind_merge(struct cache_entry **src, struct unpack_trees_options *o);
-int oneway_merge(struct cache_entry **src, struct unpack_trees_options *o);
+int threeway_merge(const struct cache_entry * const *stages,
+ struct unpack_trees_options *o);
+int twoway_merge(const struct cache_entry * const *src,
+ struct unpack_trees_options *o);
+int bind_merge(const struct cache_entry * const *src,
+ struct unpack_trees_options *o);
+int oneway_merge(const struct cache_entry * const *src,
+ struct unpack_trees_options *o);
#endif