diff options
Diffstat (limited to 'util-linux')
| -rw-r--r-- | util-linux/fsck_minix.c | 8 | ||||
| -rw-r--r-- | util-linux/mount.c | 8 | ||||
| -rw-r--r-- | util-linux/readprofile.c | 6 | ||||
| -rw-r--r-- | util-linux/volume_id/fat.c | 18 | ||||
| -rw-r--r-- | util-linux/volume_id/unused_msdos.c | 6 |
5 files changed, 31 insertions, 15 deletions
diff --git a/util-linux/fsck_minix.c b/util-linux/fsck_minix.c index 18ea05fec..feece9920 100644 --- a/util-linux/fsck_minix.c +++ b/util-linux/fsck_minix.c @@ -898,8 +898,12 @@ static void check_zones(unsigned i) if (inode_count[i] > 1) /* have we counted this file already? */ return; inode = Inode1 + i; - if (!S_ISDIR(inode->i_mode) && !S_ISREG(inode->i_mode) && - !S_ISLNK(inode->i_mode)) return; + if (!S_ISDIR(inode->i_mode) + && !S_ISREG(inode->i_mode) + && !S_ISLNK(inode->i_mode) + ) { + return; + } for (i = 0; i < 7; i++) add_zone(i + inode->i_zone, &changed); add_zone_ind(7 + inode->i_zone, &changed); diff --git a/util-linux/mount.c b/util-linux/mount.c index 52ced7acd..23a345931 100644 --- a/util-linux/mount.c +++ b/util-linux/mount.c @@ -907,10 +907,12 @@ get_mountport(struct pmap *pm_mnt, goto next; if (version && version <= 2 && pmap->pml_map.pm_vers > 2) goto next; - if (pmap->pml_map.pm_vers > MAX_NFSPROT || - (proto && pm_mnt->pm_prot && pmap->pml_map.pm_prot != proto) || - (port && pmap->pml_map.pm_port != port)) + if (pmap->pml_map.pm_vers > MAX_NFSPROT + || (proto && pm_mnt->pm_prot && pmap->pml_map.pm_prot != proto) + || (port && pmap->pml_map.pm_port != port) + ) { goto next; + } memcpy(pm_mnt, &pmap->pml_map, sizeof(*pm_mnt)); next: pmap = pmap->pml_next; diff --git a/util-linux/readprofile.c b/util-linux/readprofile.c index 1f5ba2ecc..219654496 100644 --- a/util-linux/readprofile.c +++ b/util-linux/readprofile.c @@ -176,9 +176,11 @@ int readprofile_main(int argc UNUSED_PARAM, char **argv) /* ignore any LEADING (before a '[tT]' symbol is found) Absolute symbols */ if ((*mode == 'A' || *mode == '?') && total == 0) continue; - if (*mode != 'T' && *mode != 't' && - *mode != 'W' && *mode != 'w') + if (*mode != 'T' && *mode != 't' + && *mode != 'W' && *mode != 'w' + ) { break; /* only text is profiled */ + } if (indx >= len / sizeof(*buf)) bb_error_msg_and_die("profile address out of range. " diff --git a/util-linux/volume_id/fat.c b/util-linux/volume_id/fat.c index 6173ba9f0..b0f427c74 100644 --- a/util-linux/volume_id/fat.c +++ b/util-linux/volume_id/fat.c @@ -173,18 +173,22 @@ int FAST_FUNC volume_id_probe_vfat(struct volume_id *id /*,uint64_t fat_partitio */ /* boot jump address check */ - if ((vs->boot_jump[0] != 0xeb || vs->boot_jump[2] != 0x90) && - vs->boot_jump[0] != 0xe9) + if ((vs->boot_jump[0] != 0xeb || vs->boot_jump[2] != 0x90) + && vs->boot_jump[0] != 0xe9 + ) { return -1; + } /* heads check */ if (vs->heads == 0) return -1; /* cluster size check */ - if (vs->sectors_per_cluster == 0 || - (vs->sectors_per_cluster & (vs->sectors_per_cluster-1))) + if (vs->sectors_per_cluster == 0 + || (vs->sectors_per_cluster & (vs->sectors_per_cluster-1)) + ) { return -1; + } /* media check */ if (vs->media < 0xf8 && vs->media != 0xf0) @@ -197,9 +201,11 @@ int FAST_FUNC volume_id_probe_vfat(struct volume_id *id /*,uint64_t fat_partitio valid: /* sector size check */ sector_size_bytes = le16_to_cpu(vs->sector_size_bytes); - if (sector_size_bytes != 0x200 && sector_size_bytes != 0x400 && - sector_size_bytes != 0x800 && sector_size_bytes != 0x1000) + if (sector_size_bytes != 0x200 && sector_size_bytes != 0x400 + && sector_size_bytes != 0x800 && sector_size_bytes != 0x1000 + ) { return -1; + } dbg("sector_size_bytes 0x%x", sector_size_bytes); dbg("sectors_per_cluster 0x%x", vs->sectors_per_cluster); diff --git a/util-linux/volume_id/unused_msdos.c b/util-linux/volume_id/unused_msdos.c index ccec72c5e..65fb88501 100644 --- a/util-linux/volume_id/unused_msdos.c +++ b/util-linux/volume_id/unused_msdos.c @@ -73,9 +73,11 @@ int FAST_FUNC volume_id_probe_msdos_part_table(struct volume_id *id, uint64_t of /* check flags on all entries for a valid partition table */ part = (struct msdos_partition_entry*) &buf[MSDOS_PARTTABLE_OFFSET]; for (i = 0; i < 4; i++) { - if (part[i].boot_ind != 0 && - part[i].boot_ind != 0x80) + if (part[i].boot_ind != 0 + && part[i].boot_ind != 0x80 + ) { return -1; + } if (part[i].nr_sects != 0) empty = 0; |