Skip to content

Commit

Permalink
linting
Browse files Browse the repository at this point in the history
  • Loading branch information
BrianPugh committed Aug 20, 2023
1 parent 5caa83f commit d6c0c6a
Showing 1 changed file with 13 additions and 12 deletions.
25 changes: 13 additions & 12 deletions lfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -1066,7 +1066,8 @@ static lfs_stag_t lfs_dir_fetchmatch(lfs_t *lfs,

// if either block address is invalid we return LFS_ERR_CORRUPT here,
// otherwise later writes to the pair could fail
if (lfs->block_count && (pair[0] >= lfs->block_count || pair[1] >= lfs->block_count)) {
if (lfs->block_count
&& (pair[0] >= lfs->block_count || pair[1] >= lfs->block_count)) {
return LFS_ERR_CORRUPT;
}

Expand Down Expand Up @@ -4415,17 +4416,17 @@ static int lfs_rawformat(lfs_t *lfs, const struct lfs_config *cfg) {
return err;
}

if(cfg->block_count == 0){
if (cfg->block_count == 0) {
// Attempt to read a (possibly) prior superblock
lfs_superblock_t superblock;
err = lfs_scan_for_superblock(lfs, &superblock);
if(err){
if (err) {
goto cleanup;
}
lfs->block_count = superblock.block_count;

err = lfs_validate_superblock(lfs, &superblock);
if(err){
if (err) {
goto cleanup;
}
}
Expand Down Expand Up @@ -4495,21 +4496,21 @@ static int lfs_rawmount(lfs_t *lfs, const struct lfs_config *cfg) {

lfs_superblock_t superblock;
err = lfs_scan_for_superblock(lfs, &superblock);
if(err) {
if (err) {
goto cleanup;
}

if(lfs->block_count == 0){
if (lfs->block_count == 0) {
lfs->block_count = superblock.block_count;
}

err = lfs_validate_superblock(lfs, &superblock);
if(err){
if (err) {
goto cleanup;
}

err = lfs_scan_for_state_updates(lfs);
if(err) {
if (err) {
goto cleanup;
}

Expand Down Expand Up @@ -5512,10 +5513,10 @@ static int lfs1_unmount(lfs_t *lfs) {
/// v1 migration ///
static int lfs_rawmigrate(lfs_t *lfs, const struct lfs_config *cfg) {
struct lfs1 lfs1;
if(cfg->block_count == 0){
// Indeterminate filesystem size not allowed for migration.
return LFS_ERR_INVAL;
}

// Indeterminate filesystem size not allowed for migration.
LFS_ASSERT(cfg->block_count != 0);

int err = lfs1_mount(lfs, &lfs1, cfg);
if (err) {
return err;
Expand Down

0 comments on commit d6c0c6a

Please sign in to comment.