From owner-svn-src-all@FreeBSD.ORG  Mon Oct 28 18:10:36 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 7EA33778;
 Mon, 28 Oct 2013 18:10:36 +0000 (UTC)
 (envelope-from sbruno@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5D2272236;
 Mon, 28 Oct 2013 18:10:36 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9SIAaYN066380;
 Mon, 28 Oct 2013 18:10:36 GMT (envelope-from sbruno@svn.freebsd.org)
Received: (from sbruno@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9SIAZgK066376;
 Mon, 28 Oct 2013 18:10:35 GMT (envelope-from sbruno@svn.freebsd.org)
Message-Id: <201310281810.r9SIAZgK066376@svn.freebsd.org>
From: Sean Bruno <sbruno@FreeBSD.org>
Date: Mon, 28 Oct 2013 18:10:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r257263 - head/contrib/groff/src/roff/troff
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 28 Oct 2013 18:10:36 -0000

Author: sbruno
Date: Mon Oct 28 18:10:35 2013
New Revision: 257263
URL: http://svnweb.freebsd.org/changeset/base/257263

Log:
  Quiesce warnings -Wdangling-else
  
  Thanks to jilles for some reviews and tips.

Modified:
  head/contrib/groff/src/roff/troff/input.cpp
  head/contrib/groff/src/roff/troff/mtsm.cpp
  head/contrib/groff/src/roff/troff/node.cpp

Modified: head/contrib/groff/src/roff/troff/input.cpp
==============================================================================
--- head/contrib/groff/src/roff/troff/input.cpp	Mon Oct 28 16:27:01 2013	(r257262)
+++ head/contrib/groff/src/roff/troff/input.cpp	Mon Oct 28 18:10:35 2013	(r257263)
@@ -2789,18 +2789,19 @@ void process_input_stack()
     case token::TOKEN_TRANSPARENT:
       {
 	if (bol) {
-	  if (possibly_handle_first_page_transition())
+	  if (possibly_handle_first_page_transition()) {
 	    ;
-	  else {
+	  } else {
 	    int cc;
 	    do {
 	      node *n;
 	      cc = get_copy(&n);
-	      if (cc != EOF)
+	      if (cc != EOF) {
 		if (cc != '\0')
 		  curdiv->transparent_output(transparent_translate(cc));
 		else
 		  curdiv->transparent_output(n);
+	      }
 	    } while (cc != '\n' && cc != EOF);
 	    if (cc == EOF)
 	      curdiv->transparent_output('\n');
@@ -2811,9 +2812,9 @@ void process_input_stack()
     case token::TOKEN_NEWLINE:
       {
 	if (bol && !old_have_input
-	    && !curenv->get_prev_line_interrupted())
+	    && !curenv->get_prev_line_interrupted()) {
 	  trapping_blank_line();
-	else {
+	} else {
 	  curenv->newline();
 	  bol = 1;
 	}

Modified: head/contrib/groff/src/roff/troff/mtsm.cpp
==============================================================================
--- head/contrib/groff/src/roff/troff/mtsm.cpp	Mon Oct 28 16:27:01 2013	(r257262)
+++ head/contrib/groff/src/roff/troff/mtsm.cpp	Mon Oct 28 18:10:35 2013	(r257263)
@@ -482,21 +482,24 @@ void mtsm::flush(FILE *fp, statem *s, st
 void statem::display_state()
 {
   fprintf(stderr, " <state ");
-  if (bool_values[MTSM_BR].is_known)
+  if (bool_values[MTSM_BR].is_known) {
     if (bool_values[MTSM_BR].value)
       fprintf(stderr, "[br]");
     else
       fprintf(stderr, "[!br]");
-  if (bool_values[MTSM_EOL].is_known)
+  }
+  if (bool_values[MTSM_EOL].is_known) {
     if (bool_values[MTSM_EOL].value)
       fprintf(stderr, "[eol]");
     else
       fprintf(stderr, "[!eol]");
-  if (int_values[MTSM_SP].is_known)
+  }
+  if (int_values[MTSM_SP].is_known) {
     if (int_values[MTSM_SP].value)
       fprintf(stderr, "[sp %d]", int_values[MTSM_SP].value);
     else
       fprintf(stderr, "[!sp]");
+  }
   fprintf(stderr, ">");
   fflush(stderr);
 }

Modified: head/contrib/groff/src/roff/troff/node.cpp
==============================================================================
--- head/contrib/groff/src/roff/troff/node.cpp	Mon Oct 28 16:27:01 2013	(r257262)
+++ head/contrib/groff/src/roff/troff/node.cpp	Mon Oct 28 18:10:35 2013	(r257263)
@@ -4600,14 +4600,14 @@ void hline_node::tprint(troff_output_fil
   }
   else {
     hunits rem = x - w*i;
-    if (rem > H0)
+    if (rem > H0) {
       if (n->overlaps_horizontally()) {
 	if (out->is_on())
 	  n->tprint(out);
 	out->right(rem - w);
-      }
-      else
+      } else
 	out->right(rem);
+    }
     while (--i >= 0)
       if (out->is_on())
 	n->tprint(out);