summaryrefslogtreecommitdiff
path: root/apply.h
diff options
context:
space:
mode:
Diffstat (limited to 'apply.h')
-rw-r--r--apply.h9
1 files changed, 3 insertions, 6 deletions
diff --git a/apply.h b/apply.h
index b3d6783d55..dc4a019057 100644
--- a/apply.h
+++ b/apply.h
@@ -35,11 +35,9 @@ enum apply_verbosity {
struct apply_state {
const char *prefix;
- int prefix_length;
- /* These are lock_file related */
- struct lock_file *lock_file;
- int newfd;
+ /* Lock file */
+ struct lock_file lock_file;
/* These control what gets looked at and modified */
int apply; /* this is not a dry-run */
@@ -117,8 +115,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);