aboutsummaryrefslogtreecommitdiff
path: root/util-linux
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2010-01-28 02:24:24 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2010-01-28 02:24:24 +0100
commit6b9f1633537e2ff06eb1a0741e4598a294f40fcb (patch)
treea13f4f3558c2988bc95b5a59c9996da64a0bd570 /util-linux
parent17323a6245597f16321e6bf99536ae9bb89c79cf (diff)
downloadbusybox-w32-6b9f1633537e2ff06eb1a0741e4598a294f40fcb.tar.gz
busybox-w32-6b9f1633537e2ff06eb1a0741e4598a294f40fcb.tar.bz2
busybox-w32-6b9f1633537e2ff06eb1a0741e4598a294f40fcb.zip
*: style fixes. no code changes (verified with objdump)
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'util-linux')
-rw-r--r--util-linux/fsck_minix.c8
-rw-r--r--util-linux/mount.c8
-rw-r--r--util-linux/readprofile.c6
-rw-r--r--util-linux/volume_id/fat.c18
-rw-r--r--util-linux/volume_id/unused_msdos.c6
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)
898 if (inode_count[i] > 1) /* have we counted this file already? */ 898 if (inode_count[i] > 1) /* have we counted this file already? */
899 return; 899 return;
900 inode = Inode1 + i; 900 inode = Inode1 + i;
901 if (!S_ISDIR(inode->i_mode) && !S_ISREG(inode->i_mode) && 901 if (!S_ISDIR(inode->i_mode)
902 !S_ISLNK(inode->i_mode)) return; 902 && !S_ISREG(inode->i_mode)
903 && !S_ISLNK(inode->i_mode)
904 ) {
905 return;
906 }
903 for (i = 0; i < 7; i++) 907 for (i = 0; i < 7; i++)
904 add_zone(i + inode->i_zone, &changed); 908 add_zone(i + inode->i_zone, &changed);
905 add_zone_ind(7 + inode->i_zone, &changed); 909 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,
907 goto next; 907 goto next;
908 if (version && version <= 2 && pmap->pml_map.pm_vers > 2) 908 if (version && version <= 2 && pmap->pml_map.pm_vers > 2)
909 goto next; 909 goto next;
910 if (pmap->pml_map.pm_vers > MAX_NFSPROT || 910 if (pmap->pml_map.pm_vers > MAX_NFSPROT
911 (proto && pm_mnt->pm_prot && pmap->pml_map.pm_prot != proto) || 911 || (proto && pm_mnt->pm_prot && pmap->pml_map.pm_prot != proto)
912 (port && pmap->pml_map.pm_port != port)) 912 || (port && pmap->pml_map.pm_port != port)
913 ) {
913 goto next; 914 goto next;
915 }
914 memcpy(pm_mnt, &pmap->pml_map, sizeof(*pm_mnt)); 916 memcpy(pm_mnt, &pmap->pml_map, sizeof(*pm_mnt));
915 next: 917 next:
916 pmap = pmap->pml_next; 918 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)
176 /* ignore any LEADING (before a '[tT]' symbol is found) 176 /* ignore any LEADING (before a '[tT]' symbol is found)
177 Absolute symbols */ 177 Absolute symbols */
178 if ((*mode == 'A' || *mode == '?') && total == 0) continue; 178 if ((*mode == 'A' || *mode == '?') && total == 0) continue;
179 if (*mode != 'T' && *mode != 't' && 179 if (*mode != 'T' && *mode != 't'
180 *mode != 'W' && *mode != 'w') 180 && *mode != 'W' && *mode != 'w'
181 ) {
181 break; /* only text is profiled */ 182 break; /* only text is profiled */
183 }
182 184
183 if (indx >= len / sizeof(*buf)) 185 if (indx >= len / sizeof(*buf))
184 bb_error_msg_and_die("profile address out of range. " 186 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
173 */ 173 */
174 174
175 /* boot jump address check */ 175 /* boot jump address check */
176 if ((vs->boot_jump[0] != 0xeb || vs->boot_jump[2] != 0x90) && 176 if ((vs->boot_jump[0] != 0xeb || vs->boot_jump[2] != 0x90)
177 vs->boot_jump[0] != 0xe9) 177 && vs->boot_jump[0] != 0xe9
178 ) {
178 return -1; 179 return -1;
180 }
179 181
180 /* heads check */ 182 /* heads check */
181 if (vs->heads == 0) 183 if (vs->heads == 0)
182 return -1; 184 return -1;
183 185
184 /* cluster size check */ 186 /* cluster size check */
185 if (vs->sectors_per_cluster == 0 || 187 if (vs->sectors_per_cluster == 0
186 (vs->sectors_per_cluster & (vs->sectors_per_cluster-1))) 188 || (vs->sectors_per_cluster & (vs->sectors_per_cluster-1))
189 ) {
187 return -1; 190 return -1;
191 }
188 192
189 /* media check */ 193 /* media check */
190 if (vs->media < 0xf8 && vs->media != 0xf0) 194 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
197 valid: 201 valid:
198 /* sector size check */ 202 /* sector size check */
199 sector_size_bytes = le16_to_cpu(vs->sector_size_bytes); 203 sector_size_bytes = le16_to_cpu(vs->sector_size_bytes);
200 if (sector_size_bytes != 0x200 && sector_size_bytes != 0x400 && 204 if (sector_size_bytes != 0x200 && sector_size_bytes != 0x400
201 sector_size_bytes != 0x800 && sector_size_bytes != 0x1000) 205 && sector_size_bytes != 0x800 && sector_size_bytes != 0x1000
206 ) {
202 return -1; 207 return -1;
208 }
203 209
204 dbg("sector_size_bytes 0x%x", sector_size_bytes); 210 dbg("sector_size_bytes 0x%x", sector_size_bytes);
205 dbg("sectors_per_cluster 0x%x", vs->sectors_per_cluster); 211 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
73 /* check flags on all entries for a valid partition table */ 73 /* check flags on all entries for a valid partition table */
74 part = (struct msdos_partition_entry*) &buf[MSDOS_PARTTABLE_OFFSET]; 74 part = (struct msdos_partition_entry*) &buf[MSDOS_PARTTABLE_OFFSET];
75 for (i = 0; i < 4; i++) { 75 for (i = 0; i < 4; i++) {
76 if (part[i].boot_ind != 0 && 76 if (part[i].boot_ind != 0
77 part[i].boot_ind != 0x80) 77 && part[i].boot_ind != 0x80
78 ) {
78 return -1; 79 return -1;
80 }
79 81
80 if (part[i].nr_sects != 0) 82 if (part[i].nr_sects != 0)
81 empty = 0; 83 empty = 0;