 @@ -1,14 +1,14 @@
-/*	$NetBSD: pr_comment.c,v 1.94 2021/11/03 21:47:35 rillig Exp $	*/
+/*	$NetBSD: pr_comment.c,v 1.95 2021/11/04 17:37:03 rillig Exp $	*/
 /*-
  * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1985 Sun Microsystems, Inc.
  * Copyright (c) 1980, 1993
  *	The Regents of the University of California.  All rights reserved.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -33,27 +33,27 @@
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #if 0
 static char sccsid[] = "@(#)pr_comment.c	8.1 (Berkeley) 6/6/93";
 #endif
 #include <sys/cdefs.h>
 #if defined(__NetBSD__)
-__RCSID("$NetBSD: pr_comment.c,v 1.94 2021/11/03 21:47:35 rillig Exp $");
+__RCSID("$NetBSD: pr_comment.c,v 1.95 2021/11/04 17:37:03 rillig Exp $");
 #elif defined(__FreeBSD__)
 __FBSDID("$FreeBSD: head/usr.bin/indent/pr_comment.c 334927 2018-06-10 16:44:18Z pstef $");
 #endif
 #include <assert.h>
 #include <ctype.h>
 #include <stdio.h>
 #include <string.h>
 #include "indent.h"
 static void
 com_add_char(char ch)
 @@ -89,61 +89,37 @@ fits_in_one_line(int max_line_length)
     for (const char *p = inp.s; *p != '\n'; p++) {
 	assert(*p != '\0');
 	assert(inp.e - p >= 2);
 	if (!(p[0] == '*' && p[1] == '/'))
 	    continue;
 	int len = ind_add(ps.com_ind + 3, inp.s, p);
 	len += ch_isblank(p[-1]) ? 2 : 3;
 	return len <= max_line_length;
+    }
     return false;
+}
-/*
+static void
- * Scan, reformat and output a single comment, which is either a block comment
+analyze_comment(int *p_adj_max_line_length, bool *p_break_delim,
- * starting with '/' '*' or an end-of-line comment starting with '//'.
+    bool *p_may_wrap)
  * Try to keep comments from going over the maximum line length.  If a line is
  * too long, move everything starting from the last blank to the next comment
  * line.  Blanks and tabs from the beginning of the input line are removed.
  * ALGORITHM:
  *	1) Decide where the comment should be aligned, and if lines should
  *	   be broken.
  *	2) If lines should not be broken and filled, just copy up to end of
  *	   comment.
  *	3) If lines should be filled, then scan through the input buffer,
  *	   copying characters to com_buf.  Remember where the last blank,
  *	   tab, or newline was.  When line is filled, print up to last blank
  *	   and continue copying.
  */
 void
 process_comment(void)
+{
     int adj_max_line_length;	/* Adjusted max_line_length for comments that
 				 * spill over the right margin */
     ssize_t last_blank;		/* index of the last blank in com.buf */
     bool break_delim = opt.comment_delimiter_on_blankline;
     int l_just_saw_decl = ps.just_saw_decl;
     int com_ind;
     adj_max_line_length = opt.max_line_length;
     ps.just_saw_decl = 0;
     last_blank = -1;		/* no blanks found so far */
     bool may_wrap = true;
     ps.stats.comments++;
     /* Figure where to align and how to treat the comment */
     if (ps.curr_col_1 && !opt.format_col1_comments) {
 	may_wrap = false;
 	break_delim = false;
 	com_ind = 0;
     } else {
 	if (*inp.s == '-' || *inp.s == '*' || token.e[-1] == '/' ||
 	    (*inp.s == '\n' && !opt.format_block_comments)) {
 	    may_wrap = false;
 	    break_delim = false;
+	}
 @@ -210,27 +186,35 @@ process_comment(void)
     if (break_delim) {
 	char *t = com.e;
 	com.e = com.s + 2;
 	*com.e = '\0';
 	if (opt.blanklines_before_block_comments &&
 		ps.prev_token != lsym_lbrace)
 	    blank_line_before = true;
 	dump_line();
 	com.e = com.s = t;
 	com_add_delim();
+    }
-    /* Now copy the comment. */
+    *p_adj_max_line_length = adj_max_line_length;
     *p_break_delim = break_delim;
     *p_may_wrap = may_wrap;
+}
 static void
 copy_comment(int adj_max_line_length, bool break_delim, bool may_wrap)
+{
     ssize_t last_blank = -1;	/* index of the last blank in com.buf */
     for (;;) {
 	switch (*inp.s) {
 	case '\f':
 	    if (may_wrap) {	/* in a text comment, break the line here */
 		dump_line_ff();
 		last_blank = -1;
 		com_add_delim();
 		inp.s++;
 		while (ch_isblank(*inp.s))
 		    inp.s++;
 	    } else {
 		inbuf_skip();
 @@ -296,28 +280,26 @@ process_comment(void)
 			dump_line();
 		    else
 			com.s = com.e;	/* XXX: why not e = s? */
 		    com_add_char(' ');
+		}
 		if (!ch_isblank(com.e[-1]) && may_wrap)
 		    com_add_char(' ');
 		if (token.e[-1] != '/') {
 		    com_add_char('*');
 		    com_add_char('/');
+		}
 		com_terminate();
 		ps.just_saw_decl = l_just_saw_decl;
 		return;
 	    } else		/* handle isolated '*' */
 		com_add_char('*');
 	    break;
 	default:		/* we have a random char */
+	    ;
 	    int now_len = ind_add(ps.com_ind, com.s, com.e);
 	    for (;;) {
 		char ch = inbuf_next();
 		if (ch_isblank(ch))
 		    last_blank = com.e - com.buf;
 @@ -344,13 +326,49 @@ process_comment(void)
 	    const char *last_word_s = com.buf + last_blank + 1;
 	    size_t last_word_len = (size_t)(com.e - last_word_s);
 	    com.e = com.buf + last_blank;
 	    dump_line();
 	    com_add_delim();
 	    memcpy(com.e, last_word_s, last_word_len);
 	    com.e += last_word_len;
 	    last_blank = -1;
+	}
+    }
+}
 /*
  * Scan, reformat and output a single comment, which is either a block comment
  * starting with '/' '*' or an end-of-line comment starting with '//'.
+ *
  * Try to keep comments from going over the maximum line length.  If a line is
  * too long, move everything starting from the last blank to the next comment
  * line.  Blanks and tabs from the beginning of the input line are removed.
+ *
  * ALGORITHM:
  *	1) Decide where the comment should be aligned, and if lines should
  *	   be broken.
  *	2) If lines should not be broken and filled, just copy up to end of
  *	   comment.
  *	3) If lines should be filled, then scan through the input buffer,
  *	   copying characters to com_buf.  Remember where the last blank,
  *	   tab, or newline was.  When line is filled, print up to last blank
  *	   and continue copying.
  */
 void
 process_comment(void)
+{
     int adj_max_line_length;	/* Adjusted max_line_length for comments that
 				 * spill over the right margin */
     bool break_delim = opt.comment_delimiter_on_blankline;
     adj_max_line_length = opt.max_line_length;
     ps.just_saw_decl = 0;
     bool may_wrap = true;
     ps.stats.comments++;
     int l_just_saw_decl = ps.just_saw_decl;
     analyze_comment(&adj_max_line_length, &break_delim, &may_wrap);
     copy_comment(adj_max_line_length, break_delim, may_wrap);
     ps.just_saw_decl = l_just_saw_decl;
+}