Update the validation check for ftabstop=

The ftabstop patch output different position for
the same error. Update all test case accordingly.

Signed-off-by: Christopher Li <sparse@chrisli.org>

15 files changed, 55 insertions, 55 deletions

diff --git a/validation/address_space.c b/validation/address_space.c
index 2d06be7..c55b78d 100644
--- a/validation/address_space.c
+++ b/validation/address_space.c
@@ -10,8 +10,8 @@ static int sys_do_stuff(void __user *user_addr)
  * check-name: address_space attribute
  *
  * check-error-start
-address_space.c:7:21: warning: incorrect type in argument 1 (different address spaces)
-address_space.c:7:21:    expected void *addr
-address_space.c:7:21:    got void <asn:1>*user_addr
+address_space.c:7:28: warning: incorrect type in argument 1 (different address spaces)
+address_space.c:7:28:    expected void *addr
+address_space.c:7:28:    got void <asn:1>*user_addr
  * check-error-end
  */
diff --git a/validation/bad-array-designated-initializer.c b/validation/bad-array-designated-initializer.c
index cde0785..fb7d91f 100644
--- a/validation/bad-array-designated-initializer.c
+++ b/validation/bad-array-designated-initializer.c
@@ -6,8 +6,8 @@ static int a[] = {
  * check-name: Bad array designated initializer
  *
  * check-error-start
-bad-array-designated-initializer.c:3:3: error: Expected constant expression
-bad-array-designated-initializer.c:3:3: error: Expected } at end of initializer
-bad-array-designated-initializer.c:3:3: error: got \
+bad-array-designated-initializer.c:3:10: error: Expected constant expression
+bad-array-designated-initializer.c:3:10: error: Expected } at end of initializer
+bad-array-designated-initializer.c:3:10: error: got \
  * check-error-end
  */
diff --git a/validation/bad-assignment.c b/validation/bad-assignment.c
index 327f7da..71938db 100644
--- a/validation/bad-assignment.c
+++ b/validation/bad-assignment.c
@@ -8,7 +8,7 @@ static int foo(int a)
  * check-name: bad assignment
  *
  * check-error-start
-bad-assignment.c:3:6: error: Expected ; at end of statement
-bad-assignment.c:3:6: error: got \
+bad-assignment.c:3:13: error: Expected ; at end of statement
+bad-assignment.c:3:13: error: got \
  * check-error-end
  */
diff --git a/validation/bad-cast.c b/validation/bad-cast.c
index 4eb4a8e..bf577e0 100644
--- a/validation/bad-cast.c
+++ b/validation/bad-cast.c
@@ -8,8 +8,8 @@ static int foo(int a)
  * check-name: Bad cast syntax
  *
  * check-error-start
-bad-cast.c:5:16: error: expected declaration
-bad-cast.c:5:16: error: Expected ) at end of cast operator
-bad-cast.c:5:16: error: got /
+bad-cast.c:5:23: error: expected declaration
+bad-cast.c:5:23: error: Expected ) at end of cast operator
+bad-cast.c:5:23: error: got /
  * check-error-end
  */
diff --git a/validation/bad-ternary-cond.c b/validation/bad-ternary-cond.c
index d5944e9..e3d07b5 100644
--- a/validation/bad-ternary-cond.c
+++ b/validation/bad-ternary-cond.c
@@ -6,7 +6,7 @@ static int foo(int a)
  * check-name: Bad ternary syntax
  * check-description: Once caused Sparse to segfault
  * check-error-start
-bad-ternary-cond.c:3:12: error: Expected : in conditional expression
-bad-ternary-cond.c:3:12: error: got ?
+bad-ternary-cond.c:3:19: error: Expected : in conditional expression
+bad-ternary-cond.c:3:19: error: got ?
  * check-error-end
  */
diff --git a/validation/badtype4.c b/validation/badtype4.c
index 978c5bd..7421ba4 100644
--- a/validation/badtype4.c
+++ b/validation/badtype4.c
@@ -9,7 +9,7 @@ void a(void)
  * check-name: switch(bad_type) {...} segfault
  *
  * check-error-start
-badtype4.c:3:9: error: undefined identifier 'x'
-badtype4.c:4:7: error: incompatible types for 'case' statement
+badtype4.c:3:16: error: undefined identifier 'x'
+badtype4.c:4:14: error: incompatible types for 'case' statement
  * check-error-end
  */
diff --git a/validation/check_byte_count-ice.c b/validation/check_byte_count-ice.c
index 93f0dc7..58b98ce 100644
--- a/validation/check_byte_count-ice.c
+++ b/validation/check_byte_count-ice.c
@@ -8,7 +8,7 @@ static void foo(void *a)
  * check-name: Segfault in check_byte_count after syntax error
  *
  * check-error-start
-check_byte_count-ice.c:5:18: error: Bad character constant
-check_byte_count-ice.c:5:8: error: not enough arguments for function memset
+check_byte_count-ice.c:5:25: error: Bad character constant
+check_byte_count-ice.c:5:15: error: not enough arguments for function memset
  * check-error-end
  */
diff --git a/validation/cond_expr.c b/validation/cond_expr.c
index 4a64f45..e55711c 100644
--- a/validation/cond_expr.c
+++ b/validation/cond_expr.c
@@ -13,7 +13,7 @@ int a(void)
  * check-name: Two-argument conditional expression types
  *
  * check-error-start
-cond_expr.c:10:9: error: incompatible types for operation (~)
-cond_expr.c:10:9:    argument has type double
+cond_expr.c:10:16: error: incompatible types for operation (~)
+cond_expr.c:10:16:    argument has type double
  * check-error-end
  */
diff --git a/validation/cond_expr2.c b/validation/cond_expr2.c
index 174f2d1..5e974cf 100644
--- a/validation/cond_expr2.c
+++ b/validation/cond_expr2.c
@@ -12,11 +12,11 @@ static void f(void)
  * check-description: Used to miss qualifier mixing and mishandle void *
  *
  * check-error-start
-cond_expr2.c:6:4: warning: incorrect type in assignment (different modifiers)
-cond_expr2.c:6:4:    expected void volatile *extern [addressable] [toplevel] q
-cond_expr2.c:6:4:    got void const volatile *
-cond_expr2.c:8:4: warning: incorrect type in assignment (different modifiers)
-cond_expr2.c:8:4:    expected int volatile *extern [addressable] [toplevel] [assigned] r
-cond_expr2.c:8:4:    got int const volatile *
+cond_expr2.c:6:11: warning: incorrect type in assignment (different modifiers)
+cond_expr2.c:6:11:    expected void volatile *extern [addressable] [toplevel] q
+cond_expr2.c:6:11:    got void const volatile *
+cond_expr2.c:8:11: warning: incorrect type in assignment (different modifiers)
+cond_expr2.c:8:11:    expected int volatile *extern [addressable] [toplevel] [assigned] r
+cond_expr2.c:8:11:    got int const volatile *
  * check-error-end
  */
diff --git a/validation/context.c b/validation/context.c
index 4b15e75..33b70b8 100644
--- a/validation/context.c
+++ b/validation/context.c
@@ -325,9 +325,9 @@ context.c:88:13: warning: context imbalance in 'warn_unlock1' - unexpected unloc
 context.c:93:13: warning: context imbalance in 'warn_unlock2' - unexpected unlock
 context.c:131:12: warning: context imbalance in 'warn_if1' - wrong count at exit
 context.c:140:12: warning: context imbalance in 'warn_if2' - different lock contexts for basic block
-context.c:202:2: warning: context imbalance in 'warn_while1' - different lock contexts for basic block
-context.c:210:3: warning: context imbalance in 'warn_while2' - unexpected unlock
-context.c:216:2: warning: context imbalance in 'warn_while3' - wrong count at exit
+context.c:202:9: warning: context imbalance in 'warn_while1' - different lock contexts for basic block
+context.c:210:17: warning: context imbalance in 'warn_while2' - unexpected unlock
+context.c:216:9: warning: context imbalance in 'warn_while3' - wrong count at exit
 context.c:274:13: warning: context imbalance in 'warn_goto1' - wrong count at exit
 context.c:283:13: warning: context imbalance in 'warn_goto2' - wrong count at exit
 context.c:300:5: warning: context imbalance in 'warn_goto3' - different lock contexts for basic block
diff --git a/validation/declaration-after-statement-ansi.c b/validation/declaration-after-statement-ansi.c
index 333410b..22635cf 100644
--- a/validation/declaration-after-statement-ansi.c
+++ b/validation/declaration-after-statement-ansi.c
@@ -7,6 +7,6 @@ static void func (int i)
  * check-name: declaration after statement (ANSI)
  * check-command: sparse -ansi $file
  * check-error-start
-declaration-after-statement-ansi.c:4:2: warning: mixing declarations and code
+declaration-after-statement-ansi.c:4:9: warning: mixing declarations and code
  * check-error-end
  */
diff --git a/validation/declaration-after-statement-c89.c b/validation/declaration-after-statement-c89.c
index 78632cd..886f971 100644
--- a/validation/declaration-after-statement-c89.c
+++ b/validation/declaration-after-statement-c89.c
@@ -7,6 +7,6 @@ static void func (int i)
  * check-name: declaration after statement (C89)
  * check-command: sparse -std=c89 $file
  * check-error-start
-declaration-after-statement-c89.c:4:2: warning: mixing declarations and code
+declaration-after-statement-c89.c:4:9: warning: mixing declarations and code
  * check-error-end
  */
diff --git a/validation/initializer-entry-defined-twice.c b/validation/initializer-entry-defined-twice.c
index 33891e8..968e3dd 100644
--- a/validation/initializer-entry-defined-twice.c
+++ b/validation/initializer-entry-defined-twice.c
@@ -45,9 +45,9 @@ static struct same_offset not_an_error = {
  * check-name: Initializer entry defined twice
  *
  * check-error-start
-initializer-entry-defined-twice.c:10:3: warning: Initializer entry defined twice
-initializer-entry-defined-twice.c:11:3:   also defined here
-initializer-entry-defined-twice.c:26:4: warning: Initializer entry defined twice
-initializer-entry-defined-twice.c:27:4:   also defined here
+initializer-entry-defined-twice.c:10:10: warning: Initializer entry defined twice
+initializer-entry-defined-twice.c:11:10:   also defined here
+initializer-entry-defined-twice.c:26:18: warning: Initializer entry defined twice
+initializer-entry-defined-twice.c:27:18:   also defined here
  * check-error-end
  */
diff --git a/validation/noderef.c b/validation/noderef.c
index a95bc8c..8c89f60 100644
--- a/validation/noderef.c
+++ b/validation/noderef.c
@@ -44,8 +44,8 @@ static void h(void)
  * check-name: noderef attribute
  *
  * check-error-start
-noderef.c:24:5: warning: incorrect type in assignment (different modifiers)
-noderef.c:24:5:    expected char *[noderef] *q2
-noderef.c:24:5:    got char [noderef] **<noident>
+noderef.c:24:12: warning: incorrect type in assignment (different modifiers)
+noderef.c:24:12:    expected char *[noderef] *q2
+noderef.c:24:12:    got char [noderef] **<noident>
  * check-error-end
  */
diff --git a/validation/typesign.c b/validation/typesign.c
index a3dfc09..e5dc525 100644
--- a/validation/typesign.c
+++ b/validation/typesign.c
@@ -39,23 +39,23 @@ static signed int * u_to_s_assign(unsigned int *up)
  * check-command: sparse -Wtypesign $file
  *
  * check-error-start
-typesign.c:3:9: warning: incorrect type in return expression (different signedness)
-typesign.c:3:9:    expected unsigned int *
-typesign.c:3:9:    got signed int *sp
-typesign.c:8:9: warning: incorrect type in return expression (different signedness)
-typesign.c:8:9:    expected signed int *
-typesign.c:8:9:    got unsigned int *up
-typesign.c:13:21: warning: incorrect type in initializer (different signedness)
-typesign.c:13:21:    expected unsigned int *up
-typesign.c:13:21:    got signed int *sp
-typesign.c:19:19: warning: incorrect type in initializer (different signedness)
-typesign.c:19:19:    expected signed int *sp
-typesign.c:19:19:    got unsigned int *up
-typesign.c:26:5: warning: incorrect type in assignment (different signedness)
-typesign.c:26:5:    expected unsigned int *up
-typesign.c:26:5:    got signed int *sp
-typesign.c:33:5: warning: incorrect type in assignment (different signedness)
-typesign.c:33:5:    expected signed int *sp
-typesign.c:33:5:    got unsigned int *up
+typesign.c:3:16: warning: incorrect type in return expression (different signedness)
+typesign.c:3:16:    expected unsigned int *
+typesign.c:3:16:    got signed int *sp
+typesign.c:8:16: warning: incorrect type in return expression (different signedness)
+typesign.c:8:16:    expected signed int *
+typesign.c:8:16:    got unsigned int *up
+typesign.c:13:28: warning: incorrect type in initializer (different signedness)
+typesign.c:13:28:    expected unsigned int *up
+typesign.c:13:28:    got signed int *sp
+typesign.c:19:26: warning: incorrect type in initializer (different signedness)
+typesign.c:19:26:    expected signed int *sp
+typesign.c:19:26:    got unsigned int *up
+typesign.c:26:12: warning: incorrect type in assignment (different signedness)
+typesign.c:26:12:    expected unsigned int *up
+typesign.c:26:12:    got signed int *sp
+typesign.c:33:12: warning: incorrect type in assignment (different signedness)
+typesign.c:33:12:    expected signed int *sp
+typesign.c:33:12:    got unsigned int *up
  * check-error-end
  */