[PATCH 3/5] diff_filespec: drop xfrm_flags field
- From
Jeff King <peff@peff.net>
- Date
- Jan 17, 2014, 01:21 UTC
- Message-ID
- <20140117012158.GC7249@sigill.intra.peff.net>
- In-Reply-To
- <20140117011844.GA6870@sigill.intra.peff.net>
The only mention of this field in the code is by some debugging code which prints it out (and it will always be zero, since we never touch it otherwise). It was obsoleted very early on by 25d5ea4 ([PATCH] Redo rename/copy detection logic., 2005-05-24).
Signed-off-by: Jeff King <peff@peff.net> --- No savings here on 64-bit, since this ended up going to padding, but it is what makes the next patch work.
diff.c | 4 ++-- diffcore.h | 1 - 2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/diff.c b/diff.c index 6b4cd0e..8e4a6a9 100644 --- a/diff.c +++ b/diff.c @@ -4139,9 +4139,9 @@ void diff_debug_filespec(struct diff_filespec *s, int x, const char *one) DIFF_FILE_VALID(s) ? "valid" : "invalid", s->mode, s->sha1_valid ? sha1_to_hex(s->sha1) : ""); - fprintf(stderr, "queue[%d] %s size %lu flags %d\n", + fprintf(stderr, "queue[%d] %s size %lu\n", x, one ? one : "", - s->size, s->xfrm_flags); + s->size); } void diff_debug_filepair(const struct diff_filepair *p, int i) diff --git a/diffcore.h b/diffcore.h index 92e4d48..22993e1 100644 --- a/diffcore.h +++ b/diffcore.h @@ -31,7 +31,6 @@ struct diff_filespec { void *cnt_data; unsigned long size; int count; /* Reference count */ - int xfrm_flags; /* for use by the xfrm */ int rename_used; /* Count of rename users */ unsigned short mode; /* file mode */ unsigned sha1_valid : 1; /* if true, use sha1 and trust mode;
-- 1.8.5.2.500.g8060133