Module Name: src
Committed By: rillig
Date: Tue May 23 06:43:19 UTC 2023
Modified Files:
src/tests/usr.bin/indent: fmt_decl.c
src/usr.bin/indent: indent.c
Log Message:
indent: fix spacing around '*' in declarations
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/tests/usr.bin/indent/fmt_decl.c
cvs rdiff -u -r1.305 -r1.306 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/tests/usr.bin/indent/fmt_decl.c
diff -u src/tests/usr.bin/indent/fmt_decl.c:1.44 src/tests/usr.bin/indent/fmt_decl.c:1.45
--- src/tests/usr.bin/indent/fmt_decl.c:1.44 Tue May 23 06:18:00 2023
+++ src/tests/usr.bin/indent/fmt_decl.c Tue May 23 06:43:19 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: fmt_decl.c,v 1.44 2023/05/23 06:18:00 rillig Exp $ */
+/* $NetBSD: fmt_decl.c,v 1.45 2023/05/23 06:43:19 rillig Exp $ */
/*
* Tests for declarations of global variables, external functions, and local
@@ -1005,8 +1005,7 @@ void
//indent run -ci4 -di0 -ndj -nlp
void
// $ FIXME: Wrong indentation, should be 0 instead.
-// $ FIXME: Wrong spacing around '*'.
- (error_at)(int msgid, const pos_t * pos, ...)
+ (error_at)(int msgid, const pos_t *pos, ...)
{
}
//indent end
Index: src/usr.bin/indent/indent.c
diff -u src/usr.bin/indent/indent.c:1.305 src/usr.bin/indent/indent.c:1.306
--- src/usr.bin/indent/indent.c:1.305 Tue May 23 06:35:01 2023
+++ src/usr.bin/indent/indent.c Tue May 23 06:43:19 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: indent.c,v 1.305 2023/05/23 06:35:01 rillig Exp $ */
+/* $NetBSD: indent.c,v 1.306 2023/05/23 06:43:19 rillig Exp $ */
/*-
* SPDX-License-Identifier: BSD-4-Clause
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: indent.c,v 1.305 2023/05/23 06:35:01 rillig Exp $");
+__RCSID("$NetBSD: indent.c,v 1.306 2023/05/23 06:43:19 rillig Exp $");
#include <sys/param.h>
#include <err.h>
@@ -366,6 +366,8 @@ update_ps_decl_ptr(lexer_symbol lsym)
if (lsym == lsym_lparen_or_lbracket
&& ps.prev_token == lsym_for)
ps.decl_ptr = dp_start;
+ if (lsym == lsym_comma && ps.in_decl)
+ ps.decl_ptr = dp_start;
break;
}
}
