From owner-svn-src-head@freebsd.org Sat Jan 27 17:43:09 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BA138ECDC27; Sat, 27 Jan 2018 17:43:09 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 691F872542; Sat, 27 Jan 2018 17:43:09 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6403E5D71; Sat, 27 Jan 2018 17:43:09 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0RHh9MW022620; Sat, 27 Jan 2018 17:43:09 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0RHh9io022619; Sat, 27 Jan 2018 17:43:09 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201801271743.w0RHh9io022619@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Sat, 27 Jan 2018 17:43:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r328486 - head/usr.bin/fortune/fortune X-SVN-Group: head X-SVN-Commit-Author: pfg X-SVN-Commit-Paths: head/usr.bin/fortune/fortune X-SVN-Commit-Revision: 328486 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Jan 2018 17:43:09 -0000 Author: pfg Date: Sat Jan 27 17:43:09 2018 New Revision: 328486 URL: https://svnweb.freebsd.org/changeset/base/328486 Log: fortune(6): Fix gcc80 -Wbool-operation warnings. Hinted by: Dragonfly (git 4d1086765752f0569497d06460d95117c74f33ac) Modified: head/usr.bin/fortune/fortune/fortune.c Modified: head/usr.bin/fortune/fortune/fortune.c ============================================================================== --- head/usr.bin/fortune/fortune/fortune.c Sat Jan 27 17:24:59 2018 (r328485) +++ head/usr.bin/fortune/fortune/fortune.c Sat Jan 27 17:43:09 2018 (r328486) @@ -289,35 +289,35 @@ getargs(int argc, char *argv[]) #endif /* DEBUG */ switch(ch) { case 'a': /* any fortune */ - All_forts++; + All_forts = TRUE; break; #ifdef DEBUG case 'D': Debug++; break; #endif /* DEBUG */ - case 'e': - Equal_probs++; /* scatter un-allocted prob equally */ + case 'e': /* scatter un-allocted prob equally */ + Equal_probs = TRUE; break; case 'f': /* find fortune files */ - Find_files++; + Find_files = TRUE; break; case 'l': /* long ones only */ - Long_only++; + Long_only = TRUE; Short_only = FALSE; break; case 'o': /* offensive ones only */ - Offend++; + Offend = TRUE; break; case 's': /* short ones only */ - Short_only++; + Short_only = TRUE; Long_only = FALSE; break; case 'w': /* give time to read */ - Wait++; + Wait = TRUE; break; case 'm': /* dump out the fortunes */ - Match++; + Match = TRUE; pat = optarg; break; case 'i': /* case-insensitive match */