[src/trunk]: src/usr.bin/indent indent: skip redundant conditions in copy_com...

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

details:   https://anonhg.NetBSD.org/src/rev/b37fae51e9ec
branches:  trunk
changeset: 1024832:b37fae51e9ec
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sun Nov 07 10:26:43 2021 +0000

description:
indent: skip redundant conditions in copy_comment_nowrap

No functional change.

diffstat:

 usr.bin/indent/pr_comment.c |  23 ++++++++++-------------
 1 files changed, 10 insertions(+), 13 deletions(-)

diffs (56 lines):

diff -r 36db9563b5c1 -r b37fae51e9ec usr.bin/indent/pr_comment.c
--- a/usr.bin/indent/pr_comment.c       Sun Nov 07 10:17:39 2021 +0000
+++ b/usr.bin/indent/pr_comment.c       Sun Nov 07 10:26:43 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pr_comment.c,v 1.104 2021/11/07 10:17:39 rillig Exp $  */
+/*     $NetBSD: pr_comment.c,v 1.105 2021/11/07 10:26:43 rillig Exp $  */
 
 /*-
  * SPDX-License-Identifier: BSD-4-Clause
@@ -43,7 +43,7 @@
 
 #include <sys/cdefs.h>
 #if defined(__NetBSD__)
-__RCSID("$NetBSD: pr_comment.c,v 1.104 2021/11/07 10:17:39 rillig Exp $");
+__RCSID("$NetBSD: pr_comment.c,v 1.105 2021/11/07 10:26:43 rillig Exp $");
 #elif defined(__FreeBSD__)
 __FBSDID("$FreeBSD: head/usr.bin/indent/pr_comment.c 334927 2018-06-10 16:44:18Z pstef $");
 #endif
@@ -335,7 +335,7 @@
     for (;;) {
        if (*inp.s == '\n') {
            if (token.e[-1] == '/')
-               goto end_of_line_comment;
+               goto finish;
 
            if (had_eof) {
                diag(1, "Unterminated comment");
@@ -355,21 +355,18 @@
            inp_skip();
            if (*inp.s == '/' && token.e[-1] == '*') {
                inp_skip();
-
-       end_of_line_comment:
-               if (token.e[-1] == '*') {
-                   com_add_char('*');
-                   com_add_char('/');
-               }
-               com_terminate();
-               ps.next_col_1 = false;
-               return;
-
+               com_add_char('*');
+               com_add_char('/');
+               goto finish;
            } else              /* handle isolated '*' */
                com_add_char('*');
        } else
            com_add_char(inp_next());
     }
+
+finish:
+    com_terminate();
+    ps.next_col_1 = false;
 }
 
 /*