From owner-svn-src-all@FreeBSD.ORG Mon Apr 20 18:53:39 2015 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1C328BB for ; Mon, 20 Apr 2015 18:53:39 +0000 (UTC) Received: from mail-wi0-x229.google.com (mail-wi0-x229.google.com [IPv6:2a00:1450:400c:c05::229]) (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 BBEB5F97 for ; Mon, 20 Apr 2015 18:53:38 +0000 (UTC) Received: by widdi4 with SMTP id di4so103036234wid.0 for ; Mon, 20 Apr 2015 11:53:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=eitanadler.com; s=0xdeadbeef; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc:content-type; bh=ttCkft2SCpxmxa37mv056HGwqStsfkPIbBlwYA2f7OA=; b=ZiqXqYOIAqzG75178lXnfksn2pspBCheiD5f1/t9AWEFx7H8C645oJMfFfrGHce+ql 4ZFEVrxBTs1Qygw8fQ5z4Xj9modeFUcMDf+weB0CbGkESMT3MgooimWMJxBwVFNtiyUv Ge02NgcrZ1fMWagGiQeYV7mEqvtrEf3WGgjhc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc:content-type; bh=ttCkft2SCpxmxa37mv056HGwqStsfkPIbBlwYA2f7OA=; b=CllpWkuJo8Ng2aWRLOfvcoBy0SlrJYRr/pOeEPvyOUaqgPq5iF3h7AUFAxSGQ3XsIM zCnZ8w8X+QfXibou7qFt2PgOrSFbIzSWo1X4jHRU4isziOYHNywu0EX3dI8zSqKTUOTf JIeop7cqKcV8nEunFFUbP7sccl/F8W0bdVcFbo9K2ggbsqxFYYrnWV9BK4ilO9FbLCK7 6f4WyDoJJh+RHCW9IwJ4WHC21CpxvqaZahERunMusxBYgoUEcELqEbGcftQmQ+Lf9DO8 9VihzaaOa90+jW1PfvAb7T95zQ4WquDXIWEvVt/eN+M2dItRLiCCkGW9075TT9vEZmsW rbvA== X-Gm-Message-State: ALoCoQk/khU8yqBFHtcEs/llN2MNaX5M8IPXfpeef7OHjOMKRVR0pddF+xiLmPs4SXX51t7pZFMr X-Received: by 10.194.237.34 with SMTP id uz2mr33064055wjc.157.1429556017194; Mon, 20 Apr 2015 11:53:37 -0700 (PDT) MIME-Version: 1.0 Sender: lists@eitanadler.com Received: by 10.28.211.135 with HTTP; Mon, 20 Apr 2015 11:53:06 -0700 (PDT) In-Reply-To: <20150420134409.I855@besplex.bde.org> References: <201504200207.t3K27vFt078041@svn.freebsd.org> <20150420134409.I855@besplex.bde.org> From: Eitan Adler Date: Mon, 20 Apr 2015 11:53:06 -0700 X-Google-Sender-Auth: z4jxB6ikKZG--bXDsRlnp8KyTGI Message-ID: Subject: Re: svn commit: r281758 - head/bin/ed To: Bruce Evans Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Apr 2015 18:53:39 -0000 On 19 April 2015 at 21:23, Bruce Evans wrote: > On Mon, 20 Apr 2015, Eitan Adler wrote: > >> Log: >> ed(1): Fix [-Werror=logical-not-parentheses] >> /usr/src/bin/ed/glbl.c:64:36: error: logical not is only applied >> to >> theleft hand side of comparison [-Werror=logical-not-parentheses] >> >> Obtained from: Dragonfly (1fff89cbaeaa43af720a1f23d9c466b756dd8a58) >> MFC After: 1 month >> >> Modified: >> head/bin/ed/glbl.c >> >> Modified: head/bin/ed/glbl.c >> >> ============================================================================== >> --- head/bin/ed/glbl.c Mon Apr 20 00:24:32 2015 (r281757) >> +++ head/bin/ed/glbl.c Mon Apr 20 02:07:57 2015 (r281758) >> @@ -60,7 +60,7 @@ build_active_list(int isgcmd) >> return ERR; >> if (isbinary) >> NUL_TO_NEWLINE(s, lp->len); >> - if (!regexec(pat, s, 0, NULL, 0) == isgcmd && >> + if (!(regexec(pat, s, 0, NULL, 0) == isgcmd) && >> set_active_node(lp) < 0) >> return ERR; >> } > > > How can this be right? !(a == b) is an obfuscated way of writing a != b. bah! How does something like the following look? Index: ed.h =================================================================== --- ed.h (revision 281759) +++ ed.h (working copy) @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include @@ -191,7 +192,7 @@ int put_des_char(int, FILE *); void add_line_node(line_t *); int append_lines(long); int apply_subst_template(const char *, regmatch_t *, int, int); -int build_active_list(int); +int build_active_list(bool); int cbc_decode(unsigned char *, FILE *); int cbc_encode(unsigned char *, int, FILE *); int check_addr_range(long, long); Index: glbl.c =================================================================== --- glbl.c (revision 281759) +++ glbl.c (working copy) @@ -38,7 +38,7 @@ __FBSDID("$FreeBSD$"); /* build_active_list: add line matching a pattern to the global-active list */ int -build_active_list(int isgcmd) +build_active_list(bool isgcmd) { pattern_t *pat; line_t *lp; @@ -60,7 +60,7 @@ int return ERR; if (isbinary) NUL_TO_NEWLINE(s, lp->len); - if (!(regexec(pat, s, 0, NULL, 0) == isgcmd) && + if ((!regexec(pat, s, 0, NULL, 0)) == isgcmd && set_active_node(lp) < 0) return ERR; } -- Eitan Adler Source, Ports, Doc committer Bugmeister, Ports Security teams