Fix Xcode 11.4 analyze error (#4863)

paulb777 · web-flow · commit cb6f5329479e · 2020-02-07T17:20:35.000-08:00
diff --git a/GoogleDataTransportCCTSupport/CHANGELOG.md b/GoogleDataTransportCCTSupport/CHANGELOG.md
@@ -1,5 +1,6 @@
 # v1.4.1
 - Fixed a bug that would manifest if a proto ended up being > 16,320 bytes.
+- Fix an Xcode 11.4 analyze error. (#4863)
 
 # v1.4.0
 - Added the CSH backend and consolidated the CCT, FLL, and CSH backends.
diff --git a/GoogleDataTransportCCTSupport/GDTCCTLibrary/GDTCCTCompressionHelper.m b/GoogleDataTransportCCTSupport/GDTCCTLibrary/GDTCCTCompressionHelper.m
@@ -45,8 +45,7 @@ + (nullable NSData *)gzippedData:(NSData *)data {
   int windowBits = 15 + 16;  // Enable gzip header instead of zlib header.
 
   int retCode;
-  if ((retCode = deflateInit2(&strm, level, Z_DEFLATED, windowBits, memLevel,
-                              Z_DEFAULT_STRATEGY)) != Z_OK) {
+  if (deflateInit2(&strm, level, Z_DEFLATED, windowBits, memLevel, Z_DEFAULT_STRATEGY) != Z_OK) {
     return nil;
   }
 

Original file line number	Diff line number	Diff line change
`@@ -45,8 +45,7 @@ + (nullable NSData )gzippedData:(NSData )data {`
`45`	`45`	`int windowBits = 15 + 16; // Enable gzip header instead of zlib header.`
`46`	`46`
`47`	`47`	`int retCode;`
`48`		`- if ((retCode = deflateInit2(&strm, level, Z_DEFLATED, windowBits, memLevel,`
`49`		`- Z_DEFAULT_STRATEGY)) != Z_OK) {`
	`48`	`+ if (deflateInit2(&strm, level, Z_DEFLATED, windowBits, memLevel, Z_DEFAULT_STRATEGY) != Z_OK) {`
`50`	`49`	`return nil;`
`51`	`50`	`}`
`52`	`51`