[Cmake-commits] [cmake-commits] hoffman committed archive_write_disk_set_standard_lookup.c 1.5 1.6 archive_write_set_compression_bzip2.c 1.1 1.2

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Utilities/cmlibarchive/libarchive
In directory public:/mounts/ram/cvs-serv27052/libarchive

Modified Files:
	archive_write_disk_set_standard_lookup.c 
	archive_write_set_compression_bzip2.c 
Log Message:
remove the last of the windows W4 warnings


Index: archive_write_disk_set_standard_lookup.c
===================================================================
RCS file: /cvsroot/CMake/CMake/Utilities/cmlibarchive/libarchive/archive_write_disk_set_standard_lookup.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C 2 -d -r1.5 -r1.6
*** archive_write_disk_set_standard_lookup.c	6 Nov 2009 15:54:25 -0000	1.5
--- archive_write_disk_set_standard_lookup.c	12 Nov 2009 15:17:52 -0000	1.6
***************
*** 238,242 ****
      while (*p != '\0') {
          h = ( h << 4 ) + *p++;
!         if (( g = h & 0xF0000000 )) {
              h ^= g >> 24;
              h &= 0x0FFFFFFF;
--- 238,243 ----
      while (*p != '\0') {
          h = ( h << 4 ) + *p++;
!         g = h & 0xF0000000;
!         if (g) {
              h ^= g >> 24;
              h &= 0x0FFFFFFF;

Index: archive_write_set_compression_bzip2.c
===================================================================
RCS file: /cvsroot/CMake/CMake/Utilities/cmlibarchive/libarchive/archive_write_set_compression_bzip2.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** archive_write_set_compression_bzip2.c	30 Oct 2009 17:10:00 -0000	1.1
--- archive_write_set_compression_bzip2.c	12 Nov 2009 15:17:55 -0000	1.2
***************
*** 285,289 ****
  
          /* Finish compression cycle. */
!         if ((ret = drive_compressor(a, state, 1)))
              goto cleanup;
  
--- 285,290 ----
  
          /* Finish compression cycle. */
!         ret = drive_compressor(a, state, 1);
!         if (ret)
              goto cleanup;