From: Christian Couder <christian.couder@xxxxxxxxx> We cannot have a 'struct lock_file' allocated on the stack, as lockfile.c keeps a linked list of all created lock_file structures. Also 'struct apply_state' users might later want the same 'struct lock_file' instance to be reused by different series of calls to the apply api. So let's add a 'struct lock_file *lock_file' pointer into 'struct apply_state' and have the user of 'struct apply_state' allocate memory for the actual 'struct lock_file' instance. Let's also add an argument to init_apply_state(), so that the caller can easily supply a pointer to the allocated instance. Helped-by: Eric Sunshine <sunshine@xxxxxxxxxxxxxx> Signed-off-by: Christian Couder <chriscool@xxxxxxxxxxxxx> Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx> --- This is to replace: "[PATCH v3 48/49] builtin/apply: move 'lock_file' global into 'struct apply_state'" from the "libify apply and use lib in am, part 1" patch series, and "[PATCH v4 1/2] builtin/apply: add 'lock_file' pointer into 'struct apply_state'" that was sent previously to replace v3 48/49 above. See: http://thread.gmane.org/gmane.comp.version-control.git/296350/ The only change compared to v4 1/2 is that the comment above 'struct lock_file *lock_file' in 'struct apply_state' has been replaced with a much shorter one. This 2 patch long patch series on top of the other unchanged commits from v3 is available here: https://github.com/chriscool/git/commits/libify-apply64 builtin/apply.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index 5027f1b..bbe0df1 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -52,6 +52,9 @@ struct apply_state { const char *prefix; int prefix_length; + /* These are lock_file related */ + struct lock_file *lock_file; + /* These control what gets looked at and modified */ int apply; /* this is not a dry-run */ int cached; /* apply to the index only */ @@ -4547,7 +4550,7 @@ static int apply_patch(struct apply_state *state, state->update_index = state->check_index && state->apply; if (state->update_index && newfd < 0) - newfd = hold_locked_index(&lock_file, 1); + newfd = hold_locked_index(state->lock_file, 1); if (state->check_index) { if (read_cache() < 0) @@ -4648,11 +4651,14 @@ static int option_parse_directory(const struct option *opt, return 0; } -static void init_apply_state(struct apply_state *state, const char *prefix) +static void init_apply_state(struct apply_state *state, + const char *prefix, + struct lock_file *lock_file) { memset(state, 0, sizeof(*state)); state->prefix = prefix; state->prefix_length = state->prefix ? strlen(state->prefix) : 0; + state->lock_file = lock_file; state->apply = 1; state->line_termination = '\n'; state->p_value = 1; @@ -4705,6 +4711,8 @@ static void check_apply_state(struct apply_state *state, int force_apply) } if (state->check_index) state->unsafe_paths = 0; + if (!state->lock_file) + die("BUG: state->lock_file should not be NULL"); } static int apply_all_patches(struct apply_state *state, @@ -4769,7 +4777,7 @@ static int apply_all_patches(struct apply_state *state, } if (state->update_index) { - if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK)) + if (write_locked_index(&the_index, state->lock_file, COMMIT_LOCK)) die(_("Unable to write new index file")); } @@ -4852,7 +4860,7 @@ int cmd_apply(int argc, const char **argv, const char *prefix) OPT_END() }; - init_apply_state(&state, prefix); + init_apply_state(&state, prefix, &lock_file); argc = parse_options(argc, argv, state.prefix, builtin_apply_options, apply_usage, 0); -- 2.8.2.445.g4623162 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html