index.h | index.h | |||
---|---|---|---|---|
skipping to change at line 300 | skipping to change at line 300 | |||
*/ | */ | |||
extern LZMA_API(uint64_t) lzma_index_memused(const lzma_index *i) | extern LZMA_API(uint64_t) lzma_index_memused(const lzma_index *i) | |||
lzma_nothrow; | lzma_nothrow; | |||
/** | /** | |||
* \brief Allocate and initialize a new lzma_index structure | * \brief Allocate and initialize a new lzma_index structure | |||
* | * | |||
* \return On success, a pointer to an empty initialized lzma_index is | * \return On success, a pointer to an empty initialized lzma_index is | |||
* returned. If allocation fails, NULL is returned. | * returned. If allocation fails, NULL is returned. | |||
*/ | */ | |||
extern LZMA_API(lzma_index *) lzma_index_init(lzma_allocator *allocator) | extern LZMA_API(lzma_index *) lzma_index_init(const lzma_allocator *allocat or) | |||
lzma_nothrow; | lzma_nothrow; | |||
/** | /** | |||
* \brief Deallocate lzma_index | * \brief Deallocate lzma_index | |||
* | * | |||
* If i is NULL, this does nothing. | * If i is NULL, this does nothing. | |||
*/ | */ | |||
extern LZMA_API(void) lzma_index_end(lzma_index *i, lzma_allocator *allocat | extern LZMA_API(void) lzma_index_end( | |||
or) | lzma_index *i, const lzma_allocator *allocator) lzma_nothrow | |||
lzma_nothrow; | ; | |||
/** | /** | |||
* \brief Add a new Block to lzma_index | * \brief Add a new Block to lzma_index | |||
* | * | |||
* \param i Pointer to a lzma_index structure | * \param i Pointer to a lzma_index structure | |||
* \param allocator Pointer to lzma_allocator, or NULL to | * \param allocator Pointer to lzma_allocator, or NULL to | |||
* use malloc() | * use malloc() | |||
* \param unpadded_size Unpadded Size of a Block. This can be | * \param unpadded_size Unpadded Size of a Block. This can be | |||
* calculated with lzma_block_unpadded_size( ) | * calculated with lzma_block_unpadded_size( ) | |||
* after encoding or decoding the Block. | * after encoding or decoding the Block. | |||
skipping to change at line 336 | skipping to change at line 336 | |||
* lzma_index_append() it is possible to read the next Block with | * lzma_index_append() it is possible to read the next Block with | |||
* an existing iterator. | * an existing iterator. | |||
* | * | |||
* \return - LZMA_OK | * \return - LZMA_OK | |||
* - LZMA_MEM_ERROR | * - LZMA_MEM_ERROR | |||
* - LZMA_DATA_ERROR: Compressed or uncompressed size of the | * - LZMA_DATA_ERROR: Compressed or uncompressed size of the | |||
* Stream or size of the Index field would grow too big. | * Stream or size of the Index field would grow too big. | |||
* - LZMA_PROG_ERROR | * - LZMA_PROG_ERROR | |||
*/ | */ | |||
extern LZMA_API(lzma_ret) lzma_index_append( | extern LZMA_API(lzma_ret) lzma_index_append( | |||
lzma_index *i, lzma_allocator *allocator, | lzma_index *i, const lzma_allocator *allocator, | |||
lzma_vli unpadded_size, lzma_vli uncompressed_size) | lzma_vli unpadded_size, lzma_vli uncompressed_size) | |||
lzma_nothrow lzma_attr_warn_unused_result; | lzma_nothrow lzma_attr_warn_unused_result; | |||
/** | /** | |||
* \brief Set the Stream Flags | * \brief Set the Stream Flags | |||
* | * | |||
* Set the Stream Flags of the last (and typically the only) Stream | * Set the Stream Flags of the last (and typically the only) Stream | |||
* in lzma_index. This can be useful when reading information from the | * in lzma_index. This can be useful when reading information from the | |||
* lzma_index, because to decode Blocks, knowing the integrity check type | * lzma_index, because to decode Blocks, knowing the integrity check type | |||
* is needed. | * is needed. | |||
skipping to change at line 544 | skipping to change at line 544 | |||
* iterators pointing to src will become invalid. | * iterators pointing to src will become invalid. | |||
* \param allocator Custom memory allocator; can be NULL to use | * \param allocator Custom memory allocator; can be NULL to use | |||
* malloc() and free(). | * malloc() and free(). | |||
* | * | |||
* \return - LZMA_OK: lzma_indexes were concatenated successfully. | * \return - LZMA_OK: lzma_indexes were concatenated successfully. | |||
* src is now a dangling pointer. | * src is now a dangling pointer. | |||
* - LZMA_DATA_ERROR: *dest would grow too big. | * - LZMA_DATA_ERROR: *dest would grow too big. | |||
* - LZMA_MEM_ERROR | * - LZMA_MEM_ERROR | |||
* - LZMA_PROG_ERROR | * - LZMA_PROG_ERROR | |||
*/ | */ | |||
extern LZMA_API(lzma_ret) lzma_index_cat( | extern LZMA_API(lzma_ret) lzma_index_cat(lzma_index *dest, lzma_index *src, | |||
lzma_index *dest, lzma_index *src, lzma_allocator *allocator | const lzma_allocator *allocator) | |||
) | ||||
lzma_nothrow lzma_attr_warn_unused_result; | lzma_nothrow lzma_attr_warn_unused_result; | |||
/** | /** | |||
* \brief Duplicate lzma_index | * \brief Duplicate lzma_index | |||
* | * | |||
* \return A copy of the lzma_index, or NULL if memory allocation fail ed. | * \return A copy of the lzma_index, or NULL if memory allocation fail ed. | |||
*/ | */ | |||
extern LZMA_API(lzma_index *) lzma_index_dup( | extern LZMA_API(lzma_index *) lzma_index_dup( | |||
const lzma_index *i, lzma_allocator *allocator) | const lzma_index *i, const lzma_allocator *allocator) | |||
lzma_nothrow lzma_attr_warn_unused_result; | lzma_nothrow lzma_attr_warn_unused_result; | |||
/** | /** | |||
* \brief Initialize .xz Index encoder | * \brief Initialize .xz Index encoder | |||
* | * | |||
* \param strm Pointer to properly prepared lzma_stream | * \param strm Pointer to properly prepared lzma_stream | |||
* \param i Pointer to lzma_index which should be encoded. | * \param i Pointer to lzma_index which should be encoded. | |||
* | * | |||
* The valid `action' values for lzma_code() are LZMA_RUN and LZMA_FINISH. | * The valid `action' values for lzma_code() are LZMA_RUN and LZMA_FINISH. | |||
* It is enough to use only one of them (you can choose freely; use LZMA_RU N | * It is enough to use only one of them (you can choose freely; use LZMA_RU N | |||
skipping to change at line 652 | skipping to change at line 652 | |||
* won't be read is in[in_size]. | * won't be read is in[in_size]. | |||
* | * | |||
* \return - LZMA_OK: Decoding was successful. | * \return - LZMA_OK: Decoding was successful. | |||
* - LZMA_MEM_ERROR | * - LZMA_MEM_ERROR | |||
* - LZMA_MEMLIMIT_ERROR: Memory usage limit was reached. | * - LZMA_MEMLIMIT_ERROR: Memory usage limit was reached. | |||
* The minimum required memlimit value was stored to *memlim it. | * The minimum required memlimit value was stored to *memlim it. | |||
* - LZMA_DATA_ERROR | * - LZMA_DATA_ERROR | |||
* - LZMA_PROG_ERROR | * - LZMA_PROG_ERROR | |||
*/ | */ | |||
extern LZMA_API(lzma_ret) lzma_index_buffer_decode(lzma_index **i, | extern LZMA_API(lzma_ret) lzma_index_buffer_decode(lzma_index **i, | |||
uint64_t *memlimit, lzma_allocator *allocator, | uint64_t *memlimit, const lzma_allocator *allocator, | |||
const uint8_t *in, size_t *in_pos, size_t in_size) | const uint8_t *in, size_t *in_pos, size_t in_size) | |||
lzma_nothrow; | lzma_nothrow; | |||
End of changes. 6 change blocks. | ||||
10 lines changed or deleted | 9 lines changed or added | |||
This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/ |