[Cmake-commits] CMake branch, next, updated. v2.8.7-1960-g2544436

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  2544436687e1742125b450255eedc09e92a46549 (commit)
       via  65b6e19a35c1bde5ee3c132ade076ee5f42e6559 (commit)
      from  e0783d4af294866a2e35c255c8af769878fcf6ac (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2544436687e1742125b450255eedc09e92a46549
commit 2544436687e1742125b450255eedc09e92a46549
Merge: e0783d4 65b6e19
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 4 11:59:21 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 4 11:59:21 2012 -0500

    Merge topic 'update-libarchive' into next
    
    65b6e19 libarchive: Avoid bogus conversion warning from PGI compiler


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=65b6e19a35c1bde5ee3c132ade076ee5f42e6559
commit 65b6e19a35c1bde5ee3c132ade076ee5f42e6559
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 4 11:54:51 2012 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jan 4 11:54:51 2012 -0500

    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.

diff --git a/Utilities/cmlibarchive/libarchive/archive_options.c b/Utilities/cmlibarchive/libarchive/archive_options.c
index 962572c..79b4ffb 100644
--- a/Utilities/cmlibarchive/libarchive/archive_options.c
+++ b/Utilities/cmlibarchive/libarchive/archive_options.c
@@ -41,9 +41,9 @@ _archive_set_option(struct archive *a,
 
 	archive_check_magic(a, magic, ARCHIVE_STATE_NEW, fn);
 
-	mp = m != NULL && m[0] == '\0' ? NULL : m;
-	op = o != NULL && o[0] == '\0' ? NULL : o;
-	vp = v != NULL && v[0] == '\0' ? NULL : v;
+	mp = m != NULL && m[0] != '\0' ? m : NULL;
+	op = o != NULL && o[0] != '\0' ? o : NULL;
+	vp = v != NULL && v[0] != '\0' ? v : NULL;
 
 	if (op == NULL && vp == NULL)
 		return (ARCHIVE_OK);
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
diff --git a/Utilities/cmlibarchive/libarchive/archive_read_support_format_7zip.c b/Utilities/cmlibarchive/libarchive/archive_read_support_format_7zip.c
index 756f08d..3a12405 100644
--- a/Utilities/cmlibarchive/libarchive/archive_read_support_format_7zip.c
+++ b/Utilities/cmlibarchive/libarchive/archive_read_support_format_7zip.c
@@ -1095,7 +1095,7 @@ init_decompression(struct archive_read *a, struct _7zip *zip,
 			}
 			archive_set_error(&a->archive, err,
 			    "Internal error initializing decompressor: %s",
-			    detail == NULL ? "??" : detail);
+			    detail != NULL ? detail : "??");
 			zip->bzstream_valid = 0;
 			return (ARCHIVE_FAILED);
 		}
diff --git a/Utilities/cmlibarchive/libarchive/archive_write.c b/Utilities/cmlibarchive/libarchive/archive_write.c
index c742d60..b4b3867 100644
--- a/Utilities/cmlibarchive/libarchive/archive_write.c
+++ b/Utilities/cmlibarchive/libarchive/archive_write.c
@@ -698,7 +698,7 @@ static const char *
 _archive_filter_name(struct archive *_a, int n)
 {
 	struct archive_write_filter *f = filter_lookup(_a, n);
-	return f == NULL ? NULL : f->name;
+	return f != NULL ? f->name : NULL;
 }
 
 static int64_t

-----------------------------------------------------------------------

Summary of changes:
 .../cmlibarchive/libarchive/archive_options.c      |    6 +++---
 Utilities/cmlibarchive/libarchive/archive_read.c   |    2 +-
 .../libarchive/archive_read_support_format_7zip.c  |    2 +-
 Utilities/cmlibarchive/libarchive/archive_write.c  |    2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake