mirror of
https://git.tukaani.org/xz.git
synced 2024-04-04 12:36:23 +02:00
xz: Silence warnings from -Wlogical-op.
Thanks to Evan Nemerson.
This commit is contained in:
parent
c83b7a0334
commit
1b0ac0c53c
1 changed files with 10 additions and 2 deletions
|
@ -45,6 +45,14 @@ static bool warn_fchown;
|
||||||
# define O_NOCTTY 0
|
# define O_NOCTTY 0
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// Using this macro to silence a warning from gcc -Wlogical-op.
|
||||||
|
#if EAGAIN == EWOULDBLOCK
|
||||||
|
# define IS_EAGAIN_OR_EWOULDBLOCK(e) ((e) == EAGAIN)
|
||||||
|
#else
|
||||||
|
# define IS_EAGAIN_OR_EWOULDBLOCK(e) \
|
||||||
|
((e) == EAGAIN || (e) == EWOULDBLOCK)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
typedef enum {
|
typedef enum {
|
||||||
IO_WAIT_MORE, // Reading or writing is possible.
|
IO_WAIT_MORE, // Reading or writing is possible.
|
||||||
|
@ -1102,7 +1110,7 @@ io_read(file_pair *pair, io_buf *buf_union, size_t size)
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifndef TUKLIB_DOSLIKE
|
#ifndef TUKLIB_DOSLIKE
|
||||||
if (errno == EAGAIN || errno == EWOULDBLOCK) {
|
if (IS_EAGAIN_OR_EWOULDBLOCK(errno)) {
|
||||||
const io_wait_ret ret = io_wait(pair,
|
const io_wait_ret ret = io_wait(pair,
|
||||||
mytime_get_flush_timeout(),
|
mytime_get_flush_timeout(),
|
||||||
true);
|
true);
|
||||||
|
@ -1190,7 +1198,7 @@ io_write_buf(file_pair *pair, const uint8_t *buf, size_t size)
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifndef TUKLIB_DOSLIKE
|
#ifndef TUKLIB_DOSLIKE
|
||||||
if (errno == EAGAIN || errno == EWOULDBLOCK) {
|
if (IS_EAGAIN_OR_EWOULDBLOCK(errno)) {
|
||||||
if (io_wait(pair, -1, false) == IO_WAIT_MORE)
|
if (io_wait(pair, -1, false) == IO_WAIT_MORE)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue