Skip to content

Commit b28825a

Browse files
peffmhagger
authored andcommitted
xdiff: rename "struct group" to "struct xdlgroup"
Commit a49895b (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).
1 parent 19f1a8e commit b28825a

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

src/xdiff/xdiffi.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -707,7 +707,7 @@ static int score_cmp(struct split_score *s1, struct split_score *s2)
707707
* Note that loops that are testing for changed lines in xdf->rchg do not need
708708
* index bounding since the array is prepared with a zero at position -1 and N.
709709
*/
710-
struct group {
710+
struct xdlgroup {
711711
/*
712712
* The index of the first changed line in the group, or the index of
713713
* the unchanged line above which the (empty) group is located.
@@ -724,7 +724,7 @@ struct group {
724724
/*
725725
* Initialize g to point at the first group in xdf.
726726
*/
727-
static void group_init(xdfile_t *xdf, struct group *g)
727+
static void group_init(xdfile_t *xdf, struct xdlgroup *g)
728728
{
729729
g->start = g->end = 0;
730730
while (xdf->rchg[g->end])
@@ -735,7 +735,7 @@ static void group_init(xdfile_t *xdf, struct group *g)
735735
* Move g to describe the next (possibly empty) group in xdf and return 0. If g
736736
* is already at the end of the file, do nothing and return -1.
737737
*/
738-
static inline int group_next(xdfile_t *xdf, struct group *g)
738+
static inline int group_next(xdfile_t *xdf, struct xdlgroup *g)
739739
{
740740
if (g->end == xdf->nrec)
741741
return -1;
@@ -751,7 +751,7 @@ static inline int group_next(xdfile_t *xdf, struct group *g)
751751
* Move g to describe the previous (possibly empty) group in xdf and return 0.
752752
* If g is already at the beginning of the file, do nothing and return -1.
753753
*/
754-
static inline int group_previous(xdfile_t *xdf, struct group *g)
754+
static inline int group_previous(xdfile_t *xdf, struct xdlgroup *g)
755755
{
756756
if (g->start == 0)
757757
return -1;
@@ -768,7 +768,7 @@ static inline int group_previous(xdfile_t *xdf, struct group *g)
768768
* following group, expand this group to include it. Return 0 on success or -1
769769
* if g cannot be slid down.
770770
*/
771-
static int group_slide_down(xdfile_t *xdf, struct group *g, long flags)
771+
static int group_slide_down(xdfile_t *xdf, struct xdlgroup *g, long flags)
772772
{
773773
if (g->end < xdf->nrec &&
774774
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)
789789
* into a previous group, expand this group to include it. Return 0 on success
790790
* or -1 if g cannot be slid up.
791791
*/
792-
static int group_slide_up(xdfile_t *xdf, struct group *g, long flags)
792+
static int group_slide_up(xdfile_t *xdf, struct xdlgroup *g, long flags)
793793
{
794794
if (g->start > 0 &&
795795
recs_match(xdf->recs[g->start - 1], xdf->recs[g->end - 1], flags)) {
@@ -817,7 +817,7 @@ static void xdl_bug(const char *msg)
817817
* size.
818818
*/
819819
int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {
820-
struct group g, go;
820+
struct xdlgroup g, go;
821821
long earliest_end, end_matching_other;
822822
long groupsize;
823823

0 commit comments

Comments
 (0)