summaryrefslogtreecommitdiff
path: root/src/contrib/puff/puff.c
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2017-05-18 14:17:25 +0100
committerNarayan Kamath <narayan@google.com>2017-05-18 14:27:43 +0100
commit20877b3d8f8c1c2eb639905e4732356e03f38ff7 (patch)
tree51e5bd2195c3956cc412e1105428b7a203d3f53c /src/contrib/puff/puff.c
parent86d60dc6f4a38aa2fd5d19fb707c920f8cd015eb (diff)
downloadzlib-20877b3d8f8c1c2eb639905e4732356e03f38ff7.tar.gz
Revert "Update zlib to 1.2.11"android-vts-8.0_r2android-vts-8.0_r1oreo-dev
This reverts commit fbe84be2fe4449e251193686bc704939e70e0d06. This causes issues with server side infrastructure that makes invasive assumptions about the nature of compressed zlib output at each compression level which was broken by the upgrade from 1.2.8 -> 1.2.11. As a result, the upgrade is being temporarily reverted to give the teams involved a little more time to fix the issues on their end. Bug: 38369364 Test: run cts -m CtsLibcoreTestCases (cherry picked from commit 64c8fd52127407737beccba617e02eaf4a58ae7f) Change-Id: I721461a384d763713fb9d07b43824859a661c6e9
Diffstat (limited to 'src/contrib/puff/puff.c')
-rw-r--r--src/contrib/puff/puff.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/contrib/puff/puff.c b/src/contrib/puff/puff.c
index c6c90d7..ba58483 100644
--- a/src/contrib/puff/puff.c
+++ b/src/contrib/puff/puff.c
@@ -17,7 +17,7 @@
* All dynamically allocated memory comes from the stack. The stack required
* is less than 2K bytes. This code is compatible with 16-bit int's and
* assumes that long's are at least 32 bits. puff.c uses the short data type,
- * assumed to be 16 bits, for arrays in order to conserve memory. The code
+ * assumed to be 16 bits, for arrays in order to to conserve memory. The code
* works whether integers are stored big endian or little endian.
*
* In the comments below are "Format notes" that describe the inflate process