aboutsummaryrefslogtreecommitdiff
path: root/archival
diff options
context:
space:
mode:
Diffstat (limited to 'archival')
-rw-r--r--archival/bz/LICENSE10
-rw-r--r--archival/bz/README22
-rw-r--r--archival/bz/bzlib.c2
-rw-r--r--archival/bz/compress.c2
-rw-r--r--archival/bz/huffman.c4
5 files changed, 20 insertions, 20 deletions
diff --git a/archival/bz/LICENSE b/archival/bz/LICENSE
index f01f08022..da4346520 100644
--- a/archival/bz/LICENSE
+++ b/archival/bz/LICENSE
@@ -15,16 +15,16 @@ are met:
151. Redistributions of source code must retain the above copyright 151. Redistributions of source code must retain the above copyright
16 notice, this list of conditions and the following disclaimer. 16 notice, this list of conditions and the following disclaimer.
17 17
182. The origin of this software must not be misrepresented; you must 182. The origin of this software must not be misrepresented; you must
19 not claim that you wrote the original software. If you use this 19 not claim that you wrote the original software. If you use this
20 software in a product, an acknowledgment in the product 20 software in a product, an acknowledgment in the product
21 documentation would be appreciated but is not required. 21 documentation would be appreciated but is not required.
22 22
233. Altered source versions must be plainly marked as such, and must 233. Altered source versions must be plainly marked as such, and must
24 not be misrepresented as being the original software. 24 not be misrepresented as being the original software.
25 25
264. The name of the author may not be used to endorse or promote 264. The name of the author may not be used to endorse or promote
27 products derived from this software without specific prior written 27 products derived from this software without specific prior written
28 permission. 28 permission.
29 29
30THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS 30THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
diff --git a/archival/bz/README b/archival/bz/README
index ef06d67da..3015342cb 100644
--- a/archival/bz/README
+++ b/archival/bz/README
@@ -25,12 +25,12 @@ Please read and be aware of the following:
25 25
26WARNING: 26WARNING:
27 27
28 This program and library (attempts to) compress data by 28 This program and library (attempts to) compress data by
29 performing several non-trivial transformations on it. 29 performing several non-trivial transformations on it.
30 Unless you are 100% familiar with *all* the algorithms 30 Unless you are 100% familiar with *all* the algorithms
31 contained herein, and with the consequences of modifying them, 31 contained herein, and with the consequences of modifying them,
32 you should NOT meddle with the compression or decompression 32 you should NOT meddle with the compression or decompression
33 machinery. Incorrect changes can and very likely *will* 33 machinery. Incorrect changes can and very likely *will*
34 lead to disastrous loss of data. 34 lead to disastrous loss of data.
35 35
36 36
@@ -50,16 +50,16 @@ DISCLAIMER:
50 PROGRAM UNLESS YOU ARE PREPARED TO ACCEPT THE POSSIBILITY, HOWEVER 50 PROGRAM UNLESS YOU ARE PREPARED TO ACCEPT THE POSSIBILITY, HOWEVER
51 SMALL, THAT THE DATA WILL NOT BE RECOVERABLE. 51 SMALL, THAT THE DATA WILL NOT BE RECOVERABLE.
52 52
53 That is not to say this program is inherently unreliable. 53 That is not to say this program is inherently unreliable.
54 Indeed, I very much hope the opposite is true. bzip2/libbzip2 54 Indeed, I very much hope the opposite is true. bzip2/libbzip2
55 has been carefully constructed and extensively tested. 55 has been carefully constructed and extensively tested.
56 56
57 57
58PATENTS: 58PATENTS:
59 59
60 To the best of my knowledge, bzip2/libbzip2 does not use any 60 To the best of my knowledge, bzip2/libbzip2 does not use any
61 patented algorithms. However, I do not have the resources 61 patented algorithms. However, I do not have the resources
62 to carry out a patent search. Therefore I cannot give any 62 to carry out a patent search. Therefore I cannot give any
63 guarantee of the above statement. 63 guarantee of the above statement.
64 64
65 65
diff --git a/archival/bz/bzlib.c b/archival/bz/bzlib.c
index 57a69747e..f27050a3c 100644
--- a/archival/bz/bzlib.c
+++ b/archival/bz/bzlib.c
@@ -259,7 +259,7 @@ void /*Bool*/ handle_compress(bz_stream *strm)
259 /*Bool progress_in = False;*/ 259 /*Bool progress_in = False;*/
260 /*Bool progress_out = False;*/ 260 /*Bool progress_out = False;*/
261 EState* s = strm->state; 261 EState* s = strm->state;
262 262
263 while (1) { 263 while (1) {
264 if (s->state == BZ_S_OUTPUT) { 264 if (s->state == BZ_S_OUTPUT) {
265 /*progress_out |=*/ copy_output_until_stop(s); 265 /*progress_out |=*/ copy_output_until_stop(s);
diff --git a/archival/bz/compress.c b/archival/bz/compress.c
index 4bd364ee3..3e2fbd867 100644
--- a/archival/bz/compress.c
+++ b/archival/bz/compress.c
@@ -414,7 +414,7 @@ void sendMTFValues(EState* s)
414 /* 414 /*
415 * Increment the symbol frequencies for the selected table. 415 * Increment the symbol frequencies for the selected table.
416 */ 416 */
417/* 1% faster compress. +800 bytes */ 417/* 1% faster compress. +800 bytes */
418#if CONFIG_BZIP2_FEATURE_SPEED >= 4 418#if CONFIG_BZIP2_FEATURE_SPEED >= 4
419 if (nGroups == 6 && 50 == ge-gs+1) { 419 if (nGroups == 6 && 50 == ge-gs+1) {
420 /*--- fast track the common case ---*/ 420 /*--- fast track the common case ---*/
diff --git a/archival/bz/huffman.c b/archival/bz/huffman.c
index f016c968c..3f80c9976 100644
--- a/archival/bz/huffman.c
+++ b/archival/bz/huffman.c
@@ -133,7 +133,7 @@ void BZ2_hbMakeCodeLengths(uint8_t *len,
133 } 133 }
134 134
135 AssertH(nHeap < (BZ_MAX_ALPHA_SIZE+2), 2001); 135 AssertH(nHeap < (BZ_MAX_ALPHA_SIZE+2), 2001);
136 136
137 while (nHeap > 1) { 137 while (nHeap > 1) {
138 n1 = heap[1]; heap[1] = heap[nHeap]; nHeap--; DOWNHEAP1(heap, weight, nHeap); 138 n1 = heap[1]; heap[1] = heap[nHeap]; nHeap--; DOWNHEAP1(heap, weight, nHeap);
139 n2 = heap[1]; heap[1] = heap[nHeap]; nHeap--; DOWNHEAP1(heap, weight, nHeap); 139 n2 = heap[1]; heap[1] = heap[nHeap]; nHeap--; DOWNHEAP1(heap, weight, nHeap);
@@ -160,7 +160,7 @@ void BZ2_hbMakeCodeLengths(uint8_t *len,
160 if (j > maxLen) 160 if (j > maxLen)
161 tooLong = True; 161 tooLong = True;
162 } 162 }
163 163
164 if (!tooLong) 164 if (!tooLong)
165 break; 165 break;
166 166