Module Name: src
Committed By: rillig
Date: Sun Jan 31 14:57:28 UTC 2021
Modified Files:
src/tests/usr.bin/xlint/lint1: d_c99_anon_union.c d_c99_complex_split.c
d_c99_decls_after_stmt.c d_c99_decls_after_stmt2.c
d_c99_decls_after_stmt3.c d_c99_func.c d_c99_nested_struct.c
d_c99_recursive_init.c d_c99_union_cast.c d_c99_union_cast.exp
d_c99_union_init3.c d_cast_fun_array_param.c d_cast_init.c
d_cast_init2.c d_cast_lhs.c d_compound_literals1.c
d_compound_literals2.c d_cvt_constant.c d_cvt_constant.exp
d_cvt_in_ternary.c d_ellipsis_in_switch.c
d_gcc_compound_statements1.c d_gcc_extension.c d_gcc_extension.exp
d_gcc_func.c d_gcc_variable_array_init.c d_nested_structs.c
d_packed_structs.c d_shift_to_narrower_type.c
d_type_question_colon.c d_zero_sized_arrays.c
Log Message:
lint: format tests in a common style
The lint tests do not focus on the whitespace since that is the most
boring part of code style. Therefore, format the tests to be readable
by following share/misc/style as close as possible.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/xlint/lint1/d_c99_anon_union.c \
src/tests/usr.bin/xlint/lint1/d_c99_decls_after_stmt.c \
src/tests/usr.bin/xlint/lint1/d_c99_decls_after_stmt2.c \
src/tests/usr.bin/xlint/lint1/d_c99_decls_after_stmt3.c \
src/tests/usr.bin/xlint/lint1/d_c99_func.c \
src/tests/usr.bin/xlint/lint1/d_c99_nested_struct.c \
src/tests/usr.bin/xlint/lint1/d_c99_union_cast.c \
src/tests/usr.bin/xlint/lint1/d_c99_union_cast.exp \
src/tests/usr.bin/xlint/lint1/d_cast_fun_array_param.c \
src/tests/usr.bin/xlint/lint1/d_cast_init2.c \
src/tests/usr.bin/xlint/lint1/d_cast_lhs.c \
src/tests/usr.bin/xlint/lint1/d_compound_literals1.c \
src/tests/usr.bin/xlint/lint1/d_compound_literals2.c \
src/tests/usr.bin/xlint/lint1/d_cvt_constant.c \
src/tests/usr.bin/xlint/lint1/d_cvt_constant.exp \
src/tests/usr.bin/xlint/lint1/d_cvt_in_ternary.c \
src/tests/usr.bin/xlint/lint1/d_ellipsis_in_switch.c \
src/tests/usr.bin/xlint/lint1/d_gcc_compound_statements1.c \
src/tests/usr.bin/xlint/lint1/d_gcc_extension.c \
src/tests/usr.bin/xlint/lint1/d_gcc_func.c \
src/tests/usr.bin/xlint/lint1/d_gcc_variable_array_init.c \
src/tests/usr.bin/xlint/lint1/d_nested_structs.c \
src/tests/usr.bin/xlint/lint1/d_packed_structs.c \
src/tests/usr.bin/xlint/lint1/d_shift_to_narrower_type.c \
src/tests/usr.bin/xlint/lint1/d_type_question_colon.c \
src/tests/usr.bin/xlint/lint1/d_zero_sized_arrays.c
cvs rdiff -u -r1.3 -r1.4 src/tests/usr.bin/xlint/lint1/d_c99_complex_split.c \
src/tests/usr.bin/xlint/lint1/d_c99_recursive_init.c \
src/tests/usr.bin/xlint/lint1/d_c99_union_init3.c \
src/tests/usr.bin/xlint/lint1/d_cast_init.c
cvs rdiff -u -r1.4 -r1.5 src/tests/usr.bin/xlint/lint1/d_gcc_extension.exp
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/xlint/lint1/d_c99_anon_union.c
diff -u src/tests/usr.bin/xlint/lint1/d_c99_anon_union.c:1.2 src/tests/usr.bin/xlint/lint1/d_c99_anon_union.c:1.3
--- src/tests/usr.bin/xlint/lint1/d_c99_anon_union.c:1.2 Sun Jan 31 14:39:31 2021
+++ src/tests/usr.bin/xlint/lint1/d_c99_anon_union.c Sun Jan 31 14:57:28 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: d_c99_anon_union.c,v 1.2 2021/01/31 14:39:31 rillig Exp $ */
+/* $NetBSD: d_c99_anon_union.c,v 1.3 2021/01/31 14:57:28 rillig Exp $ */
# 3 "d_c99_anon_union.c"
/* struct with only anonymous members */
@@ -11,8 +11,8 @@ struct foo {
};
int
-main(void) {
-
+main(void)
+{
struct foo *f = 0;
printf("%p\n", &f[1]);
return 0;
Index: src/tests/usr.bin/xlint/lint1/d_c99_decls_after_stmt.c
diff -u src/tests/usr.bin/xlint/lint1/d_c99_decls_after_stmt.c:1.2 src/tests/usr.bin/xlint/lint1/d_c99_decls_after_stmt.c:1.3
--- src/tests/usr.bin/xlint/lint1/d_c99_decls_after_stmt.c:1.2 Sun Jan 31 14:39:31 2021
+++ src/tests/usr.bin/xlint/lint1/d_c99_decls_after_stmt.c Sun Jan 31 14:57:28 2021
@@ -1,8 +1,12 @@
-/* $NetBSD: d_c99_decls_after_stmt.c,v 1.2 2021/01/31 14:39:31 rillig Exp $ */
+/* $NetBSD: d_c99_decls_after_stmt.c,v 1.3 2021/01/31 14:57:28 rillig Exp $ */
# 3 "d_c99_decls_after_stmt.c"
-void sample(void)
+void
+sample(void)
{
- int i = 0; i += 1;
- int j = 0; j += 1;
+ int i = 0;
+ i += 1;
+
+ int j = 0;
+ j += 1;
}
Index: src/tests/usr.bin/xlint/lint1/d_c99_decls_after_stmt2.c
diff -u src/tests/usr.bin/xlint/lint1/d_c99_decls_after_stmt2.c:1.2 src/tests/usr.bin/xlint/lint1/d_c99_decls_after_stmt2.c:1.3
--- src/tests/usr.bin/xlint/lint1/d_c99_decls_after_stmt2.c:1.2 Sun Jan 31 14:39:31 2021
+++ src/tests/usr.bin/xlint/lint1/d_c99_decls_after_stmt2.c Sun Jan 31 14:57:28 2021
@@ -1,9 +1,16 @@
-/* $NetBSD: d_c99_decls_after_stmt2.c,v 1.2 2021/01/31 14:39:31 rillig Exp $ */
+/* $NetBSD: d_c99_decls_after_stmt2.c,v 1.3 2021/01/31 14:57:28 rillig Exp $ */
# 3 "d_c99_decls_after_stmt2.c"
typedef int int_t;
-int main(void) {
-int i = 0; i += 1;
-int_t j = 0; j += 1;
-return 0;
+
+int
+main(void)
+{
+ int i = 0;
+ i += 1;
+
+ int_t j = 0;
+ j += 1;
+
+ return 0;
}
Index: src/tests/usr.bin/xlint/lint1/d_c99_decls_after_stmt3.c
diff -u src/tests/usr.bin/xlint/lint1/d_c99_decls_after_stmt3.c:1.2 src/tests/usr.bin/xlint/lint1/d_c99_decls_after_stmt3.c:1.3
--- src/tests/usr.bin/xlint/lint1/d_c99_decls_after_stmt3.c:1.2 Sun Jan 31 14:39:31 2021
+++ src/tests/usr.bin/xlint/lint1/d_c99_decls_after_stmt3.c Sun Jan 31 14:57:28 2021
@@ -1,8 +1,11 @@
-/* $NetBSD: d_c99_decls_after_stmt3.c,v 1.2 2021/01/31 14:39:31 rillig Exp $ */
+/* $NetBSD: d_c99_decls_after_stmt3.c,v 1.3 2021/01/31 14:57:28 rillig Exp $ */
# 3 "d_c99_decls_after_stmt3.c"
-void sample(int i)
+void
+sample(int i)
{
- i += 1;
- int j = 0; j += 1;
+ i += 1;
+
+ int j = 0;
+ j += 1;
}
Index: src/tests/usr.bin/xlint/lint1/d_c99_func.c
diff -u src/tests/usr.bin/xlint/lint1/d_c99_func.c:1.2 src/tests/usr.bin/xlint/lint1/d_c99_func.c:1.3
--- src/tests/usr.bin/xlint/lint1/d_c99_func.c:1.2 Sun Jan 31 14:39:31 2021
+++ src/tests/usr.bin/xlint/lint1/d_c99_func.c Sun Jan 31 14:57:28 2021
@@ -1,10 +1,11 @@
-/* $NetBSD: d_c99_func.c,v 1.2 2021/01/31 14:39:31 rillig Exp $ */
+/* $NetBSD: d_c99_func.c,v 1.3 2021/01/31 14:57:28 rillig Exp $ */
# 3 "d_c99_func.c"
/* C99 __func__ */
void
-foo(const char *p) {
+foo(const char *p)
+{
p = __func__;
foo(p);
}
Index: src/tests/usr.bin/xlint/lint1/d_c99_nested_struct.c
diff -u src/tests/usr.bin/xlint/lint1/d_c99_nested_struct.c:1.2 src/tests/usr.bin/xlint/lint1/d_c99_nested_struct.c:1.3
--- src/tests/usr.bin/xlint/lint1/d_c99_nested_struct.c:1.2 Sun Jan 31 14:39:31 2021
+++ src/tests/usr.bin/xlint/lint1/d_c99_nested_struct.c Sun Jan 31 14:57:28 2021
@@ -1,28 +1,27 @@
-/* $NetBSD: d_c99_nested_struct.c,v 1.2 2021/01/31 14:39:31 rillig Exp $ */
+/* $NetBSD: d_c99_nested_struct.c,v 1.3 2021/01/31 14:57:28 rillig Exp $ */
# 3 "d_c99_nested_struct.c"
/* C99 nested struct init with named and non-named initializers */
typedef struct pthread_mutex_t {
- unsigned int ptm_magic;
- char ptm_errorcheck;
+ unsigned int ptm_magic;
+ char ptm_errorcheck;
- char ptm_pad1[3];
+ char ptm_pad1[3];
- char ptm_interlock;
+ char ptm_interlock;
- char ptm_pad2[3];
+ char ptm_pad2[3];
- volatile void * ptm_owner;
- void * volatile ptm_waiters;
- unsigned int ptm_recursed;
- void *ptm_spare2;
+ volatile void *ptm_owner;
+ void *volatile ptm_waiters;
+ unsigned int ptm_recursed;
+ void *ptm_spare2;
} pthread_mutex_t;
struct arc4random_global {
-
- pthread_mutex_t lock;
+ pthread_mutex_t lock;
} arc4random_global = {
-
- .lock = { 0x33330003, 0, { 0, 0, 0 }, 0, { 0, 0, 0 }, ((void *)0), ((void *)0), 0, ((void *)0) },
+ .lock = { 0x33330003, 0, { 0, 0, 0 }, 0, { 0, 0, 0 }, ((void *)0),
+ ((void *)0), 0, ((void *)0) },
};
Index: src/tests/usr.bin/xlint/lint1/d_c99_union_cast.c
diff -u src/tests/usr.bin/xlint/lint1/d_c99_union_cast.c:1.2 src/tests/usr.bin/xlint/lint1/d_c99_union_cast.c:1.3
--- src/tests/usr.bin/xlint/lint1/d_c99_union_cast.c:1.2 Sun Jan 31 14:39:31 2021
+++ src/tests/usr.bin/xlint/lint1/d_c99_union_cast.c Sun Jan 31 14:57:28 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: d_c99_union_cast.c,v 1.2 2021/01/31 14:39:31 rillig Exp $ */
+/* $NetBSD: d_c99_union_cast.c,v 1.3 2021/01/31 14:57:28 rillig Exp $ */
# 3 "d_c99_union_cast.c"
/* union cast */
@@ -14,7 +14,8 @@ union foo {
};
void
-foo(void) {
+foo(void)
+{
struct bar *a;
((union foo)a).a;
Index: src/tests/usr.bin/xlint/lint1/d_c99_union_cast.exp
diff -u src/tests/usr.bin/xlint/lint1/d_c99_union_cast.exp:1.2 src/tests/usr.bin/xlint/lint1/d_c99_union_cast.exp:1.3
--- src/tests/usr.bin/xlint/lint1/d_c99_union_cast.exp:1.2 Sun Jan 31 14:39:31 2021
+++ src/tests/usr.bin/xlint/lint1/d_c99_union_cast.exp Sun Jan 31 14:57:28 2021
@@ -1 +1 @@
-d_c99_union_cast.c(18): warning: a unused in function foo [192]
+d_c99_union_cast.c(19): warning: a unused in function foo [192]
Index: src/tests/usr.bin/xlint/lint1/d_cast_fun_array_param.c
diff -u src/tests/usr.bin/xlint/lint1/d_cast_fun_array_param.c:1.2 src/tests/usr.bin/xlint/lint1/d_cast_fun_array_param.c:1.3
--- src/tests/usr.bin/xlint/lint1/d_cast_fun_array_param.c:1.2 Sun Jan 31 14:39:31 2021
+++ src/tests/usr.bin/xlint/lint1/d_cast_fun_array_param.c Sun Jan 31 14:57:28 2021
@@ -1,11 +1,14 @@
-/* $NetBSD: d_cast_fun_array_param.c,v 1.2 2021/01/31 14:39:31 rillig Exp $ */
+/* $NetBSD: d_cast_fun_array_param.c,v 1.3 2021/01/31 14:57:28 rillig Exp $ */
# 3 "d_cast_fun_array_param.c"
-static void f(void *b[4]) {
+static void
+f(void *b[4])
+{
(void)&b;
}
void *
-foo(void *fn) {
- return fn == 0 ? f : (void (*)(void *[4])) fn;
+foo(void *fn)
+{
+ return fn == 0 ? f : (void (*)(void *[4]))fn;
}
Index: src/tests/usr.bin/xlint/lint1/d_cast_init2.c
diff -u src/tests/usr.bin/xlint/lint1/d_cast_init2.c:1.2 src/tests/usr.bin/xlint/lint1/d_cast_init2.c:1.3
--- src/tests/usr.bin/xlint/lint1/d_cast_init2.c:1.2 Sun Jan 31 14:39:31 2021
+++ src/tests/usr.bin/xlint/lint1/d_cast_init2.c Sun Jan 31 14:57:28 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: d_cast_init2.c,v 1.2 2021/01/31 14:39:31 rillig Exp $ */
+/* $NetBSD: d_cast_init2.c,v 1.3 2021/01/31 14:57:28 rillig Exp $ */
# 3 "d_cast_init2.c"
/* cast initialization as the rhs of a - operand */
@@ -6,5 +6,6 @@ struct sockaddr_dl {
char sdl_data[2];
};
-int npdl_datasize = sizeof(struct sockaddr_dl) -
-((int) ((unsigned long)&((struct sockaddr_dl *) 0)->sdl_data[0]));
+int npdl_datasize = sizeof(struct sockaddr_dl) -
+ ((int)((unsigned long)
+ &((struct sockaddr_dl *)0)->sdl_data[0]));
Index: src/tests/usr.bin/xlint/lint1/d_cast_lhs.c
diff -u src/tests/usr.bin/xlint/lint1/d_cast_lhs.c:1.2 src/tests/usr.bin/xlint/lint1/d_cast_lhs.c:1.3
--- src/tests/usr.bin/xlint/lint1/d_cast_lhs.c:1.2 Sun Jan 31 14:39:31 2021
+++ src/tests/usr.bin/xlint/lint1/d_cast_lhs.c Sun Jan 31 14:57:28 2021
@@ -1,10 +1,13 @@
-/* $NetBSD: d_cast_lhs.c,v 1.2 2021/01/31 14:39:31 rillig Exp $ */
+/* $NetBSD: d_cast_lhs.c,v 1.3 2021/01/31 14:57:28 rillig Exp $ */
# 3 "d_cast_lhs.c"
/* pointer casts are valid lhs lvalues */
-struct sockaddr { };
+struct sockaddr {
+};
+
void
-foo() {
- unsigned long p = 6;
- ((struct sockaddr *)p) = 0;
+foo()
+{
+ unsigned long p = 6;
+ ((struct sockaddr *)p) = 0;
}
Index: src/tests/usr.bin/xlint/lint1/d_compound_literals1.c
diff -u src/tests/usr.bin/xlint/lint1/d_compound_literals1.c:1.2 src/tests/usr.bin/xlint/lint1/d_compound_literals1.c:1.3
--- src/tests/usr.bin/xlint/lint1/d_compound_literals1.c:1.2 Sun Jan 31 14:39:31 2021
+++ src/tests/usr.bin/xlint/lint1/d_compound_literals1.c Sun Jan 31 14:57:28 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: d_compound_literals1.c,v 1.2 2021/01/31 14:39:31 rillig Exp $ */
+/* $NetBSD: d_compound_literals1.c,v 1.3 2021/01/31 14:57:28 rillig Exp $ */
# 3 "d_compound_literals1.c"
/* compound literals */
@@ -9,6 +9,6 @@ struct p {
foo()
{
- struct p me = (struct p) {1, 2, 3, 4};
+ struct p me = (struct p){ 1, 2, 3, 4 };
me.a = me.b;
}
Index: src/tests/usr.bin/xlint/lint1/d_compound_literals2.c
diff -u src/tests/usr.bin/xlint/lint1/d_compound_literals2.c:1.2 src/tests/usr.bin/xlint/lint1/d_compound_literals2.c:1.3
--- src/tests/usr.bin/xlint/lint1/d_compound_literals2.c:1.2 Sun Jan 31 14:39:31 2021
+++ src/tests/usr.bin/xlint/lint1/d_compound_literals2.c Sun Jan 31 14:57:28 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: d_compound_literals2.c,v 1.2 2021/01/31 14:39:31 rillig Exp $ */
+/* $NetBSD: d_compound_literals2.c,v 1.3 2021/01/31 14:57:28 rillig Exp $ */
# 3 "d_compound_literals2.c"
/* compound literals */
@@ -9,7 +9,8 @@ struct p {
1, 2, 3, 4
};
-struct p *bar(int i)
+struct p *
+bar(int i)
{
static struct p q[10];
return &q[i];
@@ -17,5 +18,5 @@ struct p *bar(int i)
foo()
{
- *bar(1) = (struct p) { 1, 2, 3, 4 };
+ *bar(1) = (struct p){ 1, 2, 3, 4 };
}
Index: src/tests/usr.bin/xlint/lint1/d_cvt_constant.c
diff -u src/tests/usr.bin/xlint/lint1/d_cvt_constant.c:1.2 src/tests/usr.bin/xlint/lint1/d_cvt_constant.c:1.3
--- src/tests/usr.bin/xlint/lint1/d_cvt_constant.c:1.2 Sun Jan 31 14:39:31 2021
+++ src/tests/usr.bin/xlint/lint1/d_cvt_constant.c Sun Jan 31 14:57:28 2021
@@ -1,11 +1,12 @@
-/* $NetBSD: d_cvt_constant.c,v 1.2 2021/01/31 14:39:31 rillig Exp $ */
+/* $NetBSD: d_cvt_constant.c,v 1.3 2021/01/31 14:57:28 rillig Exp $ */
# 3 "d_cvt_constant.c"
/* the second assignment assumes failed before */
int
-main(void) {
- double x = 1;
- int foo = 0;
- if (foo)
- x = 1;
+main(void)
+{
+ double x = 1;
+ int foo = 0;
+ if (foo)
+ x = 1;
}
Index: src/tests/usr.bin/xlint/lint1/d_cvt_constant.exp
diff -u src/tests/usr.bin/xlint/lint1/d_cvt_constant.exp:1.2 src/tests/usr.bin/xlint/lint1/d_cvt_constant.exp:1.3
--- src/tests/usr.bin/xlint/lint1/d_cvt_constant.exp:1.2 Sun Jan 31 14:39:31 2021
+++ src/tests/usr.bin/xlint/lint1/d_cvt_constant.exp Sun Jan 31 14:57:28 2021
@@ -1,2 +1,2 @@
-d_cvt_constant.c(7): warning: x set but not used in function main [191]
-d_cvt_constant.c(11): warning: function main falls off bottom without returning value [217]
+d_cvt_constant.c(8): warning: x set but not used in function main [191]
+d_cvt_constant.c(12): warning: function main falls off bottom without returning value [217]
Index: src/tests/usr.bin/xlint/lint1/d_cvt_in_ternary.c
diff -u src/tests/usr.bin/xlint/lint1/d_cvt_in_ternary.c:1.2 src/tests/usr.bin/xlint/lint1/d_cvt_in_ternary.c:1.3
--- src/tests/usr.bin/xlint/lint1/d_cvt_in_ternary.c:1.2 Sun Jan 31 14:39:31 2021
+++ src/tests/usr.bin/xlint/lint1/d_cvt_in_ternary.c Sun Jan 31 14:57:28 2021
@@ -1,16 +1,19 @@
-/* $NetBSD: d_cvt_in_ternary.c,v 1.2 2021/01/31 14:39:31 rillig Exp $ */
+/* $NetBSD: d_cvt_in_ternary.c,v 1.3 2021/01/31 14:57:28 rillig Exp $ */
# 3 "d_cvt_in_ternary.c"
/* CVT node handling in ?: operator */
typedef unsigned long int size_t;
struct filecore_direntry {
- unsigned len:32;
+ unsigned len: 32;
};
+
int
main(void)
{
struct filecore_direntry dirent = { 0 };
- size_t uio_resid = 0;
- size_t bytelen = (((dirent.len)<(uio_resid))?(dirent.len):(uio_resid));
+ size_t uio_resid = 0;
+ size_t bytelen = (((dirent.len) < (uio_resid))
+ ? (dirent.len)
+ : (uio_resid));
return bytelen;
}
Index: src/tests/usr.bin/xlint/lint1/d_ellipsis_in_switch.c
diff -u src/tests/usr.bin/xlint/lint1/d_ellipsis_in_switch.c:1.2 src/tests/usr.bin/xlint/lint1/d_ellipsis_in_switch.c:1.3
--- src/tests/usr.bin/xlint/lint1/d_ellipsis_in_switch.c:1.2 Sun Jan 31 14:39:31 2021
+++ src/tests/usr.bin/xlint/lint1/d_ellipsis_in_switch.c Sun Jan 31 14:57:28 2021
@@ -1,7 +1,8 @@
-/* $NetBSD: d_ellipsis_in_switch.c,v 1.2 2021/01/31 14:39:31 rillig Exp $ */
+/* $NetBSD: d_ellipsis_in_switch.c,v 1.3 2021/01/31 14:57:28 rillig Exp $ */
# 3 "d_ellipsis_in_switch.c"
-int x(void)
+int
+x(void)
{
int i = 33;
switch (i) {
Index: src/tests/usr.bin/xlint/lint1/d_gcc_compound_statements1.c
diff -u src/tests/usr.bin/xlint/lint1/d_gcc_compound_statements1.c:1.2 src/tests/usr.bin/xlint/lint1/d_gcc_compound_statements1.c:1.3
--- src/tests/usr.bin/xlint/lint1/d_gcc_compound_statements1.c:1.2 Sun Jan 31 14:39:31 2021
+++ src/tests/usr.bin/xlint/lint1/d_gcc_compound_statements1.c Sun Jan 31 14:57:28 2021
@@ -1,10 +1,14 @@
-/* $NetBSD: d_gcc_compound_statements1.c,v 1.2 2021/01/31 14:39:31 rillig Exp $ */
+/* $NetBSD: d_gcc_compound_statements1.c,v 1.3 2021/01/31 14:57:28 rillig Exp $ */
# 3 "d_gcc_compound_statements1.c"
/* GCC compound statements */
foo(unsigned long z)
{
- z = ({ unsigned long tmp; tmp = 1; tmp; });
+ z = ({
+ unsigned long tmp;
+ tmp = 1;
+ tmp;
+ });
foo(z);
}
Index: src/tests/usr.bin/xlint/lint1/d_gcc_extension.c
diff -u src/tests/usr.bin/xlint/lint1/d_gcc_extension.c:1.2 src/tests/usr.bin/xlint/lint1/d_gcc_extension.c:1.3
--- src/tests/usr.bin/xlint/lint1/d_gcc_extension.c:1.2 Sun Jan 31 14:39:31 2021
+++ src/tests/usr.bin/xlint/lint1/d_gcc_extension.c Sun Jan 31 14:57:28 2021
@@ -1,9 +1,14 @@
-/* $NetBSD: d_gcc_extension.c,v 1.2 2021/01/31 14:39:31 rillig Exp $ */
+/* $NetBSD: d_gcc_extension.c,v 1.3 2021/01/31 14:57:28 rillig Exp $ */
# 3 "d_gcc_extension.c"
/* extension */
-void a(void) {
- double __logbw = 1;
- if (__extension__(({ __typeof((__logbw)) x_ = (__logbw); !__builtin_isinf((x_)) && !__builtin_isnan((x_)); })))
- __logbw = 1;
+void
+a(void)
+{
+ double __logbw = 1;
+ if (__extension__(({
+ __typeof((__logbw)) x_ = (__logbw);
+ !__builtin_isinf((x_)) && !__builtin_isnan((x_));
+ })))
+ __logbw = 1;
}
Index: src/tests/usr.bin/xlint/lint1/d_gcc_func.c
diff -u src/tests/usr.bin/xlint/lint1/d_gcc_func.c:1.2 src/tests/usr.bin/xlint/lint1/d_gcc_func.c:1.3
--- src/tests/usr.bin/xlint/lint1/d_gcc_func.c:1.2 Sun Jan 31 14:39:31 2021
+++ src/tests/usr.bin/xlint/lint1/d_gcc_func.c Sun Jan 31 14:57:28 2021
@@ -1,10 +1,11 @@
-/* $NetBSD: d_gcc_func.c,v 1.2 2021/01/31 14:39:31 rillig Exp $ */
+/* $NetBSD: d_gcc_func.c,v 1.3 2021/01/31 14:57:28 rillig Exp $ */
# 3 "d_gcc_func.c"
/* gcc __FUNCTION__ */
void
-foo(const char *p) {
+foo(const char *p)
+{
p = __FUNCTION__;
foo(p);
}
Index: src/tests/usr.bin/xlint/lint1/d_gcc_variable_array_init.c
diff -u src/tests/usr.bin/xlint/lint1/d_gcc_variable_array_init.c:1.2 src/tests/usr.bin/xlint/lint1/d_gcc_variable_array_init.c:1.3
--- src/tests/usr.bin/xlint/lint1/d_gcc_variable_array_init.c:1.2 Sun Jan 31 14:39:31 2021
+++ src/tests/usr.bin/xlint/lint1/d_gcc_variable_array_init.c Sun Jan 31 14:57:28 2021
@@ -1,8 +1,9 @@
-/* $NetBSD: d_gcc_variable_array_init.c,v 1.2 2021/01/31 14:39:31 rillig Exp $ */
+/* $NetBSD: d_gcc_variable_array_init.c,v 1.3 2021/01/31 14:57:28 rillig Exp $ */
# 3 "d_gcc_variable_array_init.c"
/* gcc: variable array initializer */
-void foo(int i)
+void
+foo(int i)
{
int array[i];
while (i--)
Index: src/tests/usr.bin/xlint/lint1/d_nested_structs.c
diff -u src/tests/usr.bin/xlint/lint1/d_nested_structs.c:1.2 src/tests/usr.bin/xlint/lint1/d_nested_structs.c:1.3
--- src/tests/usr.bin/xlint/lint1/d_nested_structs.c:1.2 Sun Jan 31 14:39:31 2021
+++ src/tests/usr.bin/xlint/lint1/d_nested_structs.c Sun Jan 31 14:57:28 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: d_nested_structs.c,v 1.2 2021/01/31 14:39:31 rillig Exp $ */
+/* $NetBSD: d_nested_structs.c,v 1.3 2021/01/31 14:57:28 rillig Exp $ */
# 3 "d_nested_structs.c"
/* Nested struct */
@@ -6,8 +6,8 @@ typedef void *EditLine;
typedef void *History;
typedef struct {
- EditLine *el;
- History *hist;
+ EditLine *el;
+ History *hist;
} el_mode_t;
struct el_modes_s {
Index: src/tests/usr.bin/xlint/lint1/d_packed_structs.c
diff -u src/tests/usr.bin/xlint/lint1/d_packed_structs.c:1.2 src/tests/usr.bin/xlint/lint1/d_packed_structs.c:1.3
--- src/tests/usr.bin/xlint/lint1/d_packed_structs.c:1.2 Sun Jan 31 14:39:31 2021
+++ src/tests/usr.bin/xlint/lint1/d_packed_structs.c Sun Jan 31 14:57:28 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: d_packed_structs.c,v 1.2 2021/01/31 14:39:31 rillig Exp $ */
+/* $NetBSD: d_packed_structs.c,v 1.3 2021/01/31 14:57:28 rillig Exp $ */
# 3 "d_packed_structs.c"
/* packed tests */
@@ -6,19 +6,20 @@
struct in_addr {
int x;
};
-struct ip_timestamp {
+struct ip_timestamp {
char ipt_code;
char ipt_len;
char ipt_ptr;
- unsigned int ipt_flg:4,
- ipt_oflw:4;
+ unsigned int
+ ipt_flg: 4,
+ ipt_oflw: 4;
union ipt_timestamp {
- int ipt_time[1];
- struct ipt_ta {
+ int ipt_time[1];
+ struct ipt_ta {
struct in_addr ipt_addr;
int ipt_time;
- } ipt_ta[1] __packed;
- } ipt_timestamp __packed;
+ } ipt_ta[1]__packed;
+ } ipt_timestamp__packed;
} __packed;
typedef struct __packed {
Index: src/tests/usr.bin/xlint/lint1/d_shift_to_narrower_type.c
diff -u src/tests/usr.bin/xlint/lint1/d_shift_to_narrower_type.c:1.2 src/tests/usr.bin/xlint/lint1/d_shift_to_narrower_type.c:1.3
--- src/tests/usr.bin/xlint/lint1/d_shift_to_narrower_type.c:1.2 Sun Jan 31 14:39:31 2021
+++ src/tests/usr.bin/xlint/lint1/d_shift_to_narrower_type.c Sun Jan 31 14:57:28 2021
@@ -1,10 +1,11 @@
-/* $NetBSD: d_shift_to_narrower_type.c,v 1.2 2021/01/31 14:39:31 rillig Exp $ */
+/* $NetBSD: d_shift_to_narrower_type.c,v 1.3 2021/01/31 14:57:28 rillig Exp $ */
# 3 "d_shift_to_narrower_type.c"
// Test that type shifts that result to narrower types don't produce warnings.
void
-foo(void) {
+foo(void)
+{
unsigned long l = 100;
unsigned long long ll = 100;
unsigned int i = 100;
Index: src/tests/usr.bin/xlint/lint1/d_type_question_colon.c
diff -u src/tests/usr.bin/xlint/lint1/d_type_question_colon.c:1.2 src/tests/usr.bin/xlint/lint1/d_type_question_colon.c:1.3
--- src/tests/usr.bin/xlint/lint1/d_type_question_colon.c:1.2 Sun Jan 31 14:39:31 2021
+++ src/tests/usr.bin/xlint/lint1/d_type_question_colon.c Sun Jan 31 14:57:28 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: d_type_question_colon.c,v 1.2 2021/01/31 14:39:31 rillig Exp $ */
+/* $NetBSD: d_type_question_colon.c,v 1.3 2021/01/31 14:57:28 rillig Exp $ */
# 3 "d_type_question_colon.c"
/* the type of the ?: expression should be the more specific type */
@@ -8,7 +8,8 @@ struct foo {
};
void
-test(void) {
+test(void)
+{
int i;
struct foo *ptr = 0;
Index: src/tests/usr.bin/xlint/lint1/d_zero_sized_arrays.c
diff -u src/tests/usr.bin/xlint/lint1/d_zero_sized_arrays.c:1.2 src/tests/usr.bin/xlint/lint1/d_zero_sized_arrays.c:1.3
--- src/tests/usr.bin/xlint/lint1/d_zero_sized_arrays.c:1.2 Sun Jan 31 14:39:31 2021
+++ src/tests/usr.bin/xlint/lint1/d_zero_sized_arrays.c Sun Jan 31 14:57:28 2021
@@ -1,6 +1,6 @@
-/* $NetBSD: d_zero_sized_arrays.c,v 1.2 2021/01/31 14:39:31 rillig Exp $ */
+/* $NetBSD: d_zero_sized_arrays.c,v 1.3 2021/01/31 14:57:28 rillig Exp $ */
# 3 "d_zero_sized_arrays.c"
struct foo {
-int a[0];
+ int a[0];
};
Index: src/tests/usr.bin/xlint/lint1/d_c99_complex_split.c
diff -u src/tests/usr.bin/xlint/lint1/d_c99_complex_split.c:1.3 src/tests/usr.bin/xlint/lint1/d_c99_complex_split.c:1.4
--- src/tests/usr.bin/xlint/lint1/d_c99_complex_split.c:1.3 Sun Jan 31 14:39:31 2021
+++ src/tests/usr.bin/xlint/lint1/d_c99_complex_split.c Sun Jan 31 14:57:28 2021
@@ -1,11 +1,16 @@
-/* $NetBSD: d_c99_complex_split.c,v 1.3 2021/01/31 14:39:31 rillig Exp $ */
+/* $NetBSD: d_c99_complex_split.c,v 1.4 2021/01/31 14:57:28 rillig Exp $ */
# 3 "d_c99_complex_split.c"
-int b(double a) {
+int
+b(double a)
+{
return a == 0;
}
-void a(void) {
- double _Complex z = 0;
- if (b(__real__ z) && b(__imag__ z))
- return;
+
+void
+a(void)
+{
+ double _Complex z = 0;
+ if (b(__real__ z) && b(__imag__ z))
+ return;
}
Index: src/tests/usr.bin/xlint/lint1/d_c99_recursive_init.c
diff -u src/tests/usr.bin/xlint/lint1/d_c99_recursive_init.c:1.3 src/tests/usr.bin/xlint/lint1/d_c99_recursive_init.c:1.4
--- src/tests/usr.bin/xlint/lint1/d_c99_recursive_init.c:1.3 Sun Jan 31 14:39:31 2021
+++ src/tests/usr.bin/xlint/lint1/d_c99_recursive_init.c Sun Jan 31 14:57:28 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: d_c99_recursive_init.c,v 1.3 2021/01/31 14:39:31 rillig Exp $ */
+/* $NetBSD: d_c99_recursive_init.c,v 1.4 2021/01/31 14:57:28 rillig Exp $ */
# 3 "d_c99_recursive_init.c"
/* C99 recursive struct/union initialization */
@@ -8,9 +8,9 @@ struct top {
union onion {
short us;
char uc;
- } u;
+ } u;
char *s;
} c[] = {
- { .s = "foo", .c = 'b', .u = { .uc = 'c' } },
- { .i = 1, .c = 'a', .u = { .us = 2 } },
+ { .s = "foo", .c = 'b', .u = { .uc = 'c' }},
+ { .i = 1, .c = 'a', .u = { .us = 2 }},
};
Index: src/tests/usr.bin/xlint/lint1/d_c99_union_init3.c
diff -u src/tests/usr.bin/xlint/lint1/d_c99_union_init3.c:1.3 src/tests/usr.bin/xlint/lint1/d_c99_union_init3.c:1.4
--- src/tests/usr.bin/xlint/lint1/d_c99_union_init3.c:1.3 Sun Jan 31 14:39:31 2021
+++ src/tests/usr.bin/xlint/lint1/d_c99_union_init3.c Sun Jan 31 14:57:28 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: d_c99_union_init3.c,v 1.3 2021/01/31 14:39:31 rillig Exp $ */
+/* $NetBSD: d_c99_union_init3.c,v 1.4 2021/01/31 14:57:28 rillig Exp $ */
# 3 "d_c99_union_init3.c"
/* C99 union initialization */
@@ -6,6 +6,5 @@ struct {
int i[10];
char *s;
} c[] = {
- { { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 },
- "foo" },
+ {{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 }, "foo" },
};
Index: src/tests/usr.bin/xlint/lint1/d_cast_init.c
diff -u src/tests/usr.bin/xlint/lint1/d_cast_init.c:1.3 src/tests/usr.bin/xlint/lint1/d_cast_init.c:1.4
--- src/tests/usr.bin/xlint/lint1/d_cast_init.c:1.3 Sun Jan 31 14:39:31 2021
+++ src/tests/usr.bin/xlint/lint1/d_cast_init.c Sun Jan 31 14:57:28 2021
@@ -1,19 +1,19 @@
-/* $NetBSD: d_cast_init.c,v 1.3 2021/01/31 14:39:31 rillig Exp $ */
+/* $NetBSD: d_cast_init.c,v 1.4 2021/01/31 14:57:28 rillig Exp $ */
# 3 "d_cast_init.c"
/* cast initialization */
typedef unsigned char u_char;
-struct sockaddr_x25 {
- u_char x25_len;
- u_char x25_family;
- char x25_udata[4];
+struct sockaddr_x25 {
+ u_char x25_len;
+ u_char x25_family;
+ char x25_udata[4];
};
struct sockaddr_x25 x25_dgmask = {
- (unsigned char)(unsigned char)(unsigned int)(unsigned long)
- (&((( struct sockaddr_x25 *)0)->x25_udata[1])),
- 0,
- {-1, -1, -1, -1},
+ (unsigned char)(unsigned char)(unsigned int)(unsigned long)
+ (&(((struct sockaddr_x25 *)0)->x25_udata[1])),
+ 0,
+ { -1, -1, -1, -1 },
};
Index: src/tests/usr.bin/xlint/lint1/d_gcc_extension.exp
diff -u src/tests/usr.bin/xlint/lint1/d_gcc_extension.exp:1.4 src/tests/usr.bin/xlint/lint1/d_gcc_extension.exp:1.5
--- src/tests/usr.bin/xlint/lint1/d_gcc_extension.exp:1.4 Sun Jan 31 14:39:31 2021
+++ src/tests/usr.bin/xlint/lint1/d_gcc_extension.exp Sun Jan 31 14:57:28 2021
@@ -1,2 +1,2 @@
-d_gcc_extension.c(7): warning: argument #1 is converted from 'double' to 'long double' [259]
-d_gcc_extension.c(7): warning: argument #1 is converted from 'double' to 'long double' [259]
+d_gcc_extension.c(11): warning: argument #1 is converted from 'double' to 'long double' [259]
+d_gcc_extension.c(11): warning: argument #1 is converted from 'double' to 'long double' [259]
