svn commit: r328486 - head/usr.bin/fortune/fortune

[Pedro Giffuni]

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 at 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 */
>>