diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2009-11-12 15:17:55 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2009-11-12 15:17:55 (GMT) |
| commit | bd60a2469a358a49162c2b1a078a377f7223da71 (patch) | |
| tree | f59a9a4f516f7f9373d1e3b4826930991e52c56f | |
| parent | d91d04a47abeb952a5d399e1152708048380987e (diff) | |
| download | CMake-bd60a2469a358a49162c2b1a078a377f7223da71.zip CMake-bd60a2469a358a49162c2b1a078a377f7223da71.tar.gz CMake-bd60a2469a358a49162c2b1a078a377f7223da71.tar.bz2 | |
remove the last of the windows W4 warnings
| -rw-r--r-- | Utilities/cmlibarchive/libarchive/archive_write_disk_set_standard_lookup.c | 3 | ||||
| -rw-r--r-- | Utilities/cmlibarchive/libarchive/archive_write_set_compression_bzip2.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Utilities/cmlibarchive/libarchive/archive_write_disk_set_standard_lookup.c b/Utilities/cmlibarchive/libarchive/archive_write_disk_set_standard_lookup.c index 97828f6..2849b9f 100644 --- a/Utilities/cmlibarchive/libarchive/archive_write_disk_set_standard_lookup.c +++ b/Utilities/cmlibarchive/libarchive/archive_write_disk_set_standard_lookup.c @@ -237,7 +237,8 @@ hash(const char *p) unsigned g, h = 0; while (*p != '\0') { h = ( h << 4 ) + *p++; - if (( g = h & 0xF0000000 )) { + g = h & 0xF0000000; + if (g) { h ^= g >> 24; h &= 0x0FFFFFFF; } diff --git a/Utilities/cmlibarchive/libarchive/archive_write_set_compression_bzip2.c b/Utilities/cmlibarchive/libarchive/archive_write_set_compression_bzip2.c index a617daf..ec5ff42 100644 --- a/Utilities/cmlibarchive/libarchive/archive_write_set_compression_bzip2.c +++ b/Utilities/cmlibarchive/libarchive/archive_write_set_compression_bzip2.c @@ -284,7 +284,8 @@ archive_compressor_bzip2_finish(struct archive_write *a) } /* Finish compression cycle. */ - if ((ret = drive_compressor(a, state, 1))) + ret = drive_compressor(a, state, 1); + if (ret) goto cleanup; /* Optionally, pad the final compressed block. */ |