From owner-svn-src-all@freebsd.org Sat Jan 27 23:06:09 2018 Return-Path: Delivered-To: svn-src-all@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 257A4EC90C5 for ; Sat, 27 Jan 2018 23:06:09 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from sonic314-35.consmr.mail.ne1.yahoo.com (sonic314-35.consmr.mail.ne1.yahoo.com [66.163.189.161]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AAED07EC75 for ; Sat, 27 Jan 2018 23:06:08 +0000 (UTC) (envelope-from pfg@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1517094367; bh=GOKw3rL1ObrJadA3dFrNifKVveMEk3tx39JHIwo/gXQ=; h=Subject:To:Cc:References:From:Date:In-Reply-To:From:Subject; b=TMYupulUD/nhghqYslhFt6flqMTSXaDmQB+G45k18umI13/CEInUjDmaEbwa5Wqpa1DhZkFiMe1kcqV9GSeYk9ml91KjDLqkXkXxE6zqjldRmlicnZ51Y+2Ql3XTz6fiqYHS3kBNhjTQCaLWiY9I87SxtBjlJEhlvlGLEW+XuCeQ5kK0VR+dw6mH3UV6hNV3i6M0HTKQARB1gx9vPsjM+0aKQNlo+l6kmjs0fKwxnlmuz7/ZCXvBllhMUwYWhjMGdXo8So8rlP7Mgd+1rxS3XXCxfzqP9wwYruBLy8tizxRDuoMtW1/mm9uf74HbAPwZAxW7lWE1Sg6VSTinqCAC9A== X-YMail-OSG: bNiz0UMVM1lCi7NbUftJAgY_wDH3zwnhSneVeby4xzR3U0fs.D9Tm4BpMSSnlHg Vl3IN.2UxU8gfEm6v74RPcN684.UQzBedhxlxweVVXcL.oTHzrrGvlxTTYPxH4P1wyvwRYlRAAxm qxxbClrCXzlIUCmhZnw1wP0069GHVn23ilZzvx21FmHP4ePYOhfYbtNE3SdBVuoV1LA3J4PvH_hZ CkFuz4gHDuzihKqLwCy7DibGPbPq.4.Ys.nVVfeoXK6qb9ZjT5Edf.tDuhIUaL8N.7STaDZRixmA .EcTa_YtUo8qpSPcqY4mL4u6M8LZKOG_UW.A7zdCxuv2MieOu8MOLajRnb4ZOqr3rNX12Rlo90Oa 2ypE0ZAAK66oDEB1emBAFDk_BPA7Up1Kq3SYWfVpmmaq_7npjL3MlCrEG4DbGCLRwnSO.1kSM6fd 3TZzAuRMIgBDiy0x.vfbRzT9XsEdVnwG1BAtArLj0zup_NrGD4DDuLc5AaTLXCLcrBoMr1COw.CJ 2Ub.n7tMJEg-- Received: from sonic.gate.mail.ne1.yahoo.com by sonic314.consmr.mail.ne1.yahoo.com with HTTP; Sat, 27 Jan 2018 23:06:07 +0000 Received: from smtpgate105.mail.ne1.yahoo.com (EHLO [192.168.0.8]) ([216.155.193.135]) by smtp410.mail.ne1.yahoo.com (JAMES SMTP Server ) with ESMTPA ID 7f5d7920bbbdd9344de8cb8ef9f92715; Sat, 27 Jan 2018 23:06:03 +0000 (UTC) Subject: Re: svn commit: r328486 - head/usr.bin/fortune/fortune To: Conrad Meyer Cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201801271743.w0RHh9io022619@repo.freebsd.org> <1f1eb186-8f7b-6ec9-0970-d8b82b909e7b@FreeBSD.org> From: Pedro Giffuni Message-ID: Date: Sat, 27 Jan 2018 18:06:02 -0500 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:52.0) Gecko/20100101 Thunderbird/52.5.2 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit X-Content-Filtered-By: Mailman/MimeDel 2.1.25 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.25 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: Sat, 27 Jan 2018 23:06:09 -0000 On 01/27/18 17:56, Conrad Meyer wrote: > I don’t think dragonfly has anything to do with this?  If you’re > converting bool increments to setting true values in FreeBSD, use > “true.”  That’s all there is to it. > s/TRUE/true/ s/FALSE/false/ Then remove the two #defines for TRUE and FALSE, but I am on my way out, so feel free to do the change :). Pedro. > Best, > Conrad > > On Sat, Jan 27, 2018 at 1:44 PM Pedro Giffuni > wrote: > > Hi; > > > On 01/27/18 14:56, Conrad Meyer wrote: > > We can use 'true' and 'false' now.  (style(9) also suggests > using the > > C99 names instead of TRUE/FALSE.) > > Yes, I noticed that change in DragonflyBSD but it is conceptually a > different change and it deserves a different commit. > > Pedro. > > > On Sat, Jan 27, 2018 at 9:43 AM, Pedro F. Giffuni > > wrote: > >> 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 */ > >> >