aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--editors/diff.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/editors/diff.c b/editors/diff.c
index b89bbc1dc..0c75873b3 100644
--- a/editors/diff.c
+++ b/editors/diff.c
@@ -409,7 +409,7 @@ static void fetch(FILE_and_pos_t *ft, const off_t *ix, int a, int b, int ch)
409 * assigned dynamically allocated vectors of the offsets of the lines 409 * assigned dynamically allocated vectors of the offsets of the lines
410 * of the old and new file respectively. These must be freed by the caller. 410 * of the old and new file respectively. These must be freed by the caller.
411 */ 411 */
412static int *create_J(FILE_and_pos_t ft[2], int nlen[2], off_t *ix[2]) 412static NOINLINE int *create_J(FILE_and_pos_t ft[2], int nlen[2], off_t *ix[2])
413{ 413{
414 int *J, slen[2], *class, *member; 414 int *J, slen[2], *class, *member;
415 struct line *nfile[2], *sfile[2]; 415 struct line *nfile[2], *sfile[2];
@@ -542,8 +542,10 @@ start:
542 tok1 = read_token(&ft[1], tok1); 542 tok1 = read_token(&ft[1], tok1);
543 543
544 if (((tok0 ^ tok1) & TOK_EMPTY) != 0 /* one is empty (not both) */ 544 if (((tok0 ^ tok1) & TOK_EMPTY) != 0 /* one is empty (not both) */
545 || (!(tok0 & TOK_EMPTY) && TOK2CHAR(tok0) != TOK2CHAR(tok1))) 545 || (!(tok0 & TOK_EMPTY) && TOK2CHAR(tok0) != TOK2CHAR(tok1))
546 ) {
546 J[i] = 0; /* Break the correspondence */ 547 J[i] = 0; /* Break the correspondence */
548 }
547 } while (!(tok0 & tok1 & TOK_EMPTY)); 549 } while (!(tok0 & tok1 & TOK_EMPTY));
548 } 550 }
549 } 551 }