[src/trunk]: src/usr.bin/indent indent: clean up overcomplicated conditions i...

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

details:   https://anonhg.NetBSD.org/src/rev/fd17cb494d46
branches:  trunk
changeset: 1024833:fd17cb494d46
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sun Nov 07 10:31:12 2021 +0000

description:
indent: clean up overcomplicated conditions in copy_comment_nowrap

No functional change.

diffstat:

 usr.bin/indent/pr_comment.c |  18 ++++++------------
 1 files changed, 6 insertions(+), 12 deletions(-)

diffs (40 lines):

diff -r b37fae51e9ec -r fd17cb494d46 usr.bin/indent/pr_comment.c
--- a/usr.bin/indent/pr_comment.c       Sun Nov 07 10:26:43 2021 +0000
+++ b/usr.bin/indent/pr_comment.c       Sun Nov 07 10:31:12 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pr_comment.c,v 1.105 2021/11/07 10:26:43 rillig Exp $  */
+/*     $NetBSD: pr_comment.c,v 1.106 2021/11/07 10:31:12 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.105 2021/11/07 10:26:43 rillig Exp $");
+__RCSID("$NetBSD: pr_comment.c,v 1.106 2021/11/07 10:31:12 rillig Exp $");
 #elif defined(__FreeBSD__)
 __FBSDID("$FreeBSD: head/usr.bin/indent/pr_comment.c 334927 2018-06-10 16:44:18Z pstef $");
 #endif
@@ -351,17 +351,11 @@
            continue;
        }
 
-       if (*inp.s == '*') {
-           inp_skip();
-           if (*inp.s == '/' && token.e[-1] == '*') {
-               inp_skip();
-               com_add_char('*');
-               com_add_char('/');
-               goto finish;
-           } else              /* handle isolated '*' */
-               com_add_char('*');
-       } else
+       com_add_char(inp_next());
+       if (com.e[-1] == '*' && *inp.s == '/' && token.e[-1] == '*') {
            com_add_char(inp_next());
+           goto finish;
+       }
     }
 
 finish: