summaryrefslogtreecommitdiff
path: root/util-linux/volume_id
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/volume_id
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/volume_id')
-rw-r--r--util-linux/volume_id/fat.c18
-rw-r--r--util-linux/volume_id/unused_msdos.c6
2 files changed, 16 insertions, 8 deletions
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;