diff options
author | Baptiste Daroussin <bapt@FreeBSD.org> | 2017-12-06 20:09:30 +0000 |
---|---|---|
committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2017-12-06 20:09:30 +0000 |
commit | 0ace12afe47711d31418305e3ebbdac8aa038164 (patch) | |
tree | fbafe726a647cd9a05a1deb0442f67e0e125acd9 /usr.bin/sdiff | |
parent | 2c320002252043900833444d7dc8b88876a70e24 (diff) | |
download | src-test2-0ace12afe47711d31418305e3ebbdac8aa038164.tar.gz src-test2-0ace12afe47711d31418305e3ebbdac8aa038164.zip |
Notes
Diffstat (limited to 'usr.bin/sdiff')
-rw-r--r-- | usr.bin/sdiff/sdiff.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/usr.bin/sdiff/sdiff.c b/usr.bin/sdiff/sdiff.c index 614ac5606ef2..9cfecbc79378 100644 --- a/usr.bin/sdiff/sdiff.c +++ b/usr.bin/sdiff/sdiff.c @@ -618,7 +618,7 @@ QUIT: * Takes into account that tabs can take multiple columns. */ static void -println(const char *s1, const char div, const char *s2) +println(const char *s1, const char divider, const char *s2) { size_t col; @@ -635,7 +635,7 @@ println(const char *s1, const char div, const char *s2) putchar(' '); /* Only print left column. */ - if (div == ' ' && !s2) { + if (divider == ' ' && !s2) { printf(" (\n"); return; } @@ -645,10 +645,10 @@ println(const char *s1, const char div, const char *s2) * need to add the space for padding. */ if (!s2) { - printf(" %c\n", div); + printf(" %c\n", divider); return; } - printf(" %c ", div); + printf(" %c ", divider); col += 3; /* Skip angle bracket and space. */ @@ -870,14 +870,14 @@ parsecmd(FILE *diffpipe, FILE *file1, FILE *file2) * Queues up a diff line. */ static void -enqueue(char *left, char div, char *right) +enqueue(char *left, char divider, char *right) { struct diffline *diffp; if (!(diffp = malloc(sizeof(struct diffline)))) err(2, "enqueue"); diffp->left = left; - diffp->div = div; + diffp->div = divider; diffp->right = right; STAILQ_INSERT_TAIL(&diffhead, diffp, diffentries); } |