root
/
xz
mirror of https://git.tukaani.org/xz.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix a couple of warnings.

This commit is contained in:
Lasse Collin 2009-09-11 09:25:09 +03:00
parent 429910b2ba
commit 18a4233a53
5 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/liblzma/common/stream_decoder.c
View File

@ -358,7 +358,7 @@ stream_decode(lzma_coder *coder, lzma_allocator *allocator,
return LZMA_PROG_ERROR; return LZMA_PROG_ERROR;
} }
return LZMA_OK; // Never reached
} }

5
src/liblzma/lz/lz_encoder.c
View File

@ -84,23 +84,20 @@ fill_window(lzma_coder *coder, lzma_allocator *allocator, const uint8_t *in,
// (which I find cleanest), but we need size_t here when filling // (which I find cleanest), but we need size_t here when filling
// the history window. // the history window.
size_t write_pos = coder->mf.write_pos; size_t write_pos = coder->mf.write_pos;
size_t in_used;
lzma_ret ret; lzma_ret ret;
if (coder->next.code == NULL) { if (coder->next.code == NULL) {
// Not using a filter, simply memcpy() as much as possible. // Not using a filter, simply memcpy() as much as possible.
in_used = lzma_bufcpy(in, in_pos, in_size, coder->mf.buffer, lzma_bufcpy(in, in_pos, in_size, coder->mf.buffer,
&write_pos, coder->mf.size); &write_pos, coder->mf.size);
ret = action != LZMA_RUN && *in_pos == in_size ret = action != LZMA_RUN && *in_pos == in_size
? LZMA_STREAM_END : LZMA_OK; ? LZMA_STREAM_END : LZMA_OK;
} else { } else {
const size_t in_start = *in_pos;
ret = coder->next.code(coder->next.coder, allocator, ret = coder->next.code(coder->next.coder, allocator,
in, in_pos, in_size, in, in_pos, in_size,
coder->mf.buffer, &write_pos, coder->mf.buffer, &write_pos,
coder->mf.size, action); coder->mf.size, action);
in_used = *in_pos - in_start;
} }
coder->mf.write_pos = write_pos; coder->mf.write_pos = write_pos;

2
src/liblzma/lzma/lzma_encoder.c
View File

@ -486,7 +486,7 @@ lzma_lzma_encoder_reset(lzma_coder *coder, const lzma_options_lzma *options)
rc_reset(&coder->rc); rc_reset(&coder->rc);
// State // State
coder->state = 0; coder->state = STATE_LIT_LIT;
for (size_t i = 0; i < REP_DISTANCES; ++i) for (size_t i = 0; i < REP_DISTANCES; ++i)
coder->reps[i] = 0; coder->reps[i] = 0;

8
src/liblzma/lzma/lzma_encoder_optimum_normal.c
View File

@ -455,7 +455,7 @@ helper2(lzma_coder *coder, uint32_t *reps, const uint8_t *buf,
uint32_t matches_count = coder->matches_count; uint32_t matches_count = coder->matches_count;
uint32_t new_len = coder->longest_match_length; uint32_t new_len = coder->longest_match_length;
uint32_t pos_prev = coder->opts[cur].pos_prev; uint32_t pos_prev = coder->opts[cur].pos_prev;
uint32_t state; lzma_lzma_state state;
if (coder->opts[cur].prev_1_is_literal) { if (coder->opts[cur].prev_1_is_literal) {
--pos_prev; --pos_prev;
@ -579,7 +579,7 @@ helper2(lzma_coder *coder, uint32_t *reps, const uint8_t *buf,
--len_test; --len_test;
if (len_test >= 2) { if (len_test >= 2) {
uint32_t state_2 = state; lzma_lzma_state state_2 = state;
update_literal(state_2); update_literal(state_2);
const uint32_t pos_state_next = (position + 1) & coder->pos_mask; const uint32_t pos_state_next = (position + 1) & coder->pos_mask;
@ -657,7 +657,7 @@ helper2(lzma_coder *coder, uint32_t *reps, const uint8_t *buf,
len_test_2 -= len_test + 1; len_test_2 -= len_test + 1;
if (len_test_2 >= 2) { if (len_test_2 >= 2) {
uint32_t state_2 = state; lzma_lzma_state state_2 = state;
update_long_rep(state_2); update_long_rep(state_2);
uint32_t pos_state_next = (position + len_test) & coder->pos_mask; uint32_t pos_state_next = (position + len_test) & coder->pos_mask;
@ -753,7 +753,7 @@ helper2(lzma_coder *coder, uint32_t *reps, const uint8_t *buf,
len_test_2 -= len_test + 1; len_test_2 -= len_test + 1;
if (len_test_2 >= 2) { if (len_test_2 >= 2) {
uint32_t state_2 = state; lzma_lzma_state state_2 = state;
update_match(state_2); update_match(state_2);
uint32_t pos_state_next uint32_t pos_state_next
= (position + len_test) & coder->pos_mask; = (position + len_test) & coder->pos_mask;

2
tests/tests.h
View File

@ -21,7 +21,7 @@
#define memcrap(buf, size) memset(buf, 0xFD, size) #define memcrap(buf, size) memset(buf, 0xFD, size)
#define expect(test) ((test) ? 0 : (fprintf(stderr, "%s:%u: %s\n", \ #define expect(test) ((test) ? 0 : (fprintf(stderr, "%s:%d: %s\n", \
__FILE__, __LINE__, #test), abort(), 0)) __FILE__, __LINE__, #test), abort(), 0))
#define succeed(test) expect(!(test)) #define succeed(test) expect(!(test))