Date: Sat, 21 Jan 2017 17:01:49 +0000 (UTC) From: Dirk Meyer <dinoex@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r432061 - head/textproc/agrep/files Message-ID: <201701211701.v0LH1nHL034807@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dinoex Date: Sat Jan 21 17:01:49 2017 New Revision: 432061 URL: https://svnweb.freebsd.org/changeset/ports/432061 Log: - make portlint happier Modified: head/textproc/agrep/files/patch-agrep.h head/textproc/agrep/files/patch-asearch.c head/textproc/agrep/files/patch-asearch1.c head/textproc/agrep/files/patch-bitap.c head/textproc/agrep/files/patch-checkfile.c head/textproc/agrep/files/patch-compat.c head/textproc/agrep/files/patch-follow.c head/textproc/agrep/files/patch-main.c head/textproc/agrep/files/patch-maskgen.c head/textproc/agrep/files/patch-mgrep.c head/textproc/agrep/files/patch-parse.c head/textproc/agrep/files/patch-preprocess.c head/textproc/agrep/files/patch-sgrep.c head/textproc/agrep/files/patch-utilities.c Modified: head/textproc/agrep/files/patch-agrep.h ============================================================================== --- head/textproc/agrep/files/patch-agrep.h Sat Jan 21 16:49:29 2017 (r432060) +++ head/textproc/agrep/files/patch-agrep.h Sat Jan 21 17:01:49 2017 (r432061) @@ -1,5 +1,5 @@ ---- agrep.h.orig 1992-01-17 20:15:13.000000000 +0100 -+++ agrep.h 2011-11-27 13:35:40.000000000 +0100 +--- agrep.h.orig 1992-01-17 19:15:13 UTC ++++ agrep.h @@ -1,10 +1,10 @@ #include <stdio.h> +#include <stdlib.h> @@ -13,7 +13,7 @@ #define CHAR unsigned char #define MAXPAT 128 #define MAXPATT 256 -@@ -52,3 +52,37 @@ +@@ -52,3 +52,37 @@ extern int strlen(); #define NNLINE 239 /* special symbol for newline in begin of pattern*/ /* matches '\n' and NNLINE */ Modified: head/textproc/agrep/files/patch-asearch.c ============================================================================== --- head/textproc/agrep/files/patch-asearch.c Sat Jan 21 16:49:29 2017 (r432060) +++ head/textproc/agrep/files/patch-asearch.c Sat Jan 21 17:01:49 2017 (r432061) @@ -1,6 +1,6 @@ ---- asearch.c.orig 1992-01-24 02:49:08.000000000 +0100 -+++ asearch.c 2011-11-27 12:05:20.000000000 +0100 -@@ -6,7 +6,9 @@ +--- asearch.c.orig 1992-01-24 01:49:08 UTC ++++ asearch.c +@@ -6,7 +6,9 @@ extern int DELIMITER, FILENAMEONLY, INVE extern CHAR CurrentFileName[]; extern int I, num_of_matched, TRUNCATE; @@ -11,7 +11,7 @@ CHAR old_D_pat[]; int text; register unsigned D; { register unsigned i, c, r1, r2, CMask, r_NO_ERR, r_Init1; -@@ -178,7 +180,7 @@ +@@ -178,7 +180,7 @@ Nextchar1: i=i+1; return; } Modified: head/textproc/agrep/files/patch-asearch1.c ============================================================================== --- head/textproc/agrep/files/patch-asearch1.c Sat Jan 21 16:49:29 2017 (r432060) +++ head/textproc/agrep/files/patch-asearch1.c Sat Jan 21 17:01:49 2017 (r432061) @@ -1,6 +1,6 @@ ---- asearch1.c.orig 1992-01-17 22:00:38.000000000 +0100 -+++ asearch1.c 2011-11-27 12:07:32.000000000 +0100 -@@ -8,7 +8,7 @@ +--- asearch1.c.orig 1992-01-17 21:00:38 UTC ++++ asearch1.c +@@ -8,7 +8,7 @@ extern char CurrentFileName[]; extern int num_of_matched; Modified: head/textproc/agrep/files/patch-bitap.c ============================================================================== --- head/textproc/agrep/files/patch-bitap.c Sat Jan 21 16:49:29 2017 (r432060) +++ head/textproc/agrep/files/patch-bitap.c Sat Jan 21 17:01:49 2017 (r432061) @@ -1,5 +1,5 @@ ---- bitap.c.orig 1992-01-17 22:00:15.000000000 +0100 -+++ bitap.c 2011-11-27 13:33:41.000000000 +0100 +--- bitap.c.orig 1992-01-17 21:00:15 UTC ++++ bitap.c @@ -13,6 +13,8 @@ #include "agrep.h" @@ -9,7 +9,7 @@ extern unsigned Init1, D_endpos, endposition, Init[], Mask[], Bit[]; extern int DELIMITER, FILENAMEONLY, D_length, I, AND, REGEX, JUMP, INVERSE; extern char D_pattern[]; -@@ -22,7 +24,7 @@ +@@ -22,7 +24,7 @@ extern int num_of_matched; /* bitap dispatches job */ @@ -18,7 +18,7 @@ char old_D_pat[], *Pattern; int fd, M, D; { char c; -@@ -143,7 +145,7 @@ +@@ -143,7 +145,7 @@ char buffer[Max_record+Max_record+BlockS return; } Modified: head/textproc/agrep/files/patch-checkfile.c ============================================================================== --- head/textproc/agrep/files/patch-checkfile.c Sat Jan 21 16:49:29 2017 (r432060) +++ head/textproc/agrep/files/patch-checkfile.c Sat Jan 21 17:01:49 2017 (r432061) @@ -1,6 +1,6 @@ ---- checkfile.c.orig 1992-01-17 20:14:42.000000000 +0100 -+++ checkfile.c 2011-11-27 13:19:28.000000000 +0100 -@@ -65,6 +65,7 @@ +--- checkfile.c.orig 1992-01-17 19:14:42 UTC ++++ checkfile.c +@@ -65,6 +65,7 @@ int ftype; return ISSOCKET; } */ Modified: head/textproc/agrep/files/patch-compat.c ============================================================================== --- head/textproc/agrep/files/patch-compat.c Sat Jan 21 16:49:29 2017 (r432060) +++ head/textproc/agrep/files/patch-compat.c Sat Jan 21 17:01:49 2017 (r432061) @@ -1,5 +1,5 @@ ---- compat.c.orig 1992-01-21 14:36:26.000000000 +0100 -+++ compat.c 2011-11-27 13:25:35.000000000 +0100 +--- compat.c.orig 1992-01-21 13:36:26 UTC ++++ compat.c @@ -1,17 +1,18 @@ /* test the conflicts between options */ #include <stdio.h> Modified: head/textproc/agrep/files/patch-follow.c ============================================================================== --- head/textproc/agrep/files/patch-follow.c Sat Jan 21 16:49:29 2017 (r432060) +++ head/textproc/agrep/files/patch-follow.c Sat Jan 21 17:01:49 2017 (r432061) @@ -1,5 +1,5 @@ ---- follow.c.orig Fri Jan 17 20:14:42 1992 -+++ follow.c Sun Jul 21 03:50:47 2002 +--- follow.c.orig 1992-01-17 19:14:42 UTC ++++ follow.c @@ -3,14 +3,12 @@ construction. */ Modified: head/textproc/agrep/files/patch-main.c ============================================================================== --- head/textproc/agrep/files/patch-main.c Sat Jan 21 16:49:29 2017 (r432060) +++ head/textproc/agrep/files/patch-main.c Sat Jan 21 17:01:49 2017 (r432061) @@ -1,5 +1,5 @@ ---- main.c.orig 1992-04-14 22:41:24.000000000 +0200 -+++ main.c 2011-11-27 13:36:45.000000000 +0100 +--- main.c.orig 1992-04-14 20:41:24 UTC ++++ main.c @@ -1,6 +1,14 @@ /* Copyright (c) 1991 Sun Wu and Udi Manber. All Rights Reserved. */ #include "agrep.h" @@ -15,7 +15,7 @@ unsigned Mask[MAXSYM]; unsigned Init1, NO_ERR_MASK, Init[MaxError]; -@@ -33,7 +41,7 @@ +@@ -33,7 +41,7 @@ int NOFILENAME = 0, /* Boolean flag, s extern int init(); int table[WORD][WORD]; @@ -24,7 +24,7 @@ { int i; -@@ -51,7 +59,7 @@ +@@ -51,7 +59,7 @@ initial_value() for (i=0; i< MAXSYM; i++) Mask[i] = 0; } @@ -33,7 +33,7 @@ int M; unsigned *Next, *Next1; { int i, j=0, n, k, temp; -@@ -110,7 +118,7 @@ +@@ -110,7 +118,7 @@ int M; unsigned *Next, *Next1; return; } @@ -42,7 +42,7 @@ int m; { int i, ex; ex= 1; -@@ -118,7 +126,7 @@ +@@ -118,7 +126,7 @@ int m; return(ex); } @@ -51,7 +51,7 @@ int Text, M, D; { register unsigned i, c, r0, r1, r2, r3, CMask, Newline, Init0, r_NO_ERR; -@@ -393,7 +401,7 @@ +@@ -393,7 +401,7 @@ Nextchar1: i=i+1; return; } /* re1 */ @@ -60,7 +60,7 @@ int Text, M, D; { register unsigned i, c, r1, r2, r3, CMask, k, Newline, Init0, Init1, end; -@@ -595,7 +603,7 @@ +@@ -595,7 +603,7 @@ Nextchar1: i++; } /* re */ @@ -69,7 +69,7 @@ int i, end, j; CHAR *buffer; { -@@ -612,7 +620,7 @@ +@@ -612,7 +620,7 @@ int bp; while (bp <= i ) putchar(buffer[bp++]); } @@ -78,7 +78,7 @@ int argc; char *argv[]; { int N, M, D=0, fp, fd, i, j; -@@ -751,7 +759,7 @@ +@@ -751,7 +759,7 @@ int argc; char *argv[]; } if (!(PAT_FILE) && Pattern[0] == '\0') { /* Pattern not set with -e option */ if (argc == 0) usage(); @@ -87,7 +87,7 @@ argc--; argv++; } -@@ -897,7 +905,7 @@ +@@ -897,7 +905,7 @@ CONT: } /* end of main() */ @@ -96,7 +96,7 @@ char *fname; { int num_read; -@@ -921,7 +929,7 @@ +@@ -921,7 +929,7 @@ CHAR buf[4097]; } @@ -105,7 +105,7 @@ { fprintf(stderr, "usage: %s [-#cdehiklnpstvwxBDGIS] [-f patternfile] pattern [files]\n", Progname); printf("\n"); -@@ -942,7 +950,7 @@ +@@ -942,7 +950,7 @@ usage() exit(2); } @@ -114,7 +114,7 @@ CHAR *Pattern; int D; { char c; -@@ -999,7 +1007,8 @@ +@@ -999,7 +1007,8 @@ CHAR *Pattern; int D; return; } Modified: head/textproc/agrep/files/patch-maskgen.c ============================================================================== --- head/textproc/agrep/files/patch-maskgen.c Sat Jan 21 16:49:29 2017 (r432060) +++ head/textproc/agrep/files/patch-maskgen.c Sat Jan 21 17:01:49 2017 (r432061) @@ -1,5 +1,5 @@ ---- maskgen.c.orig 1992-01-17 20:14:43.000000000 +0100 -+++ maskgen.c 2011-11-27 12:56:20.000000000 +0100 +--- maskgen.c.orig 1992-01-17 19:14:43 UTC ++++ maskgen.c @@ -2,11 +2,11 @@ #include "agrep.h" Modified: head/textproc/agrep/files/patch-mgrep.c ============================================================================== --- head/textproc/agrep/files/patch-mgrep.c Sat Jan 21 16:49:29 2017 (r432060) +++ head/textproc/agrep/files/patch-mgrep.c Sat Jan 21 17:01:49 2017 (r432061) @@ -1,5 +1,5 @@ ---- mgrep.c.orig 1992-04-11 00:12:27.000000000 +0200 -+++ mgrep.c 2011-11-27 13:42:10.000000000 +0100 +--- mgrep.c.orig 1992-04-10 22:12:27 UTC ++++ mgrep.c @@ -1,7 +1,10 @@ /* Copyright (c) 1991 Sun Wu and Udi Manber. All Rights Reserved. */ /* multipattern matcher */ @@ -32,7 +32,7 @@ int LONG = 0; int SHORT = 0; -@@ -37,7 +45,7 @@ +@@ -37,7 +45,7 @@ unsigned char *patt[max_num]; unsigned char pat_len[max_num]; @@ -41,7 +41,7 @@ int fp; { int length=0, i, p=1, pdx=0, num_pat; -@@ -85,7 +93,7 @@ +@@ -85,7 +93,7 @@ int fp; if(p!=0 && p < p_size) p_size = p; } if(p_size == 0) { @@ -50,7 +50,7 @@ exit(2); } if(length > 400 && p_size > 2) LONG = 1; -@@ -98,7 +106,7 @@ +@@ -98,7 +106,7 @@ int fp; } @@ -59,7 +59,7 @@ int fd; { register char r_newline = '\n'; -@@ -136,7 +144,7 @@ +@@ -136,7 +144,7 @@ int fd; return; } /* end mgrep */ @@ -68,7 +68,7 @@ unsigned char *text; int len; { int i; -@@ -144,7 +152,7 @@ +@@ -144,7 +152,7 @@ int i; } @@ -77,7 +77,7 @@ int start, end; register unsigned char *text; { register unsigned char *textend; -@@ -232,7 +240,7 @@ +@@ -232,7 +240,7 @@ while (text <= textend) { if(INVERSE && !COUNT) while(lastout <= textend) putchar(*lastout++); } @@ -86,7 +86,7 @@ int start, end; register unsigned char *text; { register unsigned char *textend; -@@ -292,7 +300,7 @@ +@@ -292,7 +300,7 @@ while (++text <= textend) { if(INVERSE && !COUNT) while(lastout <= textend) putchar(*lastout++); } Modified: head/textproc/agrep/files/patch-parse.c ============================================================================== --- head/textproc/agrep/files/patch-parse.c Sat Jan 21 16:49:29 2017 (r432060) +++ head/textproc/agrep/files/patch-parse.c Sat Jan 21 17:01:49 2017 (r432061) @@ -1,5 +1,5 @@ ---- parse.c.orig Fri Jan 17 20:14:43 1992 -+++ parse.c Sun Jul 21 03:50:47 2002 +--- parse.c.orig 1992-01-17 19:14:43 UTC ++++ parse.c @@ -3,6 +3,7 @@ tree for that regular expression. */ Modified: head/textproc/agrep/files/patch-preprocess.c ============================================================================== --- head/textproc/agrep/files/patch-preprocess.c Sat Jan 21 16:49:29 2017 (r432060) +++ head/textproc/agrep/files/patch-preprocess.c Sat Jan 21 17:01:49 2017 (r432061) @@ -1,5 +1,5 @@ ---- preprocess.c.orig 1992-01-17 20:14:43.000000000 +0100 -+++ preprocess.c 2011-11-27 12:47:32.000000000 +0100 +--- preprocess.c.orig 1992-01-17 19:14:43 UTC ++++ preprocess.c @@ -14,6 +14,8 @@ /* D_pattern contains transformed D_pattern */ @@ -9,7 +9,7 @@ extern int SIMPLEPATTERN, WHOLELINE, REGEX, RE_ERR, DELIMITER, TAIL, WORDBOUND; extern int HEAD; -@@ -21,7 +23,7 @@ +@@ -21,7 +23,7 @@ extern CHAR Progname[]; extern int D_length; extern int table[WORD][WORD]; Modified: head/textproc/agrep/files/patch-sgrep.c ============================================================================== --- head/textproc/agrep/files/patch-sgrep.c Sat Jan 21 16:49:29 2017 (r432060) +++ head/textproc/agrep/files/patch-sgrep.c Sat Jan 21 17:01:49 2017 (r432061) @@ -1,5 +1,5 @@ ---- sgrep.c.orig 1992-04-11 00:12:02.000000000 +0200 -+++ sgrep.c 2011-11-27 12:44:11.000000000 +0100 +--- sgrep.c.orig 1992-04-10 22:12:02 UTC ++++ sgrep.c @@ -1,6 +1,9 @@ /* Copyright (c) 1991 Sun Wu and Udi Manber. All Rights Reserved. */ #include <stdio.h> @@ -24,7 +24,7 @@ extern unsigned char CurrentFileName[], Progname[]; extern unsigned Mask[]; extern unsigned endposition; -@@ -30,6 +33,21 @@ +@@ -30,6 +33,21 @@ unsigned char BSize; /* l unsigned char char_map[MAXSYM]; @@ -46,7 +46,7 @@ /* data area */ int shift_1; CHARTYPE SHIFT[MAXSYM]; -@@ -39,7 +57,7 @@ +@@ -39,7 +57,7 @@ unsigned Hashmask; char MEMBER_1[MAXMEMBER_1]; CHARTYPE TR[MAXSYM]; @@ -55,7 +55,7 @@ unsigned char *pat; int *m; { -@@ -64,7 +82,7 @@ +@@ -64,7 +82,7 @@ unsigned char temp[MAXPATT]; } } @@ -64,7 +64,7 @@ CHARTYPE *pat; int fd, m, D; { CHARTYPE text[BLOCKSIZE+2*MAXLINE+MAXPATT]; /* input text stream */ -@@ -126,7 +144,7 @@ +@@ -126,7 +144,7 @@ CHARTYPE *pat; int fd, m, D; /* SUN: bm assumes that the content of text[n]...text[n+m-1] is pat[m-1] such that the skip loop is guaranteed to terminated */ @@ -73,7 +73,7 @@ CHARTYPE *text, *textend, *pat; int m; { register int shift; -@@ -179,7 +197,7 @@ +@@ -179,7 +197,7 @@ return; /* initmask() initializes the mask table for the pattern */ /* endposition is a mask for the endposition of the pattern */ /* endposition will contain k mask bits if the pattern contains k fragments */ @@ -82,7 +82,7 @@ CHARTYPE *pattern; unsigned *Mask; register int m, D; unsigned *endposition; { register unsigned Bit1, c; -@@ -202,7 +220,7 @@ +@@ -202,7 +220,7 @@ CHARTYPE *pattern; unsigned *Mask; regis } } @@ -91,7 +91,7 @@ CHARTYPE *Pattern; /* can be fine-tuned to choose a better partition */ register int M, D; { -@@ -250,7 +268,7 @@ +@@ -250,7 +268,7 @@ unsigned hash, b_size = 3; } @@ -100,7 +100,7 @@ int M, D ; register CHARTYPE *text, *textend, *pat; { register int i; -@@ -357,7 +375,7 @@ +@@ -357,7 +375,7 @@ int M, D ; register CHARTYPE *text, *tex return; } @@ -109,7 +109,7 @@ int *i; CHARTYPE *text; { int kk, bp; -@@ -375,9 +393,9 @@ +@@ -375,9 +393,9 @@ int kk, bp; } @@ -121,7 +121,7 @@ { int i, j; unsigned hash; -@@ -404,7 +422,7 @@ +@@ -404,7 +422,7 @@ unsigned char lastc; /* a_monkey() the approximate monkey move */ @@ -130,7 +130,7 @@ register int m, D ; register CHARTYPE *text, *textend, *pat; { register CHARTYPE *oldtext; -@@ -451,7 +469,7 @@ +@@ -451,7 +469,7 @@ register int m1 = m-1-D, j, pos; CHARTYPE SHIFT_2[MAX_SHIFT_2]; @@ -139,7 +139,7 @@ register int m ; register CHARTYPE *text, *textend, *pat; { register unsigned hash, i; -@@ -494,7 +512,7 @@ +@@ -494,7 +512,7 @@ r_newline = '\n'; } } @@ -148,7 +148,7 @@ CHARTYPE *Pattern; { int i, j, m; -@@ -511,7 +529,7 @@ +@@ -511,7 +529,7 @@ unsigned hash; } @@ -157,7 +157,7 @@ register int m, n, D; CHARTYPE *pat, *text; { -@@ -566,7 +584,7 @@ +@@ -566,7 +584,7 @@ CHARTYPE *pat, *text; /* preprocessing for monkey() */ @@ -166,7 +166,7 @@ CHARTYPE *Pattern; { int i, j, m; -@@ -595,7 +613,7 @@ +@@ -595,7 +613,7 @@ unsigned hash; char *MEMBER_D; @@ -175,7 +175,7 @@ register int m, D ; register unsigned char *text, *pat, *textend; { register unsigned char *oldtext; -@@ -639,7 +657,7 @@ +@@ -639,7 +657,7 @@ register int m1=m-1-D, j, pos; } } @@ -184,7 +184,7 @@ char *Pattern; int m; { int i, j, k; -@@ -672,7 +690,7 @@ +@@ -672,7 +690,7 @@ char_map['n'] = char_map['n'] = 5; } } Modified: head/textproc/agrep/files/patch-utilities.c ============================================================================== --- head/textproc/agrep/files/patch-utilities.c Sat Jan 21 16:49:29 2017 (r432060) +++ head/textproc/agrep/files/patch-utilities.c Sat Jan 21 17:01:49 2017 (r432061) @@ -1,5 +1,5 @@ ---- utilities.c.orig Fri Jan 17 20:14:43 1992 -+++ utilities.c Sun Jul 21 03:50:47 2002 +--- utilities.c.orig 1992-01-17 19:14:43 UTC ++++ utilities.c @@ -2,6 +2,7 @@ and manipulating regular expression syntax trees. */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701211701.v0LH1nHL034807>