ChangeLog, block.c:
block.c: Readibility tweak in conditionals involving ctx->fs->flags.
diff --git a/lib/ext2fs/ChangeLog b/lib/ext2fs/ChangeLog
index 92bfa82..4c99006 100644
--- a/lib/ext2fs/ChangeLog
+++ b/lib/ext2fs/ChangeLog
@@ -1,5 +1,8 @@
2000-04-03 Theodore Ts'o <tytso@valinux.com>
+ * block.c: Readibility tweak in conditionals involving
+ ctx->fs->flags.
+
* ext2fs.h: Use AUTOCONF SIZEOF_* macros if available to determine
how to define __s64 and __u64. Turn off "compression is
experimental" warning if the cpp macro
diff --git a/lib/ext2fs/block.c b/lib/ext2fs/block.c
index 91b5c4c..03357b1 100644
--- a/lib/ext2fs/block.c
+++ b/lib/ext2fs/block.c
@@ -70,8 +70,8 @@
ret |= BLOCK_ERROR;
return ret;
}
- if ((ctx->fs->flags & EXT2_FLAG_SWAP_BYTES) ||
- (ctx->fs->flags & EXT2_FLAG_SWAP_BYTES_READ)) {
+ if (ctx->fs->flags & (EXT2_FLAG_SWAP_BYTES |
+ EXT2_FLAG_SWAP_BYTES_READ)) {
block_nr = (blk_t *) ctx->ind_buf;
for (i = 0; i < limit; i++, block_nr++)
*block_nr = ext2fs_swab32(*block_nr);
@@ -106,8 +106,8 @@
}
}
if (changed & BLOCK_CHANGED) {
- if ((ctx->fs->flags & EXT2_FLAG_SWAP_BYTES) ||
- (ctx->fs->flags & EXT2_FLAG_SWAP_BYTES_WRITE)) {
+ if (ctx->fs->flags & (EXT2_FLAG_SWAP_BYTES |
+ EXT2_FLAG_SWAP_BYTES_WRITE)) {
block_nr = (blk_t *) ctx->ind_buf;
for (i = 0; i < limit; i++, block_nr++)
*block_nr = ext2fs_swab32(*block_nr);
@@ -134,8 +134,8 @@
blk_t *block_nr;
limit = ctx->fs->blocksize >> 2;
- if (!(ctx->flags & BLOCK_FLAG_DEPTH_TRAVERSE) &&
- !(ctx->flags & BLOCK_FLAG_DATA_ONLY))
+ if (!(ctx->flags & (BLOCK_FLAG_DEPTH_TRAVERSE |
+ BLOCK_FLAG_DATA_ONLY)))
ret = (*ctx->func)(ctx->fs, dind_block,
BLOCK_COUNT_DIND, ref_block,
ref_offset, ctx->priv_data);
@@ -155,8 +155,8 @@
ret |= BLOCK_ERROR;
return ret;
}
- if ((ctx->fs->flags & EXT2_FLAG_SWAP_BYTES) ||
- (ctx->fs->flags & EXT2_FLAG_SWAP_BYTES_READ)) {
+ if (ctx->fs->flags & (EXT2_FLAG_SWAP_BYTES |
+ EXT2_FLAG_SWAP_BYTES_READ)) {
block_nr = (blk_t *) ctx->dind_buf;
for (i = 0; i < limit; i++, block_nr++)
*block_nr = ext2fs_swab32(*block_nr);
@@ -193,8 +193,8 @@
}
}
if (changed & BLOCK_CHANGED) {
- if ((ctx->fs->flags & EXT2_FLAG_SWAP_BYTES) ||
- (ctx->fs->flags & EXT2_FLAG_SWAP_BYTES_WRITE)) {
+ if (ctx->fs->flags & (EXT2_FLAG_SWAP_BYTES |
+ EXT2_FLAG_SWAP_BYTES_WRITE)) {
block_nr = (blk_t *) ctx->dind_buf;
for (i = 0; i < limit; i++, block_nr++)
*block_nr = ext2fs_swab32(*block_nr);
@@ -221,8 +221,8 @@
blk_t *block_nr;
limit = ctx->fs->blocksize >> 2;
- if (!(ctx->flags & BLOCK_FLAG_DEPTH_TRAVERSE) &&
- !(ctx->flags & BLOCK_FLAG_DATA_ONLY))
+ if (!(ctx->flags & (BLOCK_FLAG_DEPTH_TRAVERSE |
+ BLOCK_FLAG_DATA_ONLY)))
ret = (*ctx->func)(ctx->fs, tind_block,
BLOCK_COUNT_TIND, ref_block,
ref_offset, ctx->priv_data);
@@ -242,8 +242,8 @@
ret |= BLOCK_ERROR;
return ret;
}
- if ((ctx->fs->flags & EXT2_FLAG_SWAP_BYTES) ||
- (ctx->fs->flags & EXT2_FLAG_SWAP_BYTES_READ)) {
+ if (ctx->fs->flags & (EXT2_FLAG_SWAP_BYTES |
+ EXT2_FLAG_SWAP_BYTES_READ)) {
block_nr = (blk_t *) ctx->tind_buf;
for (i = 0; i < limit; i++, block_nr++)
*block_nr = ext2fs_swab32(*block_nr);
@@ -280,8 +280,8 @@
}
}
if (changed & BLOCK_CHANGED) {
- if ((ctx->fs->flags & EXT2_FLAG_SWAP_BYTES) ||
- (ctx->fs->flags & EXT2_FLAG_SWAP_BYTES_WRITE)) {
+ if (ctx->fs->flags & (EXT2_FLAG_SWAP_BYTES |
+ EXT2_FLAG_SWAP_BYTES_WRITE)) {
block_nr = (blk_t *) ctx->tind_buf;
for (i = 0; i < limit; i++, block_nr++)
*block_nr = ext2fs_swab32(*block_nr);