mirror of
https://git.tukaani.org/xz.git
synced 2024-04-04 12:36:23 +02:00
xz: Fix a too relaxed assertion and remove uses of SSIZE_MAX.
SSIZE_MAX isn't readily available on MSVC. Removing it means that there is one thing less to worry when porting to MSVC.
This commit is contained in:
parent
74c3449d8b
commit
f7093cd9d1
2 changed files with 4 additions and 5 deletions
|
@ -1157,8 +1157,7 @@ io_fix_src_pos(file_pair *pair, size_t rewind_size)
|
||||||
extern size_t
|
extern size_t
|
||||||
io_read(file_pair *pair, io_buf *buf, size_t size)
|
io_read(file_pair *pair, io_buf *buf, size_t size)
|
||||||
{
|
{
|
||||||
// We use small buffers here.
|
assert(size <= IO_BUFFER_SIZE);
|
||||||
assert(size < SSIZE_MAX);
|
|
||||||
|
|
||||||
size_t pos = 0;
|
size_t pos = 0;
|
||||||
|
|
||||||
|
@ -1285,7 +1284,7 @@ is_sparse(const io_buf *buf)
|
||||||
static bool
|
static bool
|
||||||
io_write_buf(file_pair *pair, const uint8_t *buf, size_t size)
|
io_write_buf(file_pair *pair, const uint8_t *buf, size_t size)
|
||||||
{
|
{
|
||||||
assert(size < SSIZE_MAX);
|
assert(size <= IO_BUFFER_SIZE);
|
||||||
|
|
||||||
while (size > 0) {
|
while (size > 0) {
|
||||||
const ssize_t amount = write(pair->dest_fd, buf, size);
|
const ssize_t amount = write(pair->dest_fd, buf, size);
|
||||||
|
|
|
@ -118,7 +118,7 @@ extern void io_close(file_pair *pair, bool success);
|
||||||
///
|
///
|
||||||
/// \param pair File pair having the source file open for reading
|
/// \param pair File pair having the source file open for reading
|
||||||
/// \param buf Destination buffer to hold the read data
|
/// \param buf Destination buffer to hold the read data
|
||||||
/// \param size Size of the buffer; assumed be smaller than SSIZE_MAX
|
/// \param size Size of the buffer; must be at most IO_BUFFER_SIZE
|
||||||
///
|
///
|
||||||
/// \return On success, number of bytes read is returned. On end of
|
/// \return On success, number of bytes read is returned. On end of
|
||||||
/// file zero is returned and pair->src_eof set to true.
|
/// file zero is returned and pair->src_eof set to true.
|
||||||
|
@ -172,7 +172,7 @@ extern bool io_pread(file_pair *pair, io_buf *buf, size_t size, uint64_t pos);
|
||||||
///
|
///
|
||||||
/// \param pair File pair having the destination file open for writing
|
/// \param pair File pair having the destination file open for writing
|
||||||
/// \param buf Buffer containing the data to be written
|
/// \param buf Buffer containing the data to be written
|
||||||
/// \param size Size of the buffer; assumed be smaller than SSIZE_MAX
|
/// \param size Size of the buffer; must be at most IO_BUFFER_SIZE
|
||||||
///
|
///
|
||||||
/// \return On success, zero is returned. On error, -1 is returned
|
/// \return On success, zero is returned. On error, -1 is returned
|
||||||
/// and error message printed.
|
/// and error message printed.
|
||||||
|
|
Loading…
Reference in a new issue