src/java.base/share/native/libzip/zlib/patches/ChangeLog_java
author erikj
Tue, 12 Sep 2017 19:03:39 +0200
changeset 47216 71c04702a3d5
parent 45972 jdk/src/java.base/share/native/libzip/zlib/patches/ChangeLog_java@df150cb64284
child 48045 d66e420cc482
permissions -rw-r--r--
8187443: Forest Consolidation: Move files to unified layout Reviewed-by: darcy, ihse
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
43806
36e9a4583949 8173207: Upgrade compression library
sherman
parents:
diff changeset
     1
(1) renamed adler32.c -> zadler32.c, zcrc32c -> zcrc32.c
36e9a4583949 8173207: Upgrade compression library
sherman
parents:
diff changeset
     2
36e9a4583949 8173207: Upgrade compression library
sherman
parents:
diff changeset
     3
(2) zconf.h:
36e9a4583949 8173207: Upgrade compression library
sherman
parents:
diff changeset
     4
    - added _LP64 to make uLong a 32-bit int on 64-bit platform
36e9a4583949 8173207: Upgrade compression library
sherman
parents:
diff changeset
     5
    uLong -> 32-bit int
36e9a4583949 8173207: Upgrade compression library
sherman
parents:
diff changeset
     6
36e9a4583949 8173207: Upgrade compression library
sherman
parents:
diff changeset
     7
--------------------------
36e9a4583949 8173207: Upgrade compression library
sherman
parents:
diff changeset
     8
35,37d10
36e9a4583949 8173207: Upgrade compression library
sherman
parents:
diff changeset
     9
< /* for _LP64 */
36e9a4583949 8173207: Upgrade compression library
sherman
parents:
diff changeset
    10
< #include <sys/types.h>
43810
a8fca792a14b 8175053: March 5 builds failed on Windows/install repo after JDK-8173207
sherman
parents: 43806
diff changeset
    11
<
a8fca792a14b 8175053: March 5 builds failed on Windows/install repo after JDK-8173207
sherman
parents: 43806
diff changeset
    12
421,424d393
a8fca792a14b 8175053: March 5 builds failed on Windows/install repo after JDK-8173207
sherman
parents: 43806
diff changeset
    13
<
43806
36e9a4583949 8173207: Upgrade compression library
sherman
parents:
diff changeset
    14
< #ifdef _LP64
36e9a4583949 8173207: Upgrade compression library
sherman
parents:
diff changeset
    15
< typedef unsigned int  uLong;  /* 32 bits or more */
36e9a4583949 8173207: Upgrade compression library
sherman
parents:
diff changeset
    16
< #else
43810
a8fca792a14b 8175053: March 5 builds failed on Windows/install repo after JDK-8173207
sherman
parents: 43806
diff changeset
    17
426d394
43806
36e9a4583949 8173207: Upgrade compression library
sherman
parents:
diff changeset
    18
< #endif
36e9a4583949 8173207: Upgrade compression library
sherman
parents:
diff changeset
    19
--------------------------
36e9a4583949 8173207: Upgrade compression library
sherman
parents:
diff changeset
    20
36e9a4583949 8173207: Upgrade compression library
sherman
parents:
diff changeset
    21
(3) updated crc32.c/crc32(), crc32_z()
36e9a4583949 8173207: Upgrade compression library
sherman
parents:
diff changeset
    22
   unsigned long      -> uLong
36e9a4583949 8173207: Upgrade compression library
sherman
parents:
diff changeset
    23
36e9a4583949 8173207: Upgrade compression library
sherman
parents:
diff changeset
    24
--------------------------
36e9a4583949 8173207: Upgrade compression library
sherman
parents:
diff changeset
    25
36e9a4583949 8173207: Upgrade compression library
sherman
parents:
diff changeset
    26
226,227c202,203
36e9a4583949 8173207: Upgrade compression library
sherman
parents:
diff changeset
    27
< uLong ZEXPORT crc32_z(crc, buf, len)
36e9a4583949 8173207: Upgrade compression library
sherman
parents:
diff changeset
    28
<     uLong crc;
36e9a4583949 8173207: Upgrade compression library
sherman
parents:
diff changeset
    29
---
36e9a4583949 8173207: Upgrade compression library
sherman
parents:
diff changeset
    30
> unsigned long ZEXPORT crc32_z(crc, buf, len)
36e9a4583949 8173207: Upgrade compression library
sherman
parents:
diff changeset
    31
>     unsigned long crc;
36e9a4583949 8173207: Upgrade compression library
sherman
parents:
diff changeset
    32
244c220
36e9a4583949 8173207: Upgrade compression library
sherman
parents:
diff changeset
    33
<             return (uLong)crc32_little(crc, buf, len);
36e9a4583949 8173207: Upgrade compression library
sherman
parents:
diff changeset
    34
---
36e9a4583949 8173207: Upgrade compression library
sherman
parents:
diff changeset
    35
>             return crc32_little(crc, buf, len);
36e9a4583949 8173207: Upgrade compression library
sherman
parents:
diff changeset
    36
246c222
36e9a4583949 8173207: Upgrade compression library
sherman
parents:
diff changeset
    37
<             return (uLong)crc32_big(crc, buf, len);
36e9a4583949 8173207: Upgrade compression library
sherman
parents:
diff changeset
    38
---
36e9a4583949 8173207: Upgrade compression library
sherman
parents:
diff changeset
    39
>             return crc32_big(crc, buf, len);
36e9a4583949 8173207: Upgrade compression library
sherman
parents:
diff changeset
    40
261,262c237,238
36e9a4583949 8173207: Upgrade compression library
sherman
parents:
diff changeset
    41
< uLong ZEXPORT crc32(crc, buf, len)
36e9a4583949 8173207: Upgrade compression library
sherman
parents:
diff changeset
    42
<     uLong crc;
36e9a4583949 8173207: Upgrade compression library
sherman
parents:
diff changeset
    43
---
36e9a4583949 8173207: Upgrade compression library
sherman
parents:
diff changeset
    44
> unsigned long ZEXPORT crc32(crc, buf, len)
36e9a4583949 8173207: Upgrade compression library
sherman
parents:
diff changeset
    45
>     unsigned long crc;
36e9a4583949 8173207: Upgrade compression library
sherman
parents:
diff changeset
    46
36e9a4583949 8173207: Upgrade compression library
sherman
parents:
diff changeset
    47
--------------------------
36e9a4583949 8173207: Upgrade compression library
sherman
parents:
diff changeset
    48
43810
a8fca792a14b 8175053: March 5 builds failed on Windows/install repo after JDK-8173207
sherman
parents: 43806
diff changeset
    49
(4) gzread.c
43806
36e9a4583949 8173207: Upgrade compression library
sherman
parents:
diff changeset
    50
36e9a4583949 8173207: Upgrade compression library
sherman
parents:
diff changeset
    51
--------------------------
43810
a8fca792a14b 8175053: March 5 builds failed on Windows/install repo after JDK-8173207
sherman
parents: 43806
diff changeset
    52
343c319
a8fca792a14b 8175053: March 5 builds failed on Windows/install repo after JDK-8173207
sherman
parents: 43806
diff changeset
    53
<             n = (unsigned)len;
a8fca792a14b 8175053: March 5 builds failed on Windows/install repo after JDK-8173207
sherman
parents: 43806
diff changeset
    54
---
a8fca792a14b 8175053: March 5 builds failed on Windows/install repo after JDK-8173207
sherman
parents: 43806
diff changeset
    55
>             n = len;
a8fca792a14b 8175053: March 5 builds failed on Windows/install repo after JDK-8173207
sherman
parents: 43806
diff changeset
    56
424c400
a8fca792a14b 8175053: March 5 builds failed on Windows/install repo after JDK-8173207
sherman
parents: 43806
diff changeset
    57
<     len = (unsigned)gz_read(state, buf, len);
a8fca792a14b 8175053: March 5 builds failed on Windows/install repo after JDK-8173207
sherman
parents: 43806
diff changeset
    58
---
a8fca792a14b 8175053: March 5 builds failed on Windows/install repo after JDK-8173207
sherman
parents: 43806
diff changeset
    59
>     len = gz_read(state, buf, len);
a8fca792a14b 8175053: March 5 builds failed on Windows/install repo after JDK-8173207
sherman
parents: 43806
diff changeset
    60
496c472
a8fca792a14b 8175053: March 5 builds failed on Windows/install repo after JDK-8173207
sherman
parents: 43806
diff changeset
    61
<     ret = (int)gz_read(state, buf, 1);
a8fca792a14b 8175053: March 5 builds failed on Windows/install repo after JDK-8173207
sherman
parents: 43806
diff changeset
    62
---
a8fca792a14b 8175053: March 5 builds failed on Windows/install repo after JDK-8173207
sherman
parents: 43806
diff changeset
    63
>     ret = gz_read(state, buf, 1);
a8fca792a14b 8175053: March 5 builds failed on Windows/install repo after JDK-8173207
sherman
parents: 43806
diff changeset
    64
--------------------------
a8fca792a14b 8175053: March 5 builds failed on Windows/install repo after JDK-8173207
sherman
parents: 43806
diff changeset
    65
a8fca792a14b 8175053: March 5 builds failed on Windows/install repo after JDK-8173207
sherman
parents: 43806
diff changeset
    66
(5) gzwrite.c
a8fca792a14b 8175053: March 5 builds failed on Windows/install repo after JDK-8173207
sherman
parents: 43806
diff changeset
    67
a8fca792a14b 8175053: March 5 builds failed on Windows/install repo after JDK-8173207
sherman
parents: 43806
diff changeset
    68
--------------------------
a8fca792a14b 8175053: March 5 builds failed on Windows/install repo after JDK-8173207
sherman
parents: 43806
diff changeset
    69
236c212
a8fca792a14b 8175053: March 5 builds failed on Windows/install repo after JDK-8173207
sherman
parents: 43806
diff changeset
    70
<                 copy = (unsigned)len;
a8fca792a14b 8175053: March 5 builds failed on Windows/install repo after JDK-8173207
sherman
parents: 43806
diff changeset
    71
---
a8fca792a14b 8175053: March 5 builds failed on Windows/install repo after JDK-8173207
sherman
parents: 43806
diff changeset
    72
>                 copy = len;
a8fca792a14b 8175053: March 5 builds failed on Windows/install repo after JDK-8173207
sherman
parents: 43806
diff changeset
    73
256c232
a8fca792a14b 8175053: March 5 builds failed on Windows/install repo after JDK-8173207
sherman
parents: 43806
diff changeset
    74
<                 n = (unsigned)len;
a8fca792a14b 8175053: March 5 builds failed on Windows/install repo after JDK-8173207
sherman
parents: 43806
diff changeset
    75
---
a8fca792a14b 8175053: March 5 builds failed on Windows/install repo after JDK-8173207
sherman
parents: 43806
diff changeset
    76
>                 n = len;
43806
36e9a4583949 8173207: Upgrade compression library
sherman
parents:
diff changeset
    77
--------------------------
36e9a4583949 8173207: Upgrade compression library
sherman
parents:
diff changeset
    78
45972
df150cb64284 8184306: zlib 1.2.11 upgrade triggers j.u.zip.Deflater regression
sherman
parents: 43810
diff changeset
    79
(6) deflate.c  #8184306
43806
36e9a4583949 8173207: Upgrade compression library
sherman
parents:
diff changeset
    80
45972
df150cb64284 8184306: zlib 1.2.11 upgrade triggers j.u.zip.Deflater regression
sherman
parents: 43810
diff changeset
    81
*** 503,512 ****
df150cb64284 8184306: zlib 1.2.11 upgrade triggers j.u.zip.Deflater regression
sherman
parents: 43810
diff changeset
    82
--- 503,514 ----
df150cb64284 8184306: zlib 1.2.11 upgrade triggers j.u.zip.Deflater regression
sherman
parents: 43810
diff changeset
    83
  
df150cb64284 8184306: zlib 1.2.11 upgrade triggers j.u.zip.Deflater regression
sherman
parents: 43810
diff changeset
    84
      s = (deflate_state *)strm->state;
df150cb64284 8184306: zlib 1.2.11 upgrade triggers j.u.zip.Deflater regression
sherman
parents: 43810
diff changeset
    85
      s->pending = 0;
df150cb64284 8184306: zlib 1.2.11 upgrade triggers j.u.zip.Deflater regression
sherman
parents: 43810
diff changeset
    86
      s->pending_out = s->pending_buf;
df150cb64284 8184306: zlib 1.2.11 upgrade triggers j.u.zip.Deflater regression
sherman
parents: 43810
diff changeset
    87
  
df150cb64284 8184306: zlib 1.2.11 upgrade triggers j.u.zip.Deflater regression
sherman
parents: 43810
diff changeset
    88
+     s->high_water = 0;      /* reset to its inital value 0 */
df150cb64284 8184306: zlib 1.2.11 upgrade triggers j.u.zip.Deflater regression
sherman
parents: 43810
diff changeset
    89
+ 
df150cb64284 8184306: zlib 1.2.11 upgrade triggers j.u.zip.Deflater regression
sherman
parents: 43810
diff changeset
    90
      if (s->wrap < 0) {
df150cb64284 8184306: zlib 1.2.11 upgrade triggers j.u.zip.Deflater regression
sherman
parents: 43810
diff changeset
    91
          s->wrap = -s->wrap; /* was made negative by deflate(..., Z_FINISH); */
df150cb64284 8184306: zlib 1.2.11 upgrade triggers j.u.zip.Deflater regression
sherman
parents: 43810
diff changeset
    92
      }
df150cb64284 8184306: zlib 1.2.11 upgrade triggers j.u.zip.Deflater regression
sherman
parents: 43810
diff changeset
    93
      s->status =
df150cb64284 8184306: zlib 1.2.11 upgrade triggers j.u.zip.Deflater regression
sherman
parents: 43810
diff changeset
    94
  #ifdef GZIP
43810
a8fca792a14b 8175053: March 5 builds failed on Windows/install repo after JDK-8173207
sherman
parents: 43806
diff changeset
    95
43806
36e9a4583949 8173207: Upgrade compression library
sherman
parents:
diff changeset
    96