diff options
Diffstat (limited to 'src/shared')
| -rw-r--r-- | src/shared/install.c | 2 | ||||
| -rw-r--r-- | src/shared/time-dst.c | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/shared/install.c b/src/shared/install.c index 1f9d7e2e3a..f57b94d599 100644 --- a/src/shared/install.c +++ b/src/shared/install.c @@ -469,8 +469,6 @@ static int find_symlinks_fd( return 1; } } - - return r; } static int find_symlinks( diff --git a/src/shared/time-dst.c b/src/shared/time-dst.c index 65e2998c98..ceca2fafae 100644 --- a/src/shared/time-dst.c +++ b/src/shared/time-dst.c @@ -207,8 +207,8 @@ read_again: if (type_idxs[i] >= num_types) return -EINVAL; - if ((BYTE_ORDER != BIG_ENDIAN && (sizeof(time_t) == 4 || trans_width == 4)) || - (BYTE_ORDER == BIG_ENDIAN && sizeof(time_t) == 8 && trans_width == 4)) { + if (BYTE_ORDER == BIG_ENDIAN ? sizeof(time_t) == 8 && trans_width == 4 + : sizeof(time_t) == 4 || trans_width == 4) { /* Decode the transition times, stored as 4-byte integers in network (big-endian) byte order. We work from the end of the array so as not to clobber the next element to be |