From sjr@home.net Thu Jul 22 19:41:16 1999
Return-Path: <sjr@home.net>
Received: from cc158233-a.catv1.md.home.com (cc158233-a.catv1.md.home.com [24.3.25.17])
	by hub.freebsd.org (Postfix) with ESMTP id DD44214DC3
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 22 Jul 1999 19:41:15 -0700 (PDT)
	(envelope-from sjr@home.net)
Received: (from sjr@localhost)
	by cc158233-a.catv1.md.home.com (8.9.3/8.9.3) id WAA07712;
	Thu, 22 Jul 1999 22:38:12 -0400 (EDT)
	(envelope-from sjr)
Message-Id: <199907230238.WAA07712@cc158233-a.catv1.md.home.com>
Date: Thu, 22 Jul 1999 22:38:12 -0400 (EDT)
From: sjr@home.com
Sender: sjr@home.net
Reply-To: sjr@home.com
To: FreeBSD-gnats-submit@freebsd.org
Subject: Compilation warning for fortune.c
X-Send-Pr-Version: 3.2

>Number:         12768
>Category:       bin
>Synopsis:       Compilation warning for fortune.c
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    billf
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jul 22 19:50:00 PDT 1999
>Closed-Date:    Wed Jan 26 17:41:30 PST 2000
>Last-Modified:  Wed Jan 26 17:41:50 PST 2000
>Originator:     Stephen J. Roznowski
>Release:        FreeBSD 4.0-CURRENT i386
>Organization:
>Environment:

	

>Description:

    When compiling fortune, the following warning occurs:

    fortune.c: In function `form_file_list':
    fortune.c:404: warning: suggest explicit braces to avoid ambiguous `else'
    fortune.c: In function `init_prob':
    fortune.c:921: warning: suggest explicit braces to avoid ambiguous `else'

    This patch adds the (expected) braces.

>How-To-Repeat:

	

>Fix:
	
--- fortune/fortune.c.orig	Thu Jul 22 22:32:22 1999
+++ fortune/fortune.c	Thu Jul 22 22:32:55 1999
@@ -401,7 +401,7 @@
 	register int	i, percent;
 	register char	*sp;
 
-	if (file_cnt == 0)
+	if (file_cnt == 0) {
 		if (Find_files) {
 			Fortunes_only = TRUE;
 			i = add_file(NO_PROB, FORTDIR, NULL, &File_list,
@@ -411,6 +411,7 @@
 		} else
 			return add_file(NO_PROB, "fortunes", FORTDIR,
 					&File_list, &File_tail, NULL);
+	}
 	for (i = 0; i < file_cnt; i++) {
 		percent = NO_PROB;
 		if (!isdigit((unsigned char)files[i][0]))
@@ -918,7 +919,7 @@
 		exit(1);
 	}
 	percent = 100 - percent;
-	if (Equal_probs)
+	if (Equal_probs) {
 		if (num_noprob != 0) {
 			if (num_noprob > 1) {
 				frac = percent / num_noprob;
@@ -932,6 +933,7 @@
 			last->percent = percent;
 			DPRINTF(1, (stderr, ", residual = %d%%", percent));
 		}
+	}
 	else {
 		DPRINTF(1, (stderr,
 			    ", %d%% distributed over remaining fortunes\n",

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->billf 
Responsible-Changed-By: billf 
Responsible-Changed-When: Thu Jul 22 20:17:57 PDT 1999 
Responsible-Changed-Why:  
These seem to be my forte recently. 
State-Changed-From-To: open->closed 
State-Changed-By: billf 
State-Changed-When: Wed Jan 26 17:41:30 PST 2000 
State-Changed-Why:  
Stephen J. Roznowski notes that I already committed this. 
>Unformatted:
