Date: Mon, 28 Oct 2013 18:10:35 +0000 (UTC) From: Sean Bruno <sbruno@FreeBSD.org> 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 Message-ID: <201310281810.r9SIAZgK066376@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310281810.r9SIAZgK066376>