Skip site navigation (1)Skip section navigation (2) 
Date:      Mon, 1 Aug 2022 13:56:46 GMT
From:      Tom Jones <thj@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: ca53a8445ab3 - main - diff3: Replace literal marker with variable
Message-ID:  <202208011356.271Dukx7097598@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
The branch main has been updated by thj:

URL: https://cgit.FreeBSD.org/src/commit/?id=ca53a8445ab32987b118011c25c520eedf58881c

commit ca53a8445ab32987b118011c25c520eedf58881c
Author:     Tom Jones <thj@FreeBSD.org>
AuthorDate: 2022-08-01 13:46:09 +0000
Commit:     Tom Jones <thj@FreeBSD.org>
CommitDate: 2022-08-01 13:53:53 +0000

    diff3: Replace literal marker with variable
    
    Sponsored by:   Klara, Inc.
---
 usr.bin/diff3/diff3.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/usr.bin/diff3/diff3.c b/usr.bin/diff3/diff3.c
index f3058e0d5c4e..7adb9b5c5043 100644
--- a/usr.bin/diff3/diff3.c
+++ b/usr.bin/diff3/diff3.c
@@ -144,6 +144,7 @@ static char *f1mark, *f2mark, *f3mark;
 static const char *oldmark = "<<<<<<<";
 static const char *orgmark = "|||||||";
 static const char *newmark = ">>>>>>>";
+static const char *divider = "=======";
 
 static bool duplicate(struct range *, struct range *);
 static int edit(struct diff *, bool, int, int);
@@ -599,7 +600,7 @@ edscript(int n)
 			prange(&de[n].old, delete);
 		} else {
 			printf("%da\n", de[n].old.to - 1);
-			printf("=======\n");
+			printf("%s\n", divider);
 		}
 		printrange(fp[2], &de[n].new);
 		if (!oflag || !overlap[n]) {
@@ -657,7 +658,7 @@ Ascript(int n)
 				printf("%s %s\n", oldmark, f2mark);
 				if (!deleteold)
 					printrange(fp[1], &de[n].old);
-				printf("=======\n.\n");
+				printf("%s\n.\n", divider);
 			}
 
 		} else if (de[n].type == DIFF_TYPE3) {
@@ -676,7 +677,7 @@ Ascript(int n)
 				} else
 					printrange(fp[1], &de[n].old);
 
-				printf("=======\n");
+				printf("%s\n", divider);
 				printrange(fp[2], &de[n].new);
 			}
 
@@ -724,7 +725,7 @@ mergescript(int i)
 		if (de[n].type == DIFF_TYPE2) {
 			printf("%s %s\n", oldmark, f2mark);
 			printrange(fp[1], &de[n].old);
-			printf("=======\n");
+			printf("%s\n", divider);
 			printrange(fp[2], &de[n].new);
 			printf("%s %s\n", newmark, f3mark);
 		} else if (de[n].type == DIFF_TYPE3) {
@@ -744,7 +745,7 @@ mergescript(int i)
 				} else
 					printrange(fp[1], &de[n].old);
 
-				printf("=======\n");
+				printf("%s\n", divider);
 
 				printrange(fp[2], &de[n].new);
 				printf("%s %s\n", newmark, f3mark);

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202208011356.271Dukx7097598>