Lines Matching refs:diff3_block
81 struct diff3_block {
86 struct diff3_block *next;
172 static bool output_diff3_edscript (FILE *, struct diff3_block *, int const[3], int const[3], char const *, char const *, char const *);
173 static bool output_diff3_merge (FILE *, FILE *, struct diff3_block *, int const[3], int const[3], char const *, char const *, char const *);
174 static struct diff3_block *create_diff3_block (lin, lin, lin, lin, lin, lin);
175 static struct diff3_block *make_3way_diff (struct diff_block *, struct diff_block *);
176 static struct diff3_block *reverse_diff3_blocklist (struct diff3_block *);
177 static struct diff3_block *using_to_diff3_block (struct diff_block *[2], struct diff_block *[2], int, int, struct diff3_block const *);
181 static void output_diff3 (FILE *, struct diff3_block *, int const[3], int const[3]);
224 struct diff3_block *diff3;
493 Create a diff3_block, reserving space as indicated by the ranges.
516 /* Make a three way diff (chain of diff3_block's) from two two way
523 static struct diff3_block *
566 struct diff3_block *result;
567 struct diff3_block *tmpblock;
568 struct diff3_block **result_end;
570 struct diff3_block const *last_diff3;
572 static struct diff3_block const zero_diff3;
651 included in this diff3_block. Create it. */
684 are part of a diff3_block. */
686 static struct diff3_block *
690 struct diff3_block const *last_diff3)
693 struct diff3_block *result;
836 /* Create a diff3_block, with ranges as specified in the arguments.
840 static struct diff3_block *
845 struct diff3_block *result = xmalloc (sizeof *result);
1335 /* Output a three way diff passed as a list of diff3_block's. The
1344 output_diff3 (FILE *outputfile, struct diff3_block *diff,
1350 struct diff3_block *ptr;
1432 dotlines (FILE *outputfile, struct diff3_block *b, int filenum)
1492 output_diff3_edscript (FILE *outputfile, struct diff3_block *diff,
1499 struct diff3_block *b;
1608 output_diff3_merge (FILE *infile, FILE *outputfile, struct diff3_block *diff,
1616 struct diff3_block *b;
1721 static struct diff3_block *
1722 reverse_diff3_blocklist (struct diff3_block *diff)
1724 register struct diff3_block *tmp, *next, *prev;