svn commit: r303484 - head/usr.bin/indent

[Benjamin Kaduk]

On Fri, Jul 29, 2016 at 11:17 AM, Pedro F. Giffuni <pfg at freebsd.org> wrote:

> Author: pfg
> Date: Fri Jul 29 16:17:54 2016
> New Revision: 303484
> URL: https://svnweb.freebsd.org/changeset/base/303484
>
> Log:
>   indent(1): Fix breakage caused by single comment following "else".
>
>   indent(1) simply wasn't taught that "else" may be followed by a comment
>   without any opening brace anywhere on the line, so it was very confused
>   in such cases.
>
>
Wrong commit message?  I see no 'else' in this change.
(I guess core's guidance is to revert and recommit with correct message,
these days.)

-Ben



>   Differential Revision: https://reviews.freebsd.org/D6966 (Partial)
>   Obtained from:        Piotr Stefaniak
>
> Modified:
>   head/usr.bin/indent/indent.c
>
> Modified: head/usr.bin/indent/indent.c
>
> ==============================================================================
> --- head/usr.bin/indent/indent.c        Fri Jul 29 16:14:03 2016
> (r303483)
> +++ head/usr.bin/indent/indent.c        Fri Jul 29 16:17:54 2016
> (r303484)
> @@ -319,6 +319,8 @@ main(int argc, char **argv)
>             switch (type_code) {
>             case newline:
>                 ++line_no;
> +               if (sc_end != NULL)
> +                   goto sw_buffer;     /* dump comment, if any */
>                 flushed_nl = true;
>             case form_feed:
>                 break;          /* form feeds and newlines found here will
> be
> _______________________________________________
> svn-src-all at freebsd.org mailing list
> https://lists.freebsd.org/mailman/listinfo/svn-src-all
> To unsubscribe, send any mail to "svn-src-all-unsubscribe at freebsd.org"
>