Sat Mar 13 13:55:42 2021 UTC ()

indent: rename local variable in dump_line

This clarifies that the variable names a column, not an indentation.


(rillig)

diff -r1.44 -r1.45 src/usr.bin/indent/io.c

--- src/usr.bin/indent/io.c 2021/03/13 13:54:01	1.44
+++ src/usr.bin/indent/io.c 2021/03/13 13:55:42	1.45

 @@ -1,14 +1,14 @@
-/*	$NetBSD: io.c,v 1.44 2021/03/13 13:54:01 rillig Exp $	*/
+/*	$NetBSD: io.c,v 1.45 2021/03/13 13:55:42 rillig Exp $	*/
 /*-
  * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1985 Sun Microsystems, Inc.
  * Copyright (c) 1980, 1993
  *	The Regents of the University of California.  All rights reserved.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -36,27 +36,27 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #if 0
 #ifndef lint
 static char sccsid[] = "@(#)io.c	8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
 #ifndef lint
 #if defined(__NetBSD__)
-__RCSID("$NetBSD: io.c,v 1.44 2021/03/13 13:54:01 rillig Exp $");
+__RCSID("$NetBSD: io.c,v 1.45 2021/03/13 13:55:42 rillig Exp $");
 #elif defined(__FreeBSD__)
 __FBSDID("$FreeBSD: head/usr.bin/indent/io.c 334927 2018-06-10 16:44:18Z pstef $");
 #endif
 #endif
 #include <ctype.h>
 #include <err.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
 #include "indent.h"
 @@ -208,50 +208,50 @@ dump_line(void)
 			 */
 			ps.paren_indents[i] = -(ind + target_col);
 			debug_println(
 			    "setting pi[%d] from %d to %d for column %d",
 			    i, ind, ps.paren_indents[i], target_col);
+		    }
+		}
+	    }
 	    cur_col = 1 + output_indent(cur_col - 1, target_col - 1);
 	    output_range(s_code, e_code);
 	    cur_col = 1 + indentation_after(cur_col - 1, s_code);
+	}
 	if (s_com != e_com) {		/* print comment, if any */
-	    int target = ps.com_col;
+	    int target_col = ps.com_col;
 	    char *com_st = s_com;
-	    target += ps.comment_delta;
+	    target_col += ps.comment_delta;
 	    while (*com_st == '\t')	/* consider original indentation in
 				     * case this is a box comment */
-		com_st++, target += opt.tabsize;
+		com_st++, target_col += opt.tabsize;
-	    while (target <= 0)
+	    while (target_col <= 0)
 		if (*com_st == ' ')
-		    target++, com_st++;
+		    target_col++, com_st++;
 		else if (*com_st == '\t') {
-		    target = opt.tabsize * (1 + (target - 1) / opt.tabsize) + 1;
+		    target_col = opt.tabsize * (1 + (target_col - 1) / opt.tabsize) + 1;
 		    com_st++;
 		} else
-		    target = 1;
+		    target_col = 1;
-	    if (cur_col > target) {	/* if comment can't fit on this line,
+	    if (cur_col > target_col) {	/* if comment can't fit on this line,
 				     * put it on next line */
 		output_char('\n');
 		cur_col = 1;
 		++ps.out_lines;
+	    }
 	    while (e_com > com_st && isspace((unsigned char)e_com[-1]))
 		e_com--;
-	    (void)output_indent(cur_col - 1, target - 1);
+	    (void)output_indent(cur_col - 1, target_col - 1);
 	    output_range(com_st, e_com);
 	    ps.comment_delta = ps.n_comment_delta;
 	    ++ps.com_lines;	/* count lines with comments */
+	}
 	if (ps.use_ff)
 	    output_char('\014');
 	else
 	    output_char('\n');
 	++ps.out_lines;
 	if (ps.just_saw_decl == 1 && opt.blanklines_after_declarations) {
 	    prefix_blankline_requested = 1;
 	    ps.just_saw_decl = 0;
 	} else