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

liblzma: Rename LZMA_SEEK to LZMA_SEEK_NEEDED and seek_in to seek_pos.

This commit is contained in:
Lasse Collin 2017-04-21 15:05:16 +03:00
parent 662b27c417
commit 8c9842c265
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/liblzma/api/lzma/base.h
View File

@ -235,16 +235,16 @@ typedef enum {
* how to report bugs. * how to report bugs.
*/ */
LZMA_SEEK = 12 LZMA_SEEK_NEEDED = 12
/**< /**<
* \brief Request to change the input file position * \brief Request to change the input file position
* *
* Some coders can do random access in the input file. The * Some coders can do random access in the input file. The
* initialization functions of these coders take the file size * initialization functions of these coders take the file size
* as an argument. No other coders can return LZMA_SEEK. * as an argument. No other coders can return LZMA_SEEK_NEEDED.
* *
* When this value is returned, the application must seek to * When this value is returned, the application must seek to
* the file position given in lzma_stream.seek_in. This value * the file position given in lzma_stream.seek_pos. This value
* is guaranteed to never exceed the file size that was * is guaranteed to never exceed the file size that was
* specified at the coder initialization. * specified at the coder initialization.
* *
@ -533,16 +533,16 @@ typedef struct {
void *reserved_ptr4; void *reserved_ptr4;
/** /**
* \brief New seek input position for LZMA_SEEK * \brief New seek input position for LZMA_SEEK_NEEDED
* *
* When lzma_code() returns LZMA_SEEK, the new input position needed * When lzma_code() returns LZMA_SEEK_NEEDED, the new input position
* by liblzma will be available seek_in. The value is guaranteed to * needed by liblzma will be available seek_pos. The value is
* not exceed the file size that was specified when this lzma_stream * guaranteed to not exceed the file size that was specified when
* was initialized. * this lzma_stream was initialized.
* *
* In all other situations the value of this variable is undefined. * In all other situations the value of this variable is undefined.
*/ */
uint64_t seek_in; uint64_t seek_pos;
uint64_t reserved_int2; uint64_t reserved_int2;
size_t reserved_int3; size_t reserved_int3;

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

@ -317,7 +317,7 @@ lzma_code(lzma_stream *strm, lzma_action action)
ret = LZMA_OK; ret = LZMA_OK;
break; break;
case LZMA_SEEK: case LZMA_SEEK_NEEDED:
strm->internal->allow_buf_error = false; strm->internal->allow_buf_error = false;
// If LZMA_FINISH was used, reset it back to the // If LZMA_FINISH was used, reset it back to the

2
src/xz/message.c
View File

@ -818,7 +818,7 @@ message_strm(lzma_ret code)
case LZMA_STREAM_END: case LZMA_STREAM_END:
case LZMA_GET_CHECK: case LZMA_GET_CHECK:
case LZMA_PROG_ERROR: case LZMA_PROG_ERROR:
case LZMA_SEEK: case LZMA_SEEK_NEEDED:
// Without "default", compiler will warn if new constants // Without "default", compiler will warn if new constants
// are added to lzma_ret, it is not too easy to forget to // are added to lzma_ret, it is not too easy to forget to
// add the new constants to this function. // add the new constants to this function.