[src/trunk]: src/usr.bin/indent indent: simplify handling of comments

[rillig <rillig%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f9fdab4c4662
branches:  trunk
changeset: 376251:f9fdab4c4662
user:      rillig <rillig%NetBSD.org@localhost>
date:      Tue Jun 06 06:59:39 2023 +0000

description:
indent: simplify handling of comments

No functional change.

diffstat:

 usr.bin/indent/pr_comment.c |  30 ++++++++++++++----------------
 1 files changed, 14 insertions(+), 16 deletions(-)

diffs (74 lines):

diff -r 9e3e94cd27d6 -r f9fdab4c4662 usr.bin/indent/pr_comment.c
--- a/usr.bin/indent/pr_comment.c       Tue Jun 06 06:51:44 2023 +0000
+++ b/usr.bin/indent/pr_comment.c       Tue Jun 06 06:59:39 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pr_comment.c,v 1.152 2023/06/06 06:51:44 rillig Exp $  */
+/*     $NetBSD: pr_comment.c,v 1.153 2023/06/06 06:59:39 rillig Exp $  */
 
 /*-
  * SPDX-License-Identifier: BSD-4-Clause
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: pr_comment.c,v 1.152 2023/06/06 06:51:44 rillig Exp $");
+__RCSID("$NetBSD: pr_comment.c,v 1.153 2023/06/06 06:59:39 rillig Exp $");
 
 #include <string.h>
 
@@ -226,16 +226,16 @@ copy_comment_wrap_newline(ssize_t *last_
        ++line_no;
 
        /* flush any blanks and/or tabs at start of next line */
-       bool skip_asterisk = true;
-       do {
-               inp_skip();
-               if (inp_p[0] == '*' && skip_asterisk) {
-                       skip_asterisk = false;
+       inp_skip();             /* '\n' */
+       while (ch_isblank(inp_p[0]))
+               inp_p++;
+       if (inp_p[0] == '*' && inp_p[1] == '/')
+               return false;
+       if (inp_p[0] == '*') {
+               inp_p++;
+               while (ch_isblank(inp_p[0]))
                        inp_p++;
-                       if (inp_p[0] == '/')
-                               return false;
-               }
-       } while (ch_isblank(inp_p[0]));
+       }
 
        return true;
 }
@@ -243,8 +243,6 @@ copy_comment_wrap_newline(ssize_t *last_
 static void
 copy_comment_wrap_finish(int line_length, bool delim)
 {
-       inp_p++;
-
        if (delim) {
                if (com.len > 3)
                        output_line();
@@ -260,6 +258,7 @@ copy_comment_wrap_finish(int line_length
                        output_line();
        }
 
+       inp_p += 2;
        if (!(com.len > 0 && ch_isblank(com.s[com.len - 1])))
                com_add_char(' ');
        com_add_char('*');
@@ -283,10 +282,9 @@ copy_comment_wrap(int line_length, bool 
                                goto unterminated_comment;
                        if (!copy_comment_wrap_newline(&last_blank))
                                goto end_of_comment;
-               } else if (inp_p[0] == '*' && inp_p[1] == '/') {
-                       inp_p++;
+               } else if (inp_p[0] == '*' && inp_p[1] == '/')
                        goto end_of_comment;
-               } else
+               else
                        copy_comment_wrap_text(line_length, &last_blank);
        }