CVS commit: src/usr.bin/indent

[Roland Illig]

Module Name:    src
Committed By:   rillig
Date:           Fri Oct  8 20:45:22 UTC 2021

Modified Files:
        src/usr.bin/indent: indent.c

Log Message:
indent: clean up process_decl, replace unnecessary strlen

No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.131 -r1.132 src/usr.bin/indent/indent.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/usr.bin/indent/indent.c
diff -u src/usr.bin/indent/indent.c:1.131 src/usr.bin/indent/indent.c:1.132
--- src/usr.bin/indent/indent.c:1.131	Fri Oct  8 20:33:18 2021
+++ src/usr.bin/indent/indent.c	Fri Oct  8 20:45:22 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: indent.c,v 1.131 2021/10/08 20:33:18 rillig Exp $	*/
+/*	$NetBSD: indent.c,v 1.132 2021/10/08 20:45:22 rillig Exp $	*/
 
 /*-
  * SPDX-License-Identifier: BSD-4-Clause
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)indent.c	5.1
 
 #include <sys/cdefs.h>
 #if defined(__NetBSD__)
-__RCSID("$NetBSD: indent.c,v 1.131 2021/10/08 20:33:18 rillig Exp $");
+__RCSID("$NetBSD: indent.c,v 1.132 2021/10/08 20:45:22 rillig Exp $");
 #elif defined(__FreeBSD__)
 __FBSDID("$FreeBSD: head/usr.bin/indent/indent.c 340138 2018-11-04 19:24:49Z oshogbo $");
 #endif
@@ -797,7 +797,7 @@ process_unary_op(int decl_ind, bool tabs
     if (!ps.dumped_decl_indent && ps.in_decl && !ps.block_init &&
 	ps.procname[0] == '\0' && ps.paren_level == 0) {
 	/* pointer declarations */
-	indent_declaration(decl_ind - (int)strlen(token.s), tabs_to_var);
+	indent_declaration(decl_ind - (int)buf_len(&token), tabs_to_var);
 	ps.dumped_decl_indent = true;
     } else if (ps.want_blank)
 	*code.e++ = ' ';
@@ -1071,7 +1071,7 @@ process_keyword_else(bool *force_nl, boo
 }
 
 static void
-process_decl(int *out_decl_ind, bool *out_tabs_to_var)
+process_decl(int *decl_ind, bool *tabs_to_var)
 {
     parse(decl);		/* let parser worry about indentation */
 
@@ -1096,12 +1096,12 @@ process_decl(int *out_decl_ind, bool *ou
 
     prefix_blankline_requested = false;
 
-    int len = (int)strlen(token.s) + 1;
+    int len = (int)buf_len(&token) + 1;
     int ind = ps.ind_level == 0 || ps.decl_nest > 0
 	    ? opt.decl_indent		/* global variable or local member */
 	    : opt.local_decl_indent;	/* local variable */
-    *out_decl_ind = ind > 0 ? ind : len;
-    *out_tabs_to_var = opt.use_tabs ? ind > 0 : false;
+    *decl_ind = ind > 0 ? ind : len;
+    *tabs_to_var = opt.use_tabs && ind > 0;
 }
 
 static void