d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename variables confusing gcc 4.2.1

Browse Source 
While there is no reason it shadows div(3) gcc 4.2.1 complains about it

MFC after:	1 week
This commit is contained in:
Baptiste Daroussin 2017-12-06 20:09:30 +00:00
parent 2c32000225
commit 0ace12afe4
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
usr.bin/sdiff/sdiff.c
View File

@ -618,7 +618,7 @@ prompt(const char *s1, const char *s2)
* 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);
}