summaryrefslogtreecommitdiff
path: root/plugins/Updater/bzip2-1.0.3
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/Updater/bzip2-1.0.3')
-rw-r--r--plugins/Updater/bzip2-1.0.3/blocksort.c12
-rw-r--r--plugins/Updater/bzip2-1.0.3/bzlib.c38
-rw-r--r--plugins/Updater/bzip2-1.0.3/compress.c4
-rw-r--r--plugins/Updater/bzip2-1.0.3/decompress.c4
4 files changed, 29 insertions, 29 deletions
diff --git a/plugins/Updater/bzip2-1.0.3/blocksort.c b/plugins/Updater/bzip2-1.0.3/blocksort.c
index d0d662cd4e..8b5e49b6ac 100644
--- a/plugins/Updater/bzip2-1.0.3/blocksort.c
+++ b/plugins/Updater/bzip2-1.0.3/blocksort.c
@@ -513,7 +513,7 @@ void mainSimpleSort ( UInt32* ptr,
j = i;
while ( mainGtU (
ptr[j-h]+d, v+d, block, quadrant, nblock, budget
- ) ) {
+ )) {
ptr[j] = ptr[j-h];
j = j - h;
if (j <= (lo + h - 1)) break;
@@ -527,7 +527,7 @@ void mainSimpleSort ( UInt32* ptr,
j = i;
while ( mainGtU (
ptr[j-h]+d, v+d, block, quadrant, nblock, budget
- ) ) {
+ )) {
ptr[j] = ptr[j-h];
j = j - h;
if (j <= (lo + h - 1)) break;
@@ -541,7 +541,7 @@ void mainSimpleSort ( UInt32* ptr,
j = i;
while ( mainGtU (
ptr[j-h]+d, v+d, block, quadrant, nblock, budget
- ) ) {
+ )) {
ptr[j] = ptr[j-h];
j = j - h;
if (j <= (lo + h - 1)) break;
@@ -848,7 +848,7 @@ void mainSort ( UInt32* ptr,
for (i = h; i <= 255; i++) {
vv = runningOrder[i];
j = i;
- while ( BIGFREQ(runningOrder[j-h]) > BIGFREQ(vv) ) {
+ while ( BIGFREQ(runningOrder[j-h]) > BIGFREQ(vv)) {
runningOrder[j] = runningOrder[j-h];
j = j - h;
if (j <= (h - 1)) goto zero;
@@ -886,7 +886,7 @@ void mainSort ( UInt32* ptr,
for (j = 0; j <= 255; j++) {
if (j != ss) {
sb = (ss << 8) + j;
- if ( ! (ftab[sb] & SETMASK) ) {
+ if ( ! (ftab[sb] & SETMASK)) {
Int32 lo = ftab[sb] & CLEARMASK;
Int32 hi = (ftab[sb+1] & CLEARMASK) - 1;
if (hi > lo) {
@@ -1071,7 +1071,7 @@ void BZ2_blockSort ( EState* s )
budgetInit - budget,
nblock,
(float)(budgetInit - budget) /
- (float)(nblock==0 ? 1 : nblock) );
+ (float)(nblock==0 ? 1 : nblock));
if (budget < 0) {
if (verb >= 2)
VPrintf0 ( " too repetitive; using fallback"
diff --git a/plugins/Updater/bzip2-1.0.3/bzlib.c b/plugins/Updater/bzip2-1.0.3/bzlib.c
index a3015c2533..028ac19d5a 100644
--- a/plugins/Updater/bzip2-1.0.3/bzlib.c
+++ b/plugins/Updater/bzip2-1.0.3/bzlib.c
@@ -165,7 +165,7 @@ int BZ_API(BZ2_bzCompressInit)
if (strm->bzalloc == NULL) strm->bzalloc = default_bzalloc;
if (strm->bzfree == NULL) strm->bzfree = default_bzfree;
- s = BZALLOC( sizeof(EState) );
+ s = BZALLOC( sizeof(EState));
if (s == NULL) return BZ_MEM_ERROR;
s->strm = strm;
@@ -174,9 +174,9 @@ int BZ_API(BZ2_bzCompressInit)
s->ftab = NULL;
n = 100000 * blockSize100k;
- s->arr1 = BZALLOC( n * sizeof(UInt32) );
- s->arr2 = BZALLOC( (n+BZ_N_OVERSHOOT) * sizeof(UInt32) );
- s->ftab = BZALLOC( 65537 * sizeof(UInt32) );
+ s->arr1 = BZALLOC( n * sizeof(UInt32));
+ s->arr2 = BZALLOC( (n+BZ_N_OVERSHOOT) * sizeof(UInt32));
+ s->ftab = BZALLOC( 65537 * sizeof(UInt32));
if (s->arr1 == NULL || s->arr2 == NULL || s->ftab == NULL) {
if (s->arr1 != NULL) BZFREE(s->arr1);
@@ -299,7 +299,7 @@ Bool copy_input_until_stop ( EState* s )
/*-- no input? --*/
if (s->strm->avail_in == 0) break;
progress_in = True;
- ADD_CHAR_TO_BLOCK ( s, (UInt32)(*((UChar*)(s->strm->next_in))) );
+ ADD_CHAR_TO_BLOCK ( s, (UInt32)(*((UChar*)(s->strm->next_in))));
s->strm->next_in++;
s->strm->avail_in--;
s->strm->total_in_lo32++;
@@ -317,7 +317,7 @@ Bool copy_input_until_stop ( EState* s )
/*-- flush/finish end? --*/
if (s->avail_in_expect == 0) break;
progress_in = True;
- ADD_CHAR_TO_BLOCK ( s, (UInt32)(*((UChar*)(s->strm->next_in))) );
+ ADD_CHAR_TO_BLOCK ( s, (UInt32)(*((UChar*)(s->strm->next_in))));
s->strm->next_in++;
s->strm->avail_in--;
s->strm->total_in_lo32++;
@@ -383,7 +383,7 @@ Bool handle_compress ( bz_stream* strm )
progress_in |= copy_input_until_stop ( s );
if (s->mode != BZ_M_RUNNING && s->avail_in_expect == 0) {
flush_RL ( s );
- BZ2_compressBlock ( s, (Bool)(s->mode == BZ_M_FINISHING) );
+ BZ2_compressBlock ( s, (Bool)(s->mode == BZ_M_FINISHING));
s->state = BZ_S_OUTPUT;
}
else
@@ -505,7 +505,7 @@ int BZ_API(BZ2_bzDecompressInit)
if (strm->bzalloc == NULL) strm->bzalloc = default_bzalloc;
if (strm->bzfree == NULL) strm->bzfree = default_bzfree;
- s = BZALLOC( sizeof(DState) );
+ s = BZALLOC( sizeof(DState));
if (s == NULL) return BZ_MEM_ERROR;
s->strm = strm;
strm->state = s;
@@ -544,7 +544,7 @@ Bool unRLE_obuf_to_output_FAST ( DState* s )
while (True) {
if (s->strm->avail_out == 0) return False;
if (s->state_out_len == 0) break;
- *( (UChar*)(s->strm->next_out) ) = s->state_out_ch;
+ *( (UChar*)(s->strm->next_out)) = s->state_out_ch;
BZ_UPDATE_CRC ( s->calculatedBlockCRC, s->state_out_ch );
s->state_out_len--;
s->strm->next_out++;
@@ -612,7 +612,7 @@ Bool unRLE_obuf_to_output_FAST ( DState* s )
while (True) {
if (cs_avail_out == 0) goto return_notr;
if (c_state_out_len == 1) break;
- *( (UChar*)(cs_next_out) ) = c_state_out_ch;
+ *( (UChar*)(cs_next_out)) = c_state_out_ch;
BZ_UPDATE_CRC ( c_calculatedBlockCRC, c_state_out_ch );
c_state_out_len--;
cs_next_out++;
@@ -623,7 +623,7 @@ Bool unRLE_obuf_to_output_FAST ( DState* s )
if (cs_avail_out == 0) {
c_state_out_len = 1; goto return_notr;
};
- *( (UChar*)(cs_next_out) ) = c_state_out_ch;
+ *( (UChar*)(cs_next_out)) = c_state_out_ch;
BZ_UPDATE_CRC ( c_calculatedBlockCRC, c_state_out_ch );
cs_next_out++;
cs_avail_out--;
@@ -714,7 +714,7 @@ Bool unRLE_obuf_to_output_SMALL ( DState* s )
while (True) {
if (s->strm->avail_out == 0) return False;
if (s->state_out_len == 0) break;
- *( (UChar*)(s->strm->next_out) ) = s->state_out_ch;
+ *( (UChar*)(s->strm->next_out)) = s->state_out_ch;
BZ_UPDATE_CRC ( s->calculatedBlockCRC, s->state_out_ch );
s->state_out_len--;
s->strm->next_out++;
@@ -763,7 +763,7 @@ Bool unRLE_obuf_to_output_SMALL ( DState* s )
while (True) {
if (s->strm->avail_out == 0) return False;
if (s->state_out_len == 0) break;
- *( (UChar*)(s->strm->next_out) ) = s->state_out_ch;
+ *( (UChar*)(s->strm->next_out)) = s->state_out_ch;
BZ_UPDATE_CRC ( s->calculatedBlockCRC, s->state_out_ch );
s->state_out_len--;
s->strm->next_out++;
@@ -934,7 +934,7 @@ BZFILE* BZ_API(BZ2_bzWriteOpen)
if (ferror(f))
{ BZ_SETERR(BZ_IO_ERROR); return NULL; };
- bzf = malloc ( sizeof(bzFile) );
+ bzf = malloc ( sizeof(bzFile));
if (bzf == NULL)
{ BZ_SETERR(BZ_MEM_ERROR); return NULL; };
@@ -1062,7 +1062,7 @@ void BZ_API(BZ2_bzWriteClose64)
}
}
- if ( !abandon && !ferror ( bzf->handle ) ) {
+ if ( !abandon && !ferror ( bzf->handle )) {
fflush ( bzf->handle );
if (ferror(bzf->handle))
{ BZ_SETERR(BZ_IO_ERROR); return; };
@@ -1078,7 +1078,7 @@ void BZ_API(BZ2_bzWriteClose64)
*nbytes_out_hi32 = bzf->strm.total_out_hi32;
BZ_SETERR(BZ_OK);
- BZ2_bzCompressEnd ( &(bzf->strm) );
+ BZ2_bzCompressEnd ( &(bzf->strm));
free ( bzf );
}
@@ -1107,7 +1107,7 @@ BZFILE* BZ_API(BZ2_bzReadOpen)
if (ferror(f))
{ BZ_SETERR(BZ_IO_ERROR); return NULL; };
- bzf = malloc ( sizeof(bzFile) );
+ bzf = malloc ( sizeof(bzFile));
if (bzf == NULL)
{ BZ_SETERR(BZ_MEM_ERROR); return NULL; };
@@ -1152,7 +1152,7 @@ void BZ_API(BZ2_bzReadClose) ( int *bzerror, BZFILE *b )
{ BZ_SETERR(BZ_SEQUENCE_ERROR); return; };
if (bzf->initialisedOk)
- (void)BZ2_bzDecompressEnd ( &(bzf->strm) );
+ (void)BZ2_bzDecompressEnd ( &(bzf->strm));
free ( bzf );
}
@@ -1196,7 +1196,7 @@ int BZ_API(BZ2_bzRead)
bzf->strm.next_in = bzf->buf;
}
- ret = BZ2_bzDecompress ( &(bzf->strm) );
+ ret = BZ2_bzDecompress ( &(bzf->strm));
if (ret != BZ_OK && ret != BZ_STREAM_END)
{ BZ_SETERR(ret); return 0; };
diff --git a/plugins/Updater/bzip2-1.0.3/compress.c b/plugins/Updater/bzip2-1.0.3/compress.c
index caf7696011..98e64027d4 100644
--- a/plugins/Updater/bzip2-1.0.3/compress.c
+++ b/plugins/Updater/bzip2-1.0.3/compress.c
@@ -303,7 +303,7 @@ void sendMTFValues ( EState* s )
VPrintf5( " initial group %d, [%d .. %d], "
"has %d syms (%4.1f%%)\n",
nPart, gs, ge, aFreq,
- (100.0 * (float)aFreq) / (float)(s->nMTF) );
+ (100.0 * (float)aFreq) / (float)(s->nMTF));
for (v = 0; v < alphaSize; v++)
if (v >= gs && v <= ge)
@@ -624,7 +624,7 @@ void BZ2_compressBlock ( EState* s, Bool is_last_block )
bsPutUChar ( s, BZ_HDR_B );
bsPutUChar ( s, BZ_HDR_Z );
bsPutUChar ( s, BZ_HDR_h );
- bsPutUChar ( s, (UChar)(BZ_HDR_0 + s->blockSize100k) );
+ bsPutUChar ( s, (UChar)(BZ_HDR_0 + s->blockSize100k));
}
if (s->nblock > 0) {
diff --git a/plugins/Updater/bzip2-1.0.3/decompress.c b/plugins/Updater/bzip2-1.0.3/decompress.c
index 311f5668f9..9e692a26fb 100644
--- a/plugins/Updater/bzip2-1.0.3/decompress.c
+++ b/plugins/Updater/bzip2-1.0.3/decompress.c
@@ -209,13 +209,13 @@ Int32 BZ2_decompress ( DState* s )
s->blockSize100k -= BZ_HDR_0;
if (s->smallDecompress) {
- s->ll16 = BZALLOC( s->blockSize100k * 100000 * sizeof(UInt16) );
+ s->ll16 = BZALLOC( s->blockSize100k * 100000 * sizeof(UInt16));
s->ll4 = BZALLOC(
((1 + s->blockSize100k * 100000) >> 1) * sizeof(UChar)
);
if (s->ll16 == NULL || s->ll4 == NULL) RETURN(BZ_MEM_ERROR);
} else {
- s->tt = BZALLOC( s->blockSize100k * 100000 * sizeof(Int32) );
+ s->tt = BZALLOC( s->blockSize100k * 100000 * sizeof(Int32));
if (s->tt == NULL) RETURN(BZ_MEM_ERROR);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 22:00:28 +0000