Module Name: src
Committed By: rillig
Date: Sat Jan 16 12:57:37 UTC 2021
Modified Files:
src/tests/usr.bin/xlint/lint1: d_c99_anon_struct.c
d_c99_recursive_init.c d_c99_struct_init.c d_c99_union_init1.c
d_c99_union_init2.c d_c99_union_init3.c d_c99_union_init4.c
d_cast_init.c d_typefun.c msg_330.c
Log Message:
lint: normalize whitespace in tests
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/xlint/lint1/d_c99_anon_struct.c \
src/tests/usr.bin/xlint/lint1/d_c99_recursive_init.c \
src/tests/usr.bin/xlint/lint1/d_c99_struct_init.c \
src/tests/usr.bin/xlint/lint1/d_c99_union_init1.c \
src/tests/usr.bin/xlint/lint1/d_c99_union_init2.c \
src/tests/usr.bin/xlint/lint1/d_c99_union_init3.c \
src/tests/usr.bin/xlint/lint1/d_c99_union_init4.c \
src/tests/usr.bin/xlint/lint1/d_cast_init.c \
src/tests/usr.bin/xlint/lint1/d_typefun.c \
src/tests/usr.bin/xlint/lint1/msg_330.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/xlint/lint1/d_c99_anon_struct.c
diff -u src/tests/usr.bin/xlint/lint1/d_c99_anon_struct.c:1.1 src/tests/usr.bin/xlint/lint1/d_c99_anon_struct.c:1.2
--- src/tests/usr.bin/xlint/lint1/d_c99_anon_struct.c:1.1 Wed Oct 14 16:32:55 2015
+++ src/tests/usr.bin/xlint/lint1/d_c99_anon_struct.c Sat Jan 16 12:57:37 2021
@@ -23,4 +23,3 @@ main(void)
b.top_left.x = 1;
return 0;
}
-
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.1 src/tests/usr.bin/xlint/lint1/d_c99_recursive_init.c:1.2
--- src/tests/usr.bin/xlint/lint1/d_c99_recursive_init.c:1.1 Sat Mar 17 16:33:15 2012
+++ src/tests/usr.bin/xlint/lint1/d_c99_recursive_init.c Sat Jan 16 12:57:37 2021
@@ -7,7 +7,7 @@ struct top {
char uc;
} u;
char *s;
-} c[] = {
+} c[] = {
{ .s = "foo", .c = 'b', .u = { .uc = 'c' } },
{ .i = 1, .c = 'a', .u = { .us = 2 } },
};
Index: src/tests/usr.bin/xlint/lint1/d_c99_struct_init.c
diff -u src/tests/usr.bin/xlint/lint1/d_c99_struct_init.c:1.1 src/tests/usr.bin/xlint/lint1/d_c99_struct_init.c:1.2
--- src/tests/usr.bin/xlint/lint1/d_c99_struct_init.c:1.1 Sat Mar 17 16:33:15 2012
+++ src/tests/usr.bin/xlint/lint1/d_c99_struct_init.c Sat Jan 16 12:57:37 2021
@@ -2,7 +2,7 @@
struct {
int i;
char *s;
-} c[] = {
+} c[] = {
{ .i = 2, },
{ .s = "foo" },
{ .i = 1, .s = "bar" },
Index: src/tests/usr.bin/xlint/lint1/d_c99_union_init1.c
diff -u src/tests/usr.bin/xlint/lint1/d_c99_union_init1.c:1.1 src/tests/usr.bin/xlint/lint1/d_c99_union_init1.c:1.2
--- src/tests/usr.bin/xlint/lint1/d_c99_union_init1.c:1.1 Sat Mar 17 16:33:15 2012
+++ src/tests/usr.bin/xlint/lint1/d_c99_union_init1.c Sat Jan 16 12:57:37 2021
@@ -2,7 +2,7 @@
union {
int i;
char *s;
-} c[] = {
+} c[] = {
{ i: 1 },
{ s: "foo" }
};
Index: src/tests/usr.bin/xlint/lint1/d_c99_union_init2.c
diff -u src/tests/usr.bin/xlint/lint1/d_c99_union_init2.c:1.1 src/tests/usr.bin/xlint/lint1/d_c99_union_init2.c:1.2
--- src/tests/usr.bin/xlint/lint1/d_c99_union_init2.c:1.1 Sat Mar 17 16:33:15 2012
+++ src/tests/usr.bin/xlint/lint1/d_c99_union_init2.c Sat Jan 16 12:57:37 2021
@@ -2,7 +2,7 @@
union {
int i[10];
short s;
-} c[] = {
+} c[] = {
{ s: 2 },
{ i: { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 } },
};
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.1 src/tests/usr.bin/xlint/lint1/d_c99_union_init3.c:1.2
--- src/tests/usr.bin/xlint/lint1/d_c99_union_init3.c:1.1 Sat Mar 17 16:33:15 2012
+++ src/tests/usr.bin/xlint/lint1/d_c99_union_init3.c Sat Jan 16 12:57:37 2021
@@ -2,7 +2,7 @@
struct {
int i[10];
char *s;
-} c[] = {
+} c[] = {
{ { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 },
"foo" },
};
Index: src/tests/usr.bin/xlint/lint1/d_c99_union_init4.c
diff -u src/tests/usr.bin/xlint/lint1/d_c99_union_init4.c:1.1 src/tests/usr.bin/xlint/lint1/d_c99_union_init4.c:1.2
--- src/tests/usr.bin/xlint/lint1/d_c99_union_init4.c:1.1 Tue Jul 28 18:05:19 2015
+++ src/tests/usr.bin/xlint/lint1/d_c99_union_init4.c Sat Jan 16 12:57:37 2021
@@ -1,15 +1,15 @@
/* test .data.l[x] */
typedef struct {
- int type;
- union {
- char b[20];
- short s[10];
- long l[5];
+ int type;
+ union {
+ char b[20];
+ short s[10];
+ long l[5];
} data;
} foo;
foo bar = {
- .type = 3,
- .data.l[0] = 4
+ .type = 3,
+ .data.l[0] = 4
};
Index: src/tests/usr.bin/xlint/lint1/d_cast_init.c
diff -u src/tests/usr.bin/xlint/lint1/d_cast_init.c:1.1 src/tests/usr.bin/xlint/lint1/d_cast_init.c:1.2
--- src/tests/usr.bin/xlint/lint1/d_cast_init.c:1.1 Sat Mar 17 16:33:15 2012
+++ src/tests/usr.bin/xlint/lint1/d_cast_init.c Sat Jan 16 12:57:37 2021
@@ -1,27 +1,16 @@
/* cast initialization */
+
typedef unsigned char u_char;
-typedef unsigned int size_t;
+
struct sockaddr_x25 {
u_char x25_len;
- u_char x25_family;
- short x25_net;
- char x25_addr[16];
- struct x25opts {
- char op_flags;
- char op_psize;
- char op_wsize;
- char op_speed;
- } x25_opts;
- short x25_udlen;
- char x25_udata[16];
+ 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,
- 0,
- {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1},
- {0, 0, 0, 0},
- -1,
- {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -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_typefun.c
diff -u src/tests/usr.bin/xlint/lint1/d_typefun.c:1.1 src/tests/usr.bin/xlint/lint1/d_typefun.c:1.2
--- src/tests/usr.bin/xlint/lint1/d_typefun.c:1.1 Fri Apr 3 21:37:26 2015
+++ src/tests/usr.bin/xlint/lint1/d_typefun.c Sat Jan 16 12:57:37 2021
@@ -1,22 +1,27 @@
/* typedef of function parameter */
-typedef void (*free_func) (void * opaque, void* address);
-typedef struct stack_st
-{
- int num;
- char **data;
- int sorted;
+typedef void (*free_func)(void *opaque, void *address);
- int num_alloc;
- int (*comp)(const void *, const void *);
+typedef struct stack_st {
+ int num;
+ char **data;
+ int sorted;
+
+ int num_alloc;
+ int (*comp)(const void *, const void *);
} _STACK; /* Use STACK_OF(...) instead */
typedef void *OPENSSL_BLOCK;
-struct stack_st_OPENSSL_BLOCK { _STACK stack; };
-typedef void *d2i_of_void(void **,const unsigned char **,long); typedef int i2d_of_void(void *,unsigned char **);
+struct stack_st_OPENSSL_BLOCK {
+ _STACK stack;
+};
+
+typedef void *d2i_of_void(void **, const unsigned char **, long);
+typedef int i2d_of_void(void *, unsigned char **);
-struct stack_st_OPENSSL_BLOCK *d2i_ASN1_SET(struct stack_st_OPENSSL_BLOCK **a,
- const unsigned char **pp,
- long length, d2i_of_void *d2i,
- void (*free_func)(OPENSSL_BLOCK), int ex_tag,
- int ex_class);
+struct stack_st_OPENSSL_BLOCK *
+d2i_ASN1_SET(struct stack_st_OPENSSL_BLOCK **a,
+ const unsigned char **pp,
+ long length, d2i_of_void *d2i,
+ void (*free_func)(OPENSSL_BLOCK), int ex_tag,
+ int ex_class);
Index: src/tests/usr.bin/xlint/lint1/msg_330.c
diff -u src/tests/usr.bin/xlint/lint1/msg_330.c:1.1 src/tests/usr.bin/xlint/lint1/msg_330.c:1.2
--- src/tests/usr.bin/xlint/lint1/msg_330.c:1.1 Thu Jan 14 22:18:14 2021
+++ src/tests/usr.bin/xlint/lint1/msg_330.c Sat Jan 16 12:57:37 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: msg_330.c,v 1.1 2021/01/14 22:18:14 rillig Exp $ */
+/* $NetBSD: msg_330.c,v 1.2 2021/01/16 12:57:37 rillig Exp $ */
# 3 "msg_330.c"
// Test for message: operand of '%s' must be bool, not '%s' [330]
@@ -17,6 +17,6 @@ void
example(bool b, char c, int i)
{
called(!b);
- called(!c); /* expect: 330 */
- called(!i); /* expect: 330 */
+ called(!c); /* expect: 330 */
+ called(!i); /* expect: 330 */
}
