svn commit: r322619 - stable/11/usr.bin/grep

Kyle Evans kevans at freebsd.org
Thu Aug 17 14:04:19 UTC 2017


Previous commit had broken the build and the fix had been prepared/tested
locally for a while due to other changes

On Thu, Aug 17, 2017 at 8:55 AM, Steven Hartland <
steven.hartland at multiplay.co.uk> wrote:

> This seems a little quick considering it only hit head 8 mins ago.
>
>
> On 17/08/2017 14:48, Kyle Evans wrote:
>
> Author: kevans
> Date: Thu Aug 17 13:48:46 2017
> New Revision: 322619
> URL: https://svnweb.freebsd.org/changeset/base/322619
>
> Log:
>   bsdgrep: fix build when linking against libgnuregex
>
>   MFC r322618: bsdgrep: cast pmatch.rm_so to fix build when linking against
>   libgnuregex
>
>   Approved by:	emaste (mentor)
>
> Modified:
>   stable/11/usr.bin/grep/util.c
> Directory Properties:
>   stable/11/   (props changed)
>
> Modified: stable/11/usr.bin/grep/util.c
> ==============================================================================
> --- stable/11/usr.bin/grep/util.c	Thu Aug 17 13:40:45 2017	(r322618)
> +++ stable/11/usr.bin/grep/util.c	Thu Aug 17 13:48:46 2017	(r322619)
> @@ -450,7 +450,7 @@ procline(struct parsec *pc)
>  				 */
>  				if (r == REG_NOMATCH &&
>  				    (retry == pc->lnstart ||
> -				    pmatch.rm_so + 1 < retry))
> +				    (unsigned int)pmatch.rm_so + 1 < retry))
>  					retry = pmatch.rm_so + 1;
>  				if (r == REG_NOMATCH)
>  					continue;
>
>
>
>


More information about the svn-src-all mailing list