Module Name: src
Committed By: rillig
Date: Tue Aug 24 23:38:51 UTC 2021
Modified Files:
src/tests/usr.bin/xlint/lint2: emit.exp-ln emit.ln emit_lp64.exp-ln
emit_lp64.ln msg_000.ln msg_001.ln msg_002.ln msg_003.ln msg_004.ln
msg_005.ln msg_006.ln msg_008.ln msg_009.ln msg_010.ln msg_011.ln
msg_012.ln read.ln read_lp64.ln read_printf.ln
Log Message:
tests/lint: normalize whitespace in lint2 tests
Found a typo in read.ln, f124, which had just 'F' instead of the
intended 'F0'. Other than that, only whitespace changes.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/xlint/lint2/emit.exp-ln \
src/tests/usr.bin/xlint/lint2/emit.ln \
src/tests/usr.bin/xlint/lint2/emit_lp64.exp-ln \
src/tests/usr.bin/xlint/lint2/emit_lp64.ln \
src/tests/usr.bin/xlint/lint2/msg_000.ln \
src/tests/usr.bin/xlint/lint2/read.ln \
src/tests/usr.bin/xlint/lint2/read_lp64.ln
cvs rdiff -u -r1.3 -r1.4 src/tests/usr.bin/xlint/lint2/msg_001.ln
cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/xlint/lint2/msg_002.ln \
src/tests/usr.bin/xlint/lint2/msg_003.ln \
src/tests/usr.bin/xlint/lint2/msg_004.ln \
src/tests/usr.bin/xlint/lint2/msg_005.ln \
src/tests/usr.bin/xlint/lint2/msg_006.ln \
src/tests/usr.bin/xlint/lint2/msg_008.ln \
src/tests/usr.bin/xlint/lint2/msg_009.ln \
src/tests/usr.bin/xlint/lint2/msg_010.ln \
src/tests/usr.bin/xlint/lint2/msg_011.ln \
src/tests/usr.bin/xlint/lint2/msg_012.ln \
src/tests/usr.bin/xlint/lint2/read_printf.ln
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/lint2/emit.exp-ln
diff -u src/tests/usr.bin/xlint/lint2/emit.exp-ln:1.1 src/tests/usr.bin/xlint/lint2/emit.exp-ln:1.2
--- src/tests/usr.bin/xlint/lint2/emit.exp-ln:1.1 Tue Aug 24 21:30:52 2021
+++ src/tests/usr.bin/xlint/lint2/emit.exp-ln Tue Aug 24 23:38:51 2021
@@ -1,7 +1,7 @@
-# $NetBSD: emit.exp-ln,v 1.1 2021/08/24 21:30:52 rillig Exp $
+# $NetBSD: emit.exp-ln,v 1.2 2021/08/24 23:38:51 rillig Exp $
S llib-lemit.ln
-0s llib-lemit.ln
+0 s llib-lemit.ln
# Normally, it does not matter in which filename a particular symbol is
# defined. Only in cases where a file defines an anonymous tag type (struct,
Index: src/tests/usr.bin/xlint/lint2/emit.ln
diff -u src/tests/usr.bin/xlint/lint2/emit.ln:1.1 src/tests/usr.bin/xlint/lint2/emit.ln:1.2
--- src/tests/usr.bin/xlint/lint2/emit.ln:1.1 Tue Aug 24 21:30:52 2021
+++ src/tests/usr.bin/xlint/lint2/emit.ln Tue Aug 24 23:38:51 2021
@@ -1,9 +1,9 @@
-# $NetBSD: emit.ln,v 1.1 2021/08/24 21:30:52 rillig Exp $
+# $NetBSD: emit.ln,v 1.2 2021/08/24 23:38:51 rillig Exp $
#
# Test emitting a lint library file.
# Extracted from ../lint1/emit.exp-ln.
-0s emit.c
+0 s emit.c
S emit.c
# Global variables that are declared using 'extern' are not part of a
@@ -23,17 +23,17 @@ S emit.c
# library's interface, therefore they are omitted from the output.
121 d 0.121 e 30return_void_unknown_parameters F V
122 d 0.122 e 38return_implicit_int_unknown_parameters F I
-125 d 0.125 e 32extern_return_void_no_parameters F 0 V
+125 d 0.125 e 32extern_return_void_no_parameters F0 V
# Function calls are not part of a library's interface, therefore they are
# omitted from the output.
-161 c 0.161 s2 "%" i 9my_printf f2 PcC PC V
+161 c 0.161 s2"%" i 9my_printf f2 PcC PC V
# Function definitions are copied to the output.
159 d 0.159 d 14cover_outqchar F0 V
# Taken from ../lint1/expr_promote.exp-ln.
-0s expr_promote.c
+0 s expr_promote.c
S expr_promote.c
10 d 0.10 e 4sink F2 PcC E V
Index: src/tests/usr.bin/xlint/lint2/emit_lp64.exp-ln
diff -u src/tests/usr.bin/xlint/lint2/emit_lp64.exp-ln:1.1 src/tests/usr.bin/xlint/lint2/emit_lp64.exp-ln:1.2
--- src/tests/usr.bin/xlint/lint2/emit_lp64.exp-ln:1.1 Tue Aug 24 21:30:52 2021
+++ src/tests/usr.bin/xlint/lint2/emit_lp64.exp-ln Tue Aug 24 23:38:51 2021
@@ -1,7 +1,7 @@
-# $NetBSD: emit_lp64.exp-ln,v 1.1 2021/08/24 21:30:52 rillig Exp $
+# $NetBSD: emit_lp64.exp-ln,v 1.2 2021/08/24 23:38:51 rillig Exp $
S llib-lemit_lp64.ln
-0s llib-lemit_lp64.ln
+0 s llib-lemit_lp64.ln
0 d 0.0 du 16uint128_function F0 uJ
0 d 0.0 tu 15int128_variable J
Index: src/tests/usr.bin/xlint/lint2/emit_lp64.ln
diff -u src/tests/usr.bin/xlint/lint2/emit_lp64.ln:1.1 src/tests/usr.bin/xlint/lint2/emit_lp64.ln:1.2
--- src/tests/usr.bin/xlint/lint2/emit_lp64.ln:1.1 Tue Aug 24 21:30:52 2021
+++ src/tests/usr.bin/xlint/lint2/emit_lp64.ln Tue Aug 24 23:38:51 2021
@@ -1,11 +1,11 @@
-# $NetBSD: emit_lp64.ln,v 1.1 2021/08/24 21:30:52 rillig Exp $
+# $NetBSD: emit_lp64.ln,v 1.2 2021/08/24 23:38:51 rillig Exp $
#
# Test emitting a lint library file on an LP64 platform.
-0s first-file.c
+0 s first-file.c
S first-file.c
10 d 0.10 t 15int128_variable J
-0s second-file.c
+0 s second-file.c
S second-file.c
20 d 0.20 d 16uint128_function F0 uJ
Index: src/tests/usr.bin/xlint/lint2/msg_000.ln
diff -u src/tests/usr.bin/xlint/lint2/msg_000.ln:1.1 src/tests/usr.bin/xlint/lint2/msg_000.ln:1.2
--- src/tests/usr.bin/xlint/lint2/msg_000.ln:1.1 Thu Aug 5 22:36:08 2021
+++ src/tests/usr.bin/xlint/lint2/msg_000.ln Tue Aug 24 23:38:51 2021
@@ -1,14 +1,14 @@
-# $NetBSD: msg_000.ln,v 1.1 2021/08/05 22:36:08 rillig Exp $
+# $NetBSD: msg_000.ln,v 1.2 2021/08/24 23:38:51 rillig Exp $
#
# Test data for message 0 of lint2:
# %s used( %s ), but not defined
#
# Define file number 0.
-0smsg_000.c
+0 s msg_000.c
# Define the main file of the translation unit.
-Smsg_000.c
+S msg_000.c
# Have a function that is used but not defined, and a function that is defined
# but not used, generated by this code:
@@ -28,7 +28,7 @@ Smsg_000.c
# 'I' the first argument has type 'int'
# 'D' the first argument has type 'double'
# 'I' the return type of the function is (implicitly) 'int'
-3c0.3p1i16used_not_definedf2IDI
+3 c 0.3 p1 i 16used_not_defined f2 I D I
#
# The function definition in line 2 generates this entry:
# '2' logical line 2 in the main .c source
@@ -39,4 +39,4 @@ Smsg_000.c
# '16...' the name of the defined function
# 'f0' it's a function with 0 arguments
# 'I' the return type of the function is (implicitly) 'int'
-2d0.2do16defined_not_usedf0I
+2 d 0.2 d o 16defined_not_used f0 I
Index: src/tests/usr.bin/xlint/lint2/read.ln
diff -u src/tests/usr.bin/xlint/lint2/read.ln:1.1 src/tests/usr.bin/xlint/lint2/read.ln:1.2
--- src/tests/usr.bin/xlint/lint2/read.ln:1.1 Sat Aug 7 21:24:14 2021
+++ src/tests/usr.bin/xlint/lint2/read.ln Tue Aug 24 23:38:51 2021
@@ -1,9 +1,9 @@
-# $NetBSD: read.ln,v 1.1 2021/08/07 21:24:14 rillig Exp $
+# $NetBSD: read.ln,v 1.2 2021/08/24 23:38:51 rillig Exp $
#
# Cover each path of reading declarations, definitions and usages.
-0sread.c
-Sread.c
+0 s read.c
+S read.c
# Cover all tspec_t constants, in declaration order.
#
@@ -13,52 +13,52 @@ Sread.c
# NOTSPEC cannot occur in lint1 output.
# SIGNED cannot occur in lint1 output.
# UNSIGN cannot occur in lint1 output.
-103d0.103e4f103F0B # BOOL _Bool f103(void);
-104d0.104e4f104F0C # CHAR char f104(void);
-105d0.105e4f105F0sC # SCHAR signed char f105(void);
-106d0.106e4f106F0uC # UCHAR unsigned char f106(void);
-107d0.107e4f107F0S # SHORT short f107(void);
-108d0.108e4f108F0uS # USHORT unsigned short f108(void);
-109d0.109e4f109F0I # INT int f109(void);
-110d0.110e4f110F0uI # UINT unsigned int f110(void);
-111d0.111e4f111F0L # LONG long f111(void);
-112d0.112e4f112F0uL # ULONG unsigned long f112(void);
-113d0.113e4f113F0Q # QUAD long long f113(void);
-114d0.114e4f114F0uQ # UQUAD unsigned long long f114(void);
+103 d 0.103 e 4f103 F0 B # BOOL _Bool f103(void);
+104 d 0.104 e 4f104 F0 C # CHAR char f104(void);
+105 d 0.105 e 4f105 F0 sC # SCHAR signed char f105(void);
+106 d 0.106 e 4f106 F0 uC # UCHAR unsigned char f106(void);
+107 d 0.107 e 4f107 F0 S # SHORT short f107(void);
+108 d 0.108 e 4f108 F0 uS # USHORT unsigned short f108(void);
+109 d 0.109 e 4f109 F0 I # INT int f109(void);
+110 d 0.110 e 4f110 F0 uI # UINT unsigned int f110(void);
+111 d 0.111 e 4f111 F0 L # LONG long f111(void);
+112 d 0.112 e 4f112 F0 uL # ULONG unsigned long f112(void);
+113 d 0.113 e 4f113 F0 Q # QUAD long long f113(void);
+114 d 0.114 e 4f114 F0 uQ # UQUAD unsigned long long f114(void);
# INT128 works only in 64-bit mode, see read_lp64.
# UINT128 works only in 64-bit mode, see read_lp64.
-117d0.117e4f117F0sD # FLOAT float f117(void);
-118d0.118e4f118F0D # DOUBLE double f118(void);
-119d0.119e4f119F0lD # LDOUBLE long double f119(void);
-120d0.120e4f120F0V # VOID void f120(void);
-121d0.121e4f121F0sT16tag121 # STRUCT struct tag121 f121(void);
-122d0.122e4f122F0uT16tag122 # UNION union tag122 f122(void);
-123d0.123e4f123F0eT16tag123 # ENUM enum tag123 f123(void);
-124d0.124e4f124FPV # PTR void * f124(void);
-125d0.125e4a125A7D # ARRAY extern double a125[7];
-126d0.126e4f126F0PF1DV # FUNC void (*f126(void))(double);
+117 d 0.117 e 4f117 F0 sD # FLOAT float f117(void);
+118 d 0.118 e 4f118 F0 D # DOUBLE double f118(void);
+119 d 0.119 e 4f119 F0 lD # LDOUBLE long double f119(void);
+120 d 0.120 e 4f120 F0 V # VOID void f120(void);
+121 d 0.121 e 4f121 F0 sT16tag121 # STRUCT struct tag121 f121(void);
+122 d 0.122 e 4f122 F0 uT16tag122 # UNION union tag122 f122(void);
+123 d 0.123 e 4f123 F0 eT16tag123 # ENUM enum tag123 f123(void);
+124 d 0.124 e 4f124 F0 PV # PTR void * f124(void);
+125 d 0.125 e 4a125 A7D # ARRAY extern double a125[7];
+126 d 0.126 e 4f126 F0 PF1DV # FUNC void (*f126(void))(double);
# COMPLEX cannot occur in lint1 output.
-127d0.127e4f127F0sX # FCOMPLEX float _Complex f127(void);
-128d0.128e4f128F0X # COMPLEX double _Complex f128(void);
-129d0.129e4f129F0lX # LCOMPLEX long double _Complex f129(void);
+127 d 0.127 e 4f127 F0 sX # FCOMPLEX float _Complex f127(void);
+128 d 0.128 e 4f128 F0 X # COMPLEX double _Complex f128(void);
+129 d 0.129 e 4f129 F0 lX # LCOMPLEX long double _Complex f129(void);
# Tagged types (struct, union, enum) can have tags or typedefs or be
# anonymous, but anonymous types are not usually used in external
# declarations.
#
# struct s_tag f201(void);
-201d0.201e4f201F0sT15s_tag
+201 d 0.201 e 4f201 F0 sT15s_tag
# typedef struct {} s_def;
# s_def f202(void);
-202d0.202e4f202F0sT25s_def
+202 d 0.202 e 4f202 F0 sT25s_def
# struct { int member; } f203(void);
-203d0.203e4f203F0sT3203.0.0
+203 d 0.203 e 4f203 F0 sT3203.0.0
# Type qualifiers
#
# void f301(const int *);
-301d0.301e4f301F1PcIV
+301 d 0.301 e 4f301 F1 PcI V
# void f302(volatile int *);
-302d0.302e4f302F1PvIV
+302 d 0.302 e 4f302 F1 PvI V
# void f302(const volatile int *);
-303d0.303e4f303F1PcvIV
+303 d 0.303 e 4f303 F1 PcvI V
Index: src/tests/usr.bin/xlint/lint2/read_lp64.ln
diff -u src/tests/usr.bin/xlint/lint2/read_lp64.ln:1.1 src/tests/usr.bin/xlint/lint2/read_lp64.ln:1.2
--- src/tests/usr.bin/xlint/lint2/read_lp64.ln:1.1 Sat Aug 7 23:52:32 2021
+++ src/tests/usr.bin/xlint/lint2/read_lp64.ln Tue Aug 24 23:38:51 2021
@@ -1,10 +1,10 @@
-# $NetBSD: read_lp64.ln,v 1.1 2021/08/07 23:52:32 rillig Exp $
+# $NetBSD: read_lp64.ln,v 1.2 2021/08/24 23:38:51 rillig Exp $
#
# Cover reading of 128-bit integer types.
# These types are only available on 64-bit platforms.
-0sread_lp64.c
-Sread_lp64.c
+0 s read_lp64.c
+S read_lp64.c
-115d0.115e4f115F0J # INT128
-116d0.116e4f116F0uJ # UINT128
+115 d 0.115 e 4f115 F0 J # INT128
+116 d 0.116 e 4f116 F0 uJ # UINT128
Index: src/tests/usr.bin/xlint/lint2/msg_001.ln
diff -u src/tests/usr.bin/xlint/lint2/msg_001.ln:1.3 src/tests/usr.bin/xlint/lint2/msg_001.ln:1.4
--- src/tests/usr.bin/xlint/lint2/msg_001.ln:1.3 Sat Aug 7 19:07:03 2021
+++ src/tests/usr.bin/xlint/lint2/msg_001.ln Tue Aug 24 23:38:51 2021
@@ -1,25 +1,25 @@
-# $NetBSD: msg_001.ln,v 1.3 2021/08/07 19:07:03 rillig Exp $
+# $NetBSD: msg_001.ln,v 1.4 2021/08/24 23:38:51 rillig Exp $
#
# Test data for message 1 of lint2:
# %s defined( %s ), but never used
#
-0smsg_001.c
-Smsg_001.c
+0 s msg_001.c
+S msg_001.c
-3c0.3p1i16used_not_definedf2IDI
-2d0.2do16defined_not_usedf0I
+3 c 0.3 p1 i 16used_not_defined f2 I D I
+2 d 0.2 d o 16defined_not_used f0 I
# The function 'main' always counts as used.
# int main(void) {}
-10d0.10d4mainF0I
+10 d 0.10 d 4main F0 I
# extern main() {}
-12d0.12e4mainFI
+12 d 0.12 e 4main F I
# If a function is declared once in old style and once with prototype,
# the prototype definition is preferred; see chkname.
#
# extern merge_old_style_and_prototype();
-20d0.20e29merge_old_style_and_prototypeFI
+20 d 0.20 e 29merge_old_style_and_prototype F I
# extern int merge_old_style_and_prototype(char *);
-21d0.21e29merge_old_style_and_prototypeF1PCI
+21 d 0.21 e 29merge_old_style_and_prototype F1 PCI
Index: src/tests/usr.bin/xlint/lint2/msg_002.ln
diff -u src/tests/usr.bin/xlint/lint2/msg_002.ln:1.2 src/tests/usr.bin/xlint/lint2/msg_002.ln:1.3
--- src/tests/usr.bin/xlint/lint2/msg_002.ln:1.2 Fri Aug 6 16:21:00 2021
+++ src/tests/usr.bin/xlint/lint2/msg_002.ln Tue Aug 24 23:38:51 2021
@@ -1,14 +1,14 @@
-# $NetBSD: msg_002.ln,v 1.2 2021/08/06 16:21:00 rillig Exp $
+# $NetBSD: msg_002.ln,v 1.3 2021/08/24 23:38:51 rillig Exp $
#
# Test data for message 2 of lint2:
# %s declared( %s ), but never used or defined
#
-0smsg_002.c
-Smsg_002.c
+0 s msg_002.c
+S msg_002.c
# extern int only_declared;
-2d0.2e13only_declaredI
+2 d 0.2 e 13only_declared I
# int defined;
-3d0.3t7definedI
+3 d 0.3 t 7defined I
Index: src/tests/usr.bin/xlint/lint2/msg_003.ln
diff -u src/tests/usr.bin/xlint/lint2/msg_003.ln:1.2 src/tests/usr.bin/xlint/lint2/msg_003.ln:1.3
--- src/tests/usr.bin/xlint/lint2/msg_003.ln:1.2 Sat Aug 7 19:07:03 2021
+++ src/tests/usr.bin/xlint/lint2/msg_003.ln Tue Aug 24 23:38:51 2021
@@ -1,14 +1,14 @@
-# $NetBSD: msg_003.ln,v 1.2 2021/08/07 19:07:03 rillig Exp $
+# $NetBSD: msg_003.ln,v 1.3 2021/08/24 23:38:51 rillig Exp $
#
# Test data for message 3 of lint2:
# %s multiply defined %s :: %s
-0smsg_003_a.c
-Smsg_003_a.c
+0 s msg_003_a.c
+S msg_003_a.c
# msg_003_a.c:10: int function(void);
-10d0.10d8functionF0I
+10 d 0.10 d 8function F0 I
-0smsg_003_b.c
-Smsg_003_b.c
+0 s msg_003_b.c
+S msg_003_b.c
# msg_003_b.c:10: int function(void);
-10d0.10d8functionF0I
+10 d 0.10 d 8function F0 I
Index: src/tests/usr.bin/xlint/lint2/msg_004.ln
diff -u src/tests/usr.bin/xlint/lint2/msg_004.ln:1.2 src/tests/usr.bin/xlint/lint2/msg_004.ln:1.3
--- src/tests/usr.bin/xlint/lint2/msg_004.ln:1.2 Sat Aug 7 19:07:03 2021
+++ src/tests/usr.bin/xlint/lint2/msg_004.ln Tue Aug 24 23:38:51 2021
@@ -1,17 +1,17 @@
-# $NetBSD: msg_004.ln,v 1.2 2021/08/07 19:07:03 rillig Exp $
+# $NetBSD: msg_004.ln,v 1.3 2021/08/24 23:38:51 rillig Exp $
#
# Test data for message 4 of lint2:
# %s value used inconsistently %s :: %s
# msg_004_define.c:2: double add(double a, double b) { return a + b; }
-0smsg_004_define.c
-Smsg_004_define.c
-2d0.2dr3addF2DDD
+0 s msg_004_define.c
+S msg_004_define.c
+2 d 0.2 d r 3add F2 D D D
# msg_004_call.c:2: int add(int, int);
# msg_004_call.c:4: int main(void) { return add(2, 3); }
-0smsg_004_call.c
-Smsg_004_call.c
-2d0.2e3addF2III
-4c0.4p1p2u3addf2III
-4d0.4dr4mainF0I
+0 s msg_004_call.c
+S msg_004_call.c
+2 d 0.2 e 3add F2 I I I
+4 c 0.4 p1 p2 u 3add f2 I I I
+4 d 0.4 d r 4main F0 I
Index: src/tests/usr.bin/xlint/lint2/msg_005.ln
diff -u src/tests/usr.bin/xlint/lint2/msg_005.ln:1.2 src/tests/usr.bin/xlint/lint2/msg_005.ln:1.3
--- src/tests/usr.bin/xlint/lint2/msg_005.ln:1.2 Sat Aug 7 19:07:03 2021
+++ src/tests/usr.bin/xlint/lint2/msg_005.ln Tue Aug 24 23:38:51 2021
@@ -1,17 +1,17 @@
-# $NetBSD: msg_005.ln,v 1.2 2021/08/07 19:07:03 rillig Exp $
+# $NetBSD: msg_005.ln,v 1.3 2021/08/24 23:38:51 rillig Exp $
#
# Test data for message 5 of lint2:
# %s value declared inconsistently (%s != %s) %s :: %s
# msg_005_define.c:2: double add(double a, double b) { return a + b; }
-0smsg_005_define.c
-Smsg_005_define.c
-2d0.2dr3addF2DDD
+0 s msg_005_define.c
+S msg_005_define.c
+2 d 0.2 d r 3add F2 D D D
# msg_005_call.c:2: int add(int, int);
# msg_005_call.c:4: int main(void) { return add(2, 3); }
-0smsg_005_call.c
-Smsg_005_call.c
-2d0.2e3addF2III
-4c0.4p1p2u3addf2III
-4d0.4dr4mainF0I
+0 s msg_005_call.c
+S msg_005_call.c
+2 d 0.2 e 3add F2 I I I
+4 c 0.4 p1 p2 u 3add f2 I I I
+4 d 0.4 d r 4main F0 I
Index: src/tests/usr.bin/xlint/lint2/msg_006.ln
diff -u src/tests/usr.bin/xlint/lint2/msg_006.ln:1.2 src/tests/usr.bin/xlint/lint2/msg_006.ln:1.3
--- src/tests/usr.bin/xlint/lint2/msg_006.ln:1.2 Sat Aug 7 19:07:03 2021
+++ src/tests/usr.bin/xlint/lint2/msg_006.ln Tue Aug 24 23:38:51 2021
@@ -1,17 +1,17 @@
-# $NetBSD: msg_006.ln,v 1.2 2021/08/07 19:07:03 rillig Exp $
+# $NetBSD: msg_006.ln,v 1.3 2021/08/24 23:38:51 rillig Exp $
#
# Test data for message 6 of lint2:
# %s, arg %d used inconsistently %s[%s] :: %s[%s]
# msg_006_define.c:2: double add(double a, double b) { return a + b; }
-0smsg_006_define.c
-Smsg_006_define.c
-2d0.2dr3addF2DDD
+0 s msg_006_define.c
+S msg_006_define.c
+2 d 0.2 d r 3add F2 D D D
# msg_006_call.c:2: int add(int, int);
# msg_006_call.c:4: int main(void) { return add(2, 3); }
-0smsg_006_call.c
-Smsg_006_call.c
-2d0.2e3addF2III
-4c0.4p1p2u3addf2III
-4d0.4dr4mainF0I
+0 s msg_006_call.c
+S msg_006_call.c
+2 d 0.2 e 3add F2 I I I
+4 c 0.4 p1 p2 u 3add f2 I I I
+4 d 0.4 d r 4main F0 I
Index: src/tests/usr.bin/xlint/lint2/msg_008.ln
diff -u src/tests/usr.bin/xlint/lint2/msg_008.ln:1.2 src/tests/usr.bin/xlint/lint2/msg_008.ln:1.3
--- src/tests/usr.bin/xlint/lint2/msg_008.ln:1.2 Sat Aug 14 14:25:51 2021
+++ src/tests/usr.bin/xlint/lint2/msg_008.ln Tue Aug 24 23:38:51 2021
@@ -1,11 +1,11 @@
-# $NetBSD: msg_008.ln,v 1.2 2021/08/14 14:25:51 rillig Exp $
+# $NetBSD: msg_008.ln,v 1.3 2021/08/24 23:38:51 rillig Exp $
#
# Test data for message 8 of lint2:
# %s returns value which is always ignored
#
-0smsg_008.c
-Smsg_008.c
+0 s msg_008.c
+S msg_008.c
# 100: bool func(void) { return true }
100 d 0.100 drs 4func F0 B
Index: src/tests/usr.bin/xlint/lint2/msg_009.ln
diff -u src/tests/usr.bin/xlint/lint2/msg_009.ln:1.2 src/tests/usr.bin/xlint/lint2/msg_009.ln:1.3
--- src/tests/usr.bin/xlint/lint2/msg_009.ln:1.2 Sat Aug 14 14:25:51 2021
+++ src/tests/usr.bin/xlint/lint2/msg_009.ln Tue Aug 24 23:38:51 2021
@@ -1,11 +1,11 @@
-# $NetBSD: msg_009.ln,v 1.2 2021/08/14 14:25:51 rillig Exp $
+# $NetBSD: msg_009.ln,v 1.3 2021/08/24 23:38:51 rillig Exp $
#
# Test data for message 9 of lint2:
# %s returns value which is sometimes ignored
#
-0smsg_009.c
-Smsg_009.c
+0 s msg_009.c
+S msg_009.c
# 100: bool func(void) { return true }
100 d 0.100 drs 4func F0 B
Index: src/tests/usr.bin/xlint/lint2/msg_010.ln
diff -u src/tests/usr.bin/xlint/lint2/msg_010.ln:1.2 src/tests/usr.bin/xlint/lint2/msg_010.ln:1.3
--- src/tests/usr.bin/xlint/lint2/msg_010.ln:1.2 Sat Aug 14 14:25:51 2021
+++ src/tests/usr.bin/xlint/lint2/msg_010.ln Tue Aug 24 23:38:51 2021
@@ -1,4 +1,4 @@
-# $NetBSD: msg_010.ln,v 1.2 2021/08/14 14:25:51 rillig Exp $
+# $NetBSD: msg_010.ln,v 1.3 2021/08/24 23:38:51 rillig Exp $
#
# Test data for message 10 of lint2:
# %s value is used( %s ), but none returned
@@ -14,4 +14,4 @@ S msg_010.c
# msg_010_use.c:20: func();
20 d 1.20 e 4func F I
# msg_010_use.c:30: use() { return func(); }
-30 c 1.30 u 4func f 0 I
+30 c 1.30 u 4func f0 I
Index: src/tests/usr.bin/xlint/lint2/msg_011.ln
diff -u src/tests/usr.bin/xlint/lint2/msg_011.ln:1.2 src/tests/usr.bin/xlint/lint2/msg_011.ln:1.3
--- src/tests/usr.bin/xlint/lint2/msg_011.ln:1.2 Sat Aug 7 19:07:03 2021
+++ src/tests/usr.bin/xlint/lint2/msg_011.ln Tue Aug 24 23:38:51 2021
@@ -1,17 +1,17 @@
-# $NetBSD: msg_011.ln,v 1.2 2021/08/07 19:07:03 rillig Exp $
+# $NetBSD: msg_011.ln,v 1.3 2021/08/24 23:38:51 rillig Exp $
#
# Test data for message 11 of lint2:
# %s, arg %d declared inconsistently (%s != %s) %s :: %s
# msg_011_define.c:2: double add(double a, double b) { return a + b; }
-0smsg_011_define.c
-Smsg_011_define.c
-2d0.2dr3addF2DDD
+0 s msg_011_define.c
+S msg_011_define.c
+2 d 0.2 d r 3add F2 D D D
# msg_011_call.c:2: int add(int, int);
# msg_011_call.c:4: int main(void) { return add(2, 3); }
-0smsg_011_call.c
-Smsg_011_call.c
-2d0.2e3addF2III
-4c0.4p1p2u3addf2III
-4d0.4dr4mainF0I
+0 s msg_011_call.c
+S msg_011_call.c
+2 d 0.2 e 3add F2 I I I
+4 c 0.4 p1 p2 u 3add f2 I I I
+4 d 0.4 d r 4main F0 I
Index: src/tests/usr.bin/xlint/lint2/msg_012.ln
diff -u src/tests/usr.bin/xlint/lint2/msg_012.ln:1.2 src/tests/usr.bin/xlint/lint2/msg_012.ln:1.3
--- src/tests/usr.bin/xlint/lint2/msg_012.ln:1.2 Sat Aug 7 19:07:03 2021
+++ src/tests/usr.bin/xlint/lint2/msg_012.ln Tue Aug 24 23:38:51 2021
@@ -1,14 +1,14 @@
-# $NetBSD: msg_012.ln,v 1.2 2021/08/07 19:07:03 rillig Exp $
+# $NetBSD: msg_012.ln,v 1.3 2021/08/24 23:38:51 rillig Exp $
#
# Test data for message 12 of lint2:
# %s: variable # of args declared %s :: %s
# msg_012_a.c:2: int add(int, int);
-0smsg_012_a.c
-Smsg_012_a.c
-2d0.2e3addF2III
+0 s msg_012_a.c
+S msg_012_a.c
+2 d 0.2 e 3add F2 I I I
# msg_012_b.c:2: int add(int, int, int);
-0smsg_012_b.c
-Smsg_012_b.c
-2d0.2e3addF3IIII
+0 s msg_012_b.c
+S msg_012_b.c
+2 d 0.2 e 3add F3 I I I I
Index: src/tests/usr.bin/xlint/lint2/read_printf.ln
diff -u src/tests/usr.bin/xlint/lint2/read_printf.ln:1.2 src/tests/usr.bin/xlint/lint2/read_printf.ln:1.3
--- src/tests/usr.bin/xlint/lint2/read_printf.ln:1.2 Sun Aug 8 11:07:19 2021
+++ src/tests/usr.bin/xlint/lint2/read_printf.ln Tue Aug 24 23:38:51 2021
@@ -1,14 +1,14 @@
-# $NetBSD: read_printf.ln,v 1.2 2021/08/08 11:07:19 rillig Exp $
+# $NetBSD: read_printf.ln,v 1.3 2021/08/24 23:38:51 rillig Exp $
#
# Test reading of declarations and usage of printf-like functions.
# void my_printf(const char *, ...);
-0sprintf-def.c
-Sprintf-def.c
-3d0.3d9my_printfF2PcCEV
+0 s printf-def.c
+S printf-def.c
+3 d 0.3 d 9my_printf F2 PcC E V
-0sprintf-use.c
-Sprintf-use.c
+0 s printf-use.c
+S printf-use.c
# my_printf("string %s", "string %s%%%3d");
#
@@ -20,22 +20,22 @@ Sprintf-use.c
# takes place. Since it is still the address of a string, its value is
# analyzed for printf format specifiers. This is unnecessary though since in
# this example, the format string is already in argument 1, but not 2.
-11c0.11 s2"%s%%%3d" i 9my_printf f2 PcC PC V
+11 c 0.11 s2"%s%%%3d" i 9my_printf f2 PcC PC V
# my_printf("int %d", 12345);
#
# Argument 2 is a positive integer.
-12c0.12 p2 i 9my_printf f2 PcC I V
+12 c 0.12 p2 i 9my_printf f2 PcC I V
# my_printf("%s %d %p", "\t", -6, (const void *)0);
#
# Argument 2 is a string without any printf-like format specifiers.
# Argument 3 is a negative integer.
# Argument 4 has no further interesting properties.
-13c0.13 s2"" n3 i 9my_printf f4 PcC PC I PcV V
+13 c 0.13 s2"" n3 i 9my_printf f4 PcC PC I PcV V
# See tests/lint1/emit.c, function cover_outqchar.
-161c0.161 s2"%" i 9my_printf f2 PcC PC V
-162c0.162 s2"%s"i 9my_printf f2 PcC PC V
-163c0.163 s2"%%" i 9my_printf f2 PcC PC V
-164c0.164 s2"%\a%\b%\f%\n%\r%\t%\v%\177" i 9my_printf f2 PcC PC V
+161 c 0.161 s2"%" i 9my_printf f2 PcC PC V
+162 c 0.162 s2"%s"i 9my_printf f2 PcC PC V
+163 c 0.163 s2"%%" i 9my_printf f2 PcC PC V
+164 c 0.164 s2"%\a%\b%\f%\n%\r%\t%\v%\177" i 9my_printf f2 PcC PC V
