diff options
| author | click <none@none> | 2010-08-13 00:00:59 +0200 |
|---|---|---|
| committer | click <none@none> | 2010-08-13 00:00:59 +0200 |
| commit | 91eed572afbbabd7efe04ec3a164123ff2429a2a (patch) | |
| tree | fbccf11888aab5ec0d35b9561a17c000a5857f83 | |
| parent | 999bae68a4cf2c6c0680974b8ad1dc4e2940d045 (diff) | |
externals/libmpq: sync with upstream repository [r309] - thanks to ge0rg!
--HG--
branch : trunk
| -rw-r--r-- | externals/libmpq/libmpq/mpq.c | 2 | ||||
| -rw-r--r-- | externals/libmpq/libmpq/wave.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/externals/libmpq/libmpq/mpq.c b/externals/libmpq/libmpq/mpq.c index 4e11e59d3f7..a6ab5db82d9 100644 --- a/externals/libmpq/libmpq/mpq.c +++ b/externals/libmpq/libmpq/mpq.c @@ -694,7 +694,7 @@ int32_t libmpq__block_open_offset(mpq_archive_s *mpq_archive, uint32_t file_numb if (mpq_archive->mpq_block[mpq_archive->mpq_map[file_number].block_table_indices].flags & LIBMPQ_FLAG_ENCRYPTED) { /* check if we don't know the file seed, try to find it. */ - if (libmpq__decrypt_key((uint8_t *)mpq_archive->mpq_file[file_number]->packed_offset, packed_size, mpq_archive->block_size, mpq_archive->mpq_file[file_number]->seed) < 0) { + if (libmpq__decrypt_key((uint8_t *)mpq_archive->mpq_file[file_number]->packed_offset, packed_size, mpq_archive->block_size, &mpq_archive->mpq_file[file_number]->seed) < 0) { /* sorry without seed, we cannot extract file. */ result = LIBMPQ_ERROR_DECRYPT; diff --git a/externals/libmpq/libmpq/wave.c b/externals/libmpq/libmpq/wave.c index 4f2b73ba27e..628593fce83 100644 --- a/externals/libmpq/libmpq/wave.c +++ b/externals/libmpq/libmpq/wave.c @@ -64,7 +64,7 @@ int32_t libmpq__do_decompress_wave(uint8_t *out_buf, int32_t out_length, uint8_t uint32_t index; int32_t nr_array1[2]; int32_t nr_array2[2]; - uint32_t count = 0; + int32_t count = 0; /* end on input buffer. */ uint8_t *in_end = in_buf + in_length; |