Merge branch 'branch-v0.6'

* explain cause of 'incorrect type in conditional'
* manpage: fix doc of '-Wcast-from-as'

4 files changed, 11 insertions, 11 deletions

diff --git a/evaluate.c b/evaluate.c
index 947b121f..e4d6b737 100644
--- a/evaluate.c
+++ b/evaluate.c
@@ -910,7 +910,7 @@ static struct symbol *evaluate_conditional(struct expression *expr, int iterator
 		if (Waddress)
 			warning(expr->pos, "the address of %s will always evaluate as true", "an array");
 	} else if (!is_scalar_type(ctype)) {
-		sparse_error(expr->pos, "incorrect type in conditional");
+		sparse_error(expr->pos, "incorrect type in conditional (non-scalar type)");
 		info(expr->pos, "   got %s", show_typename(ctype));
 		return NULL;
 	}
diff --git a/sparse.1 b/sparse.1
index 91cd975e..fae6196b 100644
--- a/sparse.1
+++ b/sparse.1
@@ -85,7 +85,7 @@ Sparse does not issue these warnings by default.
 .
 .TP
 .B \-Wcast\-from\-as
-Warn about which remove an address space to a pointer type.
+Warn about casts which remove an address space from a pointer type.
 
 This is similar to \fB\-Waddress\-space\fR but will also warn
 on casts to \fBunsigned long\fR.
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
  */