diff options
| author | Brad King <brad.king@kitware.com> | 2012-01-04 16:54:51 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2012-01-04 16:54:51 (GMT) |
| commit | 65b6e19a35c1bde5ee3c132ade076ee5f42e6559 (patch) | |
| tree | b2257e4496e9b0acd00d412c907fb86a8cd9fc4b /Utilities/cmlibarchive/libarchive/archive_read.c | |
| parent | 9ccaeb10f9fd58503c8a7e1535f2c9154e3e8c93 (diff) | |
| download | CMake-65b6e19a35c1bde5ee3c132ade076ee5f42e6559.zip CMake-65b6e19a35c1bde5ee3c132ade076ee5f42e6559.tar.gz CMake-65b6e19a35c1bde5ee3c132ade076ee5f42e6559.tar.bz2 | |
libarchive: Avoid bogus conversion warning from PGI compiler
We cannot suppress PGI compiler warnings completely because even with
the "-w" flag the compiler still writes a message containing "compilation
completed with warnings" to stderr.
A warning is triggered by expressions like
test ? NULL : ptr_to_const_char
test ? ".." : ptr_to_const_char
that the PGI compiler handles incorrectly. It chooses the pointer type
of the first option (either void* or char*) and warns about conversion
of the second without a cast. Flip the expression logic to
!test ? ptr_to_const_char : NULL
!test ? ptr_to_const_char : ".."
to help the compiler choose the proper result type.
Diffstat (limited to 'Utilities/cmlibarchive/libarchive/archive_read.c')
| -rw-r--r-- | Utilities/cmlibarchive/libarchive/archive_read.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Utilities/cmlibarchive/libarchive/archive_read.c b/Utilities/cmlibarchive/libarchive/archive_read.c index 441be53..6d7f263 100644 --- a/Utilities/cmlibarchive/libarchive/archive_read.c +++ b/Utilities/cmlibarchive/libarchive/archive_read.c @@ -902,7 +902,7 @@ static const char * _archive_filter_name(struct archive *_a, int n) { struct archive_read_filter *f = get_filter(_a, n); - return f == NULL ? NULL : f->name; + return f != NULL ? f->name : NULL; } static int64_t |