apply: move lockfile into `apply_state`

diff --git a/apply.h b/apply.h
index d9b395770364b5495fc1136248efd64bd3a5e66d..cf00cda171cf42cef1164916c973e2e339f41b54 100644 (file)
--- a/apply.h
+++ b/apply.h
@@ -37,7 +37,7 @@ struct apply_state {
        const char *prefix;
 
        /* These are lock_file related */
-       struct lock_file *lock_file;
+       struct lock_file lock_file;
        int newfd;
 
        /* These control what gets looked at and modified */
@@ -116,8 +116,7 @@ extern int apply_parse_options(int argc, const char **argv,
                               int *force_apply, int *options,
                               const char * const *apply_usage);
 extern int init_apply_state(struct apply_state *state,
-                           const char *prefix,
-                           struct lock_file *lock_file);
+                           const char *prefix);
 extern void clear_apply_state(struct apply_state *state);
 extern int check_apply_state(struct apply_state *state, int force_apply);