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

Fix -Wincompatible-pointer-types-discards-qualifiers warnings

Browse Source 
MFC after:	1 week
This commit is contained in:
Baptiste Daroussin 2017-12-06 20:05:36 +00:00
parent 6eebec8343
commit 2c32000225
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,7 +29,7 @@ __FBSDID("$FreeBSD$");
#include "extern.h"
#define DIFF_PATH "/usr/bin/diff"
static char diff_path[] = "/usr/bin/diff";
#define WIDTH 126
/*
@ -213,9 +213,11 @@ main(int argc, char **argv)
int ch, fd[2] = {-1}, status;
pid_t pid=0;
const char *outfile = NULL;
char **diffargv, *diffprog = DIFF_PATH, *filename1, *filename2,
char **diffargv, *diffprog = diff_path, *filename1, *filename2,
*tmp1, *tmp2, *s1, *s2;
int i;
char I_arg[] = "-I";
char speed_lf[] = "--speed-large-files";
/*
* Process diff flags.
@ -269,14 +271,14 @@ main(int argc, char **argv)
sprintf(diffargv[1], "%s%c", diffargv[1], ch);
break;
case 'H':
diffargv[diffargc++] = "--speed-large-files";
diffargv[diffargc++] = speed_lf;
break;
case DIFFPROG_OPT:
diffargv[0] = diffprog = optarg;
break;
case 'I':
Iflag = 1;
diffargv[diffargc++] = "-I";
diffargv[diffargc++] = I_arg;
diffargv[diffargc++] = optarg;
break;
case 'l':