diff options
author | Jeff King <peff@peff.net> | 2016-09-27 00:37:33 -0400 |
---|---|---|
committer | Michael Haggerty <mhagger@alum.mit.edu> | 2016-10-03 10:56:59 +0200 |
commit | b28825a1fa152cc33e957083faef6fdb7dff1a44 (patch) | |
tree | 803abdd45bfc7b6ca87b34d62459cb397744dcda | |
parent | 19f1a8e6f289b07389d525a12a13a4aaeaabe443 (diff) | |
download | libgit2-b28825a1fa152cc33e957083faef6fdb7dff1a44.tar.gz |
xdiff: rename "struct group" to "struct xdlgroup"
Commit a49895b593 (xdl_change_compact(): introduce the concept
of a change group, 2016-08-22) added a "struct group" type
to xdiff/xdiffi.c. But the POSIX system header "grp.h"
already defines "struct group" (it is part of the getgrnam
interface).
Let's resolve by giving the xdiff variant a scoped name,
which is closer to other xdiff types anyway (e.g.,
xdlfile_t, though note that xdiff is fond if typedefs when
Git usually is not).
-rw-r--r-- | src/xdiff/xdiffi.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/xdiff/xdiffi.c b/src/xdiff/xdiffi.c index 144749690..e830eb0f6 100644 --- a/src/xdiff/xdiffi.c +++ b/src/xdiff/xdiffi.c @@ -707,7 +707,7 @@ static int score_cmp(struct split_score *s1, struct split_score *s2) * Note that loops that are testing for changed lines in xdf->rchg do not need * index bounding since the array is prepared with a zero at position -1 and N. */ -struct group { +struct xdlgroup { /* * The index of the first changed line in the group, or the index of * the unchanged line above which the (empty) group is located. @@ -724,7 +724,7 @@ struct group { /* * Initialize g to point at the first group in xdf. */ -static void group_init(xdfile_t *xdf, struct group *g) +static void group_init(xdfile_t *xdf, struct xdlgroup *g) { g->start = g->end = 0; while (xdf->rchg[g->end]) @@ -735,7 +735,7 @@ static void group_init(xdfile_t *xdf, struct group *g) * Move g to describe the next (possibly empty) group in xdf and return 0. If g * is already at the end of the file, do nothing and return -1. */ -static inline int group_next(xdfile_t *xdf, struct group *g) +static inline int group_next(xdfile_t *xdf, struct xdlgroup *g) { if (g->end == xdf->nrec) return -1; @@ -751,7 +751,7 @@ static inline int group_next(xdfile_t *xdf, struct group *g) * Move g to describe the previous (possibly empty) group in xdf and return 0. * If g is already at the beginning of the file, do nothing and return -1. */ -static inline int group_previous(xdfile_t *xdf, struct group *g) +static inline int group_previous(xdfile_t *xdf, struct xdlgroup *g) { if (g->start == 0) return -1; @@ -768,7 +768,7 @@ static inline int group_previous(xdfile_t *xdf, struct group *g) * following group, expand this group to include it. Return 0 on success or -1 * if g cannot be slid down. */ -static int group_slide_down(xdfile_t *xdf, struct group *g, long flags) +static int group_slide_down(xdfile_t *xdf, struct xdlgroup *g, long flags) { if (g->end < xdf->nrec && recs_match(xdf->recs[g->start], xdf->recs[g->end], flags)) { @@ -789,7 +789,7 @@ static int group_slide_down(xdfile_t *xdf, struct group *g, long flags) * into a previous group, expand this group to include it. Return 0 on success * or -1 if g cannot be slid up. */ -static int group_slide_up(xdfile_t *xdf, struct group *g, long flags) +static int group_slide_up(xdfile_t *xdf, struct xdlgroup *g, long flags) { if (g->start > 0 && recs_match(xdf->recs[g->start - 1], xdf->recs[g->end - 1], flags)) { @@ -817,7 +817,7 @@ static void xdl_bug(const char *msg) * size. */ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) { - struct group g, go; + struct xdlgroup g, go; long earliest_end, end_matching_other; long groupsize; |