From b51b786d733b34bf60874b3110e6a8bf187e7dc6 Mon Sep 17 00:00:00 2001
From: Sean Bruno <sbruno@FreeBSD.org>
Date: Mon, 28 Oct 2013 18:10:35 +0000
Subject: [PATCH] Quiesce warnings -Wdangling-else
Thanks to jilles for some reviews and tips.
---
contrib/groff/src/roff/troff/input.cpp | 11 ++++++-----
contrib/groff/src/roff/troff/mtsm.cpp | 9 ++++++---
contrib/groff/src/roff/troff/node.cpp | 6 +++---
3 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/contrib/groff/src/roff/troff/input.cpp b/contrib/groff/src/roff/troff/input.cpp
index 15077e947fba..da1c76b0a137 100644
--- a/contrib/groff/src/roff/troff/input.cpp
+++ b/contrib/groff/src/roff/troff/input.cpp
@@ -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;
}
diff --git a/contrib/groff/src/roff/troff/mtsm.cpp b/contrib/groff/src/roff/troff/mtsm.cpp
index 38efc0a343a5..4d415fd56c1e 100644
--- a/contrib/groff/src/roff/troff/mtsm.cpp
+++ b/contrib/groff/src/roff/troff/mtsm.cpp
@@ -482,21 +482,24 @@ void mtsm::flush(FILE *fp, statem *s, string tag_list)
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);
}
diff --git a/contrib/groff/src/roff/troff/node.cpp b/contrib/groff/src/roff/troff/node.cpp
index 0e440b210580..7ff5c858d4f5 100644
--- a/contrib/groff/src/roff/troff/node.cpp
+++ b/contrib/groff/src/roff/troff/node.cpp
@@ -4600,14 +4600,14 @@ void hline_node::tprint(troff_output_file *out)
}
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);