diff options
author | Luc Van Oostenryck <luc.vanoostenryck@gmail.com> | 2019-02-17 18:18:52 +0100 |
---|---|---|
committer | Luc Van Oostenryck <luc.vanoostenryck@gmail.com> | 2019-02-17 18:18:52 +0100 |
commit | ec4bac31cf9f847feed879a191bc1f8fbd9577ee (patch) | |
tree | d5412baf37b2f2ebe380a8e83d3b9df20c773003 | |
parent | f21358ee7ee79202fc026c151ffd8c5221bbce22 (diff) | |
parent | fa232154d6717107d2941498103f95e1e3ee4252 (diff) | |
download | sparse-ec4bac31cf9f847feed879a191bc1f8fbd9577ee.tar.gz |
Merge branch 'branch-v0.6'
* explain cause of 'incorrect type in conditional'
* manpage: fix doc of '-Wcast-from-as'
-rw-r--r-- | evaluate.c | 2 | ||||
-rw-r--r-- | sparse.1 | 2 | ||||
-rw-r--r-- | validation/bad-type-twice0.c | 2 | ||||
-rw-r--r-- | validation/conditional-type.c | 16 |
4 files changed, 11 insertions, 11 deletions
@@ -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; } @@ -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 */ |