From owner-freebsd-stable@freebsd.org Thu Aug 17 12:23:35 2017 Return-Path: Delivered-To: freebsd-stable@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 73121DDF292; Thu, 17 Aug 2017 12:23:35 +0000 (UTC) (envelope-from byond.lenox@gmail.com) Received: from mail-ua0-f171.google.com (mail-ua0-f171.google.com [209.85.217.171]) (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 0B62D6F928; Thu, 17 Aug 2017 12:23:34 +0000 (UTC) (envelope-from byond.lenox@gmail.com) Received: by mail-ua0-f171.google.com with SMTP id y36so24244759uac.5; Thu, 17 Aug 2017 05:23:34 -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=XAOvEcnjrKRGQ4fRuAgug57KfHYQCdcZFE5NUpM4Tqo=; b=OpdXDNGydzX+/Nh+Clme59+h7FhQwU51J1FcAz5PH75F0upd9RD8ThqLsH49r9Ckmk wlOZox/BPSB6Zbrjqf5WVoymZVfv1FZ7gy7nbDXgYetn9VXDF8tj5l+tKT+W8Q2Nz0VP 2Mw0cjrtv1UpTYpJAKfH2dPr1VErsmmX0Fk1zKP3oKu+iWjbOAzP33HHbz6cAJOyaX7O aDdgmlUXAzgLZauk4JTxBh65j6uH7WxG8m1LFVPYteTlrhSa+Mw4UmQMy9joi6y3t/Uj UtrZm8haKSwBCZS8yaz9np0aZx0Cf4qjdhU8nLvsg7/k2vVS0q6BdyzM2SfSjpZtXbii 6CeQ== X-Gm-Message-State: AHYfb5jL5dc6js0j7xo9fl9+go9y3BDJOb7JTyyGKN1IXaEKErzOcLFV blmgE2/D1O1/4jzVCGc= X-Received: by 10.176.20.201 with SMTP id f9mr3376342uae.134.1502972253414; Thu, 17 Aug 2017 05:17:33 -0700 (PDT) Received: from mail-ua0-f182.google.com (mail-ua0-f182.google.com. [209.85.217.182]) by smtp.gmail.com with ESMTPSA id n133sm637611vke.42.2017.08.17.05.17.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Aug 2017 05:17:32 -0700 (PDT) Received: by mail-ua0-f182.google.com with SMTP id r9so14630465uad.0; Thu, 17 Aug 2017 05:17:32 -0700 (PDT) X-Received: by 10.159.55.49 with SMTP id z46mr3038105uad.131.1502972252451; Thu, 17 Aug 2017 05:17:32 -0700 (PDT) MIME-Version: 1.0 Received: by 10.159.56.194 with HTTP; Thu, 17 Aug 2017 05:17:31 -0700 (PDT) Received: by 10.159.56.194 with HTTP; Thu, 17 Aug 2017 05:17:31 -0700 (PDT) In-Reply-To: <0cf58b0e-51cd-27f9-1ce5-87ee0e8df207@chrullrich.net> References: <201708170426.v7H4Q4SL015844@repo.freebsd.org> <0cf58b0e-51cd-27f9-1ce5-87ee0e8df207@chrullrich.net> From: Kyle Evans Date: Thu, 17 Aug 2017 07:17:31 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r322609 - in stable/11: contrib/netbsd-tests/usr.bin/grep usr.bin/grep To: Christian Ullrich , herbert@mailbox.org, emaste@freebsd.org Cc: FreeBSD-STABLE Mailing List , svn-src-stable@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.23 X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Aug 2017 12:23:35 -0000 Hi, -HEAD defaults to WITHOUT_GNU_GREP_COMPAT at the moment, so this got missed and I apparently had this addressed in my local build testing due to other bits. @emaste: can I commit the fix for this to -HEAD for MFC immediately? (unsigned int) cast on pmatch.rm_so. Thanks, Kyle Evans On Aug 17, 2017 5:16 AM, "Christian Ullrich" wrote: * Kyle Evans wrote: Author: kevans > Date: Thu Aug 17 04:26:04 2017 > New Revision: 322609 > URL: https://svnweb.freebsd.org/changeset/base/322609 > > Log: > MFC r318571: bsdgrep: emit more than MAX_LINE_MATCHES per line > Modified: stable/11/usr.bin/grep/util.c > ============================================================ > ================== > --- stable/11/usr.bin/grep/util.c Thu Aug 17 04:18:31 2017 > (r322608) > +++ stable/11/usr.bin/grep/util.c Thu Aug 17 04:26:04 2017 > (r322609) > @@ -356,11 +366,11 @@ procline(struct parsec *pc) > { > regmatch_t pmatch, lastmatch, chkmatch; > wchar_t wbegin, wend; > - size_t st = 0, nst = 0; > + size_t st, nst; > unsigned int i; > int c = 0, r = 0, lastmatches = 0, leflags = eflags; > size_t startm = 0, matchidx; > - int retry; > + unsigned int retry; > /usr/src/usr.bin/grep/util.c:453:26: error: comparison of integers of different signs: 'int' and 'unsigned int' [-Werror,-Wsign-compare] pmatch.rm_so + 1 < retry)) ~~~~~~~~~~~~~~~~ ^ ~~~~~ Why would that fail after MFC? Doesn't head use -Werror too? # uname -a FreeBSD infra-poudriere 11.1-PRERELEASE FreeBSD 11.1-PRERELEASE #0 r[unhelpful]: Thu Jul 13 15:30:11 CEST 2017 toor@infra11build:/usr/obj/usr/src/sys/LOCAL amd64 ]# cc --version FreeBSD clang version 4.0.0 (tags/RELEASE_400/final 297347) (based on LLVM 4.0.0) Target: x86_64-unknown-freebsd11.1 Thread model: posix InstalledDir: /usr/bin -- Christian