[PATCH] contrib/groff Queisce -Wdangling else

Jilles Tjoelker jilles at stack.nl
Sat Oct 26 23:07:50 UTC 2013


On Sat, Oct 26, 2013 at 11:04:29PM +0200, dt71 at gmx.com wrote:
> Sean Bruno wrote, On 10/26/2013 17:04:

> Index: contrib/groff/src/roff/troff/node.cpp
> ===================================================================
> --- contrib/groff/src/roff/troff/node.cpp	(revision 257159)
> +++ contrib/groff/src/roff/troff/node.cpp	(working copy)
> @@ -4600,17 +4600,18 @@
>    }
>    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 {
> +	out->right(rem);
>        }
> -      else
> -	out->right(rem);
>      while (--i >= 0)
>        if (out->is_on())
>  	n->tprint(out);
> +    }
>    }
>  }
> >There is no(intended) functional change.

This part indeed looks wrong. The while loop was not under the if (rem >
H0) but now is. The closing brace should be added before instead of
after the while loop.

Also, putting braces around  out->right(rem);  is not needed.

I recommend making sure the object files do not change due to patches
like these.

-- 
Jilles Tjoelker


More information about the freebsd-current mailing list