revi-archive/xz-archive
1
0
Fork 0
mirror of https://git.tukaani.org/xz.git synced 2024-04-04 12:36:23 +02:00
Code Activity

Made lzma_extra pointers const in lzma_options_stream.

Browse source
This commit is contained in:
Lasse Collin 2008-01-22 00:15:11 +02:00
parent 305afa38f6
commit 0ed6f1adce
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/liblzma/api/lzma/stream.h
View file

@ -111,7 +111,7 @@ typedef struct {
/** /**
* \brief Extra information in the Header Metadata Block * \brief Extra information in the Header Metadata Block
*/ */
lzma_extra *header; const lzma_extra *header;
/** /**
* \brief Extra information in the Footer Metadata Block * \brief Extra information in the Footer Metadata Block
@ -119,7 +119,7 @@ typedef struct {
* It is enough to set this pointer any time before calling * It is enough to set this pointer any time before calling
* lzma_code() with LZMA_FINISH as the second argument. * lzma_code() with LZMA_FINISH as the second argument.
*/ */
lzma_extra *footer; const lzma_extra *footer;
} lzma_options_stream; } lzma_options_stream;

8
src/liblzma/common/stream_encoder_multi.c
View file

@ -220,7 +220,11 @@ stream_encode(lzma_coder *coder, lzma_allocator *allocator,
.uncompressed_size = coder->stream_options .uncompressed_size = coder->stream_options
->uncompressed_size, ->uncompressed_size,
.index = NULL, .index = NULL,
.extra = coder->stream_options->header, // Metadata encoder doesn't modify this, but since
// the lzma_extra structure is used also when decoding
// Metadata, the pointer is not const, and we need
// to cast the constness away in the encoder.
.extra = (lzma_extra *)(coder->stream_options->header),
}; };
return_if_error(metadata_encoder_init(coder, allocator, return_if_error(metadata_encoder_init(coder, allocator,
@ -238,7 +242,7 @@ stream_encode(lzma_coder *coder, lzma_allocator *allocator,
.total_size = LZMA_VLI_VALUE_UNKNOWN, .total_size = LZMA_VLI_VALUE_UNKNOWN,
.uncompressed_size = LZMA_VLI_VALUE_UNKNOWN, .uncompressed_size = LZMA_VLI_VALUE_UNKNOWN,
.index = lzma_info_index_get(coder->info, false), .index = lzma_info_index_get(coder->info, false),
.extra = coder->stream_options->footer, .extra = (lzma_extra *)(coder->stream_options->footer),
}; };
return_if_error(metadata_encoder_init(coder, allocator, return_if_error(metadata_encoder_init(coder, allocator,