diff options
| author | René Scharfe <rene.scharfe@lsrfire.ath.cx> | 2008-07-14 23:22:12 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-15 18:17:59 +0400 |
| commit | 671f0707212c929533dc6ec9e032faee328e4602 (patch) | |
| tree | dbee94a8ff126713d0bb3f72321392e38a66c55e /builtin-merge-recursive.c | |
| parent | 34533004b27df4f34e18d9e26832fcc956a39fca (diff) | |
add context pointer to read_tree_recursive()
Add a pointer parameter to read_tree_recursive(), which is passed to the
callback function. This allows callers of read_tree_recursive() to
share data with the callback without resorting to global variables. All
current callers pass NULL.
Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-merge-recursive.c')
| -rw-r--r-- | builtin-merge-recursive.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin-merge-recursive.c b/builtin-merge-recursive.c index 43bf6aa45e..385e742eef 100644 --- a/builtin-merge-recursive.c +++ b/builtin-merge-recursive.c @@ -256,7 +256,7 @@ struct tree *write_tree_from_memory(void) static int save_files_dirs(const unsigned char *sha1, const char *base, int baselen, const char *path, - unsigned int mode, int stage) + unsigned int mode, int stage, void *context) { int len = strlen(path); char *newpath = xmalloc(baselen + len + 1); @@ -276,7 +276,7 @@ static int save_files_dirs(const unsigned char *sha1, static int get_files_dirs(struct tree *tree) { int n; - if (read_tree_recursive(tree, "", 0, 0, NULL, save_files_dirs) != 0) + if (read_tree_recursive(tree, "", 0, 0, NULL, save_files_dirs, NULL)) return 0; n = current_file_set.nr + current_directory_set.nr; return n; |