From owner-svn-src-stable-11@freebsd.org Thu Aug 17 14:04:19 2017 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 75FB1DE3901; Thu, 17 Aug 2017 14:04:19 +0000 (UTC) (envelope-from byond.lenox@gmail.com) Received: from mail-ua0-f177.google.com (mail-ua0-f177.google.com [209.85.217.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2F77573676; Thu, 17 Aug 2017 14:04:18 +0000 (UTC) (envelope-from byond.lenox@gmail.com) Received: by mail-ua0-f177.google.com with SMTP id k43so25086576uaf.3; Thu, 17 Aug 2017 07:04:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=COTzbNz5kX+SMYWqMhDIxP8Ud4tjb3qhiTrEq1fghNg=; b=isD7bYMN7cfHmh3RSZ98DjhKlhCF7CvV5h/YLD0Pu7UbNzceMsmEhombzGEERWScqn 60E5rRvB2LkJDlEunn/H2U9RCK7znUHofN6par+kD7JsbAEtbrD1PTxcduWG3iy3bOHZ b5vfxEUJeQudpUtd3pVpekF5OtCViZ/Rb8dKccl+2JQytZSMrDIcWWBe/KYOfZs7wjif +KmgWWrfIF2euTShAiZUpfpyzSkrAdIVUfvwSYfTYF9vazr/L+eKFAqvXl12ctUX/ZLs NHklLPfJYAKDLTtZpYaqwaN+T1jcM9fgDdiaanfOgCpO6q2Z41DPJVvIfby4fdX1Kc3B xMgQ== X-Gm-Message-State: AHYfb5jIqrrMSkJXKtJZsewZ3gT9AUUX9/ueli8lCiKjPgbmxNRadzp5 QK6PrVbAExz1tUSHQ2HP5g== X-Received: by 10.176.25.197 with SMTP id r5mr3667717uai.22.1502978652414; Thu, 17 Aug 2017 07:04:12 -0700 (PDT) Received: from mail-ua0-f177.google.com (mail-ua0-f177.google.com. [209.85.217.177]) by smtp.gmail.com with ESMTPSA id t2sm691214vke.1.2017.08.17.07.04.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Aug 2017 07:04:11 -0700 (PDT) Received: by mail-ua0-f177.google.com with SMTP id r9so15723793uad.0; Thu, 17 Aug 2017 07:04:11 -0700 (PDT) X-Received: by 10.176.26.12 with SMTP id a12mr3578617uai.110.1502978651632; Thu, 17 Aug 2017 07:04:11 -0700 (PDT) MIME-Version: 1.0 Received: by 10.159.56.194 with HTTP; Thu, 17 Aug 2017 07:03:51 -0700 (PDT) In-Reply-To: References: <201708171348.v7HDmkqe045347@repo.freebsd.org> From: Kyle Evans Date: Thu, 17 Aug 2017 09:03:51 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r322619 - stable/11/usr.bin/grep To: Steven Hartland Cc: src-committers , svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.23 X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Aug 2017 14:04:19 -0000 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@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; > > > >