Date: Sat, 27 Jan 2018 18:06:02 -0500 From: Pedro Giffuni <pfg@FreeBSD.org> To: Conrad Meyer <cem@freebsd.org> Cc: src-committers <src-committers@freebsd.org>, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r328486 - head/usr.bin/fortune/fortune Message-ID: <f6327d2d-e89e-1010-7667-0188c5122864@FreeBSD.org> In-Reply-To: <CAG6CVpXXUSPwUsxqXhJBfq_f-FwFAWXO4uQu4f2evWet90fBNg@mail.gmail.com> References: <201801271743.w0RHh9io022619@repo.freebsd.org> <CAG6CVpUOxtE9p8OApL6LsUJWh5tTM_9647M0qe5VNSnTTSEvQw@mail.gmail.com> <1f1eb186-8f7b-6ec9-0970-d8b82b909e7b@FreeBSD.org> <CAG6CVpXXUSPwUsxqXhJBfq_f-FwFAWXO4uQu4f2evWet90fBNg@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
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 <pfg@freebsd.org > <mailto:pfg@freebsd.org>> 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 > <pfg@freebsd.org <mailto:pfg@freebsd.org>> 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 */ > >> >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?f6327d2d-e89e-1010-7667-0188c5122864>