The previous step added the "flags" member to apply_state, but it is never used. Remove it and move the bit assignment macro to apply.c as that is just a private implementation detail.
Signed-off-by: Junio C Hamano <[email protected]> --- apply.c | 2 ++ apply.h | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/apply.c b/apply.c index 63455cd65f..7663e63df7 100644 --- a/apply.c +++ b/apply.c @@ -2282,6 +2282,8 @@ static void show_stats(struct apply_state *state, struct patch *patch) add, pluses, del, minuses); } +#define APPLY_FLAGS_CR_AT_EOL (1<<0) + static int read_old_data(struct stat *st, const char *path, struct strbuf *buf, int flags) { enum safe_crlf safe_crlf = flags & APPLY_FLAGS_CR_AT_EOL ? diff --git a/apply.h b/apply.h index 192140280f..b3d6783d55 100644 --- a/apply.h +++ b/apply.h @@ -33,13 +33,9 @@ enum apply_verbosity { #define APPLY_SYMLINK_GOES_AWAY 01 #define APPLY_SYMLINK_IN_RESULT 02 - -#define APPLY_FLAGS_CR_AT_EOL (1<<0) - struct apply_state { const char *prefix; int prefix_length; - int flags; /* These are lock_file related */ struct lock_file *lock_file; -- 2.14.1-331-g7631d96230
