vitalif
/
e2fsprogs
mirror of https://github.com/vitalif/e2fsprogs
1
0
Fork 0
Code Issues Releases Wiki Activity

ChangeLog, block.c: 

block.c: Readibility tweak in conditionals involving ctx->fs->flags.
bitmap-optimize
Theodore Ts'o 2000-04-03 13:51:00 +00:00
parent 906e1f1866
commit 06af47f0e8
2 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/ext2fs/ChangeLog
View File

@ -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

32
lib/ext2fs/block.c
View File

@ -70,8 +70,8 @@ static int block_iterate_ind(blk_t *ind_block, blk_t ref_block,
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 @@ static int block_iterate_ind(blk_t *ind_block, blk_t ref_block,
}
}
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 @@ static int block_iterate_dind(blk_t *dind_block, blk_t ref_block,
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 @@ static int block_iterate_dind(blk_t *dind_block, blk_t ref_block,
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 @@ static int block_iterate_dind(blk_t *dind_block, blk_t ref_block,
}
}
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 @@ static int block_iterate_tind(blk_t *tind_block, blk_t ref_block,
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 @@ static int block_iterate_tind(blk_t *tind_block, blk_t ref_block,
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 @@ static int block_iterate_tind(blk_t *tind_block, blk_t ref_block,
}
}
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);