[src/trunk]: src/usr.bin/indent indent: reduce indentation in process_comment

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

details:   https://anonhg.NetBSD.org/src/rev/c1c89109bb0b
branches:  trunk
changeset: 990421:c1c89109bb0b
user:      rillig <rillig%NetBSD.org@localhost>
date:      Tue Oct 26 21:23:52 2021 +0000

description:
indent: reduce indentation in process_comment

No functional change.

diffstat:

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

diffs (63 lines):

diff -r f5b8f6f6c950 -r c1c89109bb0b usr.bin/indent/pr_comment.c
--- a/usr.bin/indent/pr_comment.c       Tue Oct 26 21:18:51 2021 +0000
+++ b/usr.bin/indent/pr_comment.c       Tue Oct 26 21:23:52 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pr_comment.c,v 1.85 2021/10/26 21:04:03 rillig Exp $   */
+/*     $NetBSD: pr_comment.c,v 1.86 2021/10/26 21:23:52 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.85 2021/10/26 21:04:03 rillig Exp $");
+__RCSID("$NetBSD: pr_comment.c,v 1.86 2021/10/26 21:23:52 rillig Exp $");
 #elif defined(__FreeBSD__)
 __FBSDID("$FreeBSD: head/usr.bin/indent/pr_comment.c 334927 2018-06-10 16:44:18Z pstef $");
 #endif
@@ -331,28 +331,27 @@
 
            ps.last_nl = false;
 
+           if (now_len <= adj_max_line_length || !may_wrap)
+               break;
            /* XXX: signed character comparison '>' does not work for UTF-8 */
-           if (now_len > adj_max_line_length &&
-                   may_wrap && com.e[-1] > ' ') {
+           if (com.e[-1] <= ' ')
+               break;
 
-               /* the comment is too long, it must be broken up */
-               if (last_blank == -1) {
-                   dump_line();
-                   com_add_delim();
-                   break;
-               }
-
-               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;
+           if (last_blank == -1) {     /* only a single word in this line */
                dump_line();
                com_add_delim();
+               break;
+           }
 
-               memcpy(com.e, last_word_s, last_word_len);
-               com.e += last_word_len;
-               last_blank = -1;
-           }
-           break;
+           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;
        }
     }
 }