aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/validation
diff options
authorLuc Van Oostenryck <luc.vanoostenryck@gmail.com>2019-02-17 18:18:52 +0100
committerLuc Van Oostenryck <luc.vanoostenryck@gmail.com>2019-02-17 18:18:52 +0100
commitec4bac31cf9f847feed879a191bc1f8fbd9577ee (patch)
treed5412baf37b2f2ebe380a8e83d3b9df20c773003 /validation
parentf21358ee7ee79202fc026c151ffd8c5221bbce22 (diff)
parentfa232154d6717107d2941498103f95e1e3ee4252 (diff)
downloadsparse-dev-ec4bac31cf9f847feed879a191bc1f8fbd9577ee.tar.gz
Merge branch 'branch-v0.6'
* explain cause of 'incorrect type in conditional' * manpage: fix doc of '-Wcast-from-as'
Diffstat (limited to 'validation')
-rw-r--r--validation/bad-type-twice0.c2
-rw-r--r--validation/conditional-type.c16
2 files changed, 9 insertions, 9 deletions
diff --git a/validation/bad-type-twice0.c b/validation/bad-type-twice0.c
index 7a9073c5..5d107a62 100644
--- a/validation/bad-type-twice0.c
+++ b/validation/bad-type-twice0.c
@@ -7,7 +7,7 @@ static int foo(a)
* check-name: bad-type-twice0
*
* check-error-start
-bad-type-twice0.c:3:16: error: incorrect type in conditional
+bad-type-twice0.c:3:16: error: incorrect type in conditional (non-scalar type)
bad-type-twice0.c:3:16: got incomplete type a
* check-error-end
*/
diff --git a/validation/conditional-type.c b/validation/conditional-type.c
index a14c05ec..91267212 100644
--- a/validation/conditional-type.c
+++ b/validation/conditional-type.c
@@ -79,21 +79,21 @@ static int good_if_ptr(void *ptr)
* check-name: conditional-type
*
* check-error-start
-conditional-type.c:18:18: error: incorrect type in conditional
+conditional-type.c:18:18: error: incorrect type in conditional (non-scalar type)
conditional-type.c:18:18: got void
-conditional-type.c:19:13: error: incorrect type in conditional
+conditional-type.c:19:13: error: incorrect type in conditional (non-scalar type)
conditional-type.c:19:13: got struct state s
-conditional-type.c:24:18: error: incorrect type in conditional
+conditional-type.c:24:18: error: incorrect type in conditional (non-scalar type)
conditional-type.c:24:18: got void
-conditional-type.c:29:21: error: incorrect type in conditional
+conditional-type.c:29:21: error: incorrect type in conditional (non-scalar type)
conditional-type.c:29:21: got void
-conditional-type.c:30:16: error: incorrect type in conditional
+conditional-type.c:30:16: error: incorrect type in conditional (non-scalar type)
conditional-type.c:30:16: got struct state s
-conditional-type.c:34:21: error: incorrect type in conditional
+conditional-type.c:34:21: error: incorrect type in conditional (non-scalar type)
conditional-type.c:34:21: got void
-conditional-type.c:36:20: error: incorrect type in conditional
+conditional-type.c:36:20: error: incorrect type in conditional (non-scalar type)
conditional-type.c:36:20: got void
-conditional-type.c:40:21: error: incorrect type in conditional
+conditional-type.c:40:21: error: incorrect type in conditional (non-scalar type)
conditional-type.c:40:21: got void
* check-error-end
*/