summaryrefslogtreecommitdiffstats
path: root/libblkid/src
diff options
context:
space:
mode:
authorPali Rohár2017-07-05 13:46:12 +0200
committerPali Rohár2017-07-05 13:46:12 +0200
commit35b1ec3c4be3ef5c38b30d10c63237fa5220c276 (patch)
treedca42d8a31bbef5bb1daabe2ae2c1041de4e7c04 /libblkid/src
parentlibblkid: udf: De-duplicate code for dstring decoding (diff)
downloadkernel-qcow2-util-linux-35b1ec3c4be3ef5c38b30d10c63237fa5220c276.tar.gz
kernel-qcow2-util-linux-35b1ec3c4be3ef5c38b30d10c63237fa5220c276.tar.xz
kernel-qcow2-util-linux-35b1ec3c4be3ef5c38b30d10c63237fa5220c276.zip
libblkid: udf: Fix types
Diffstat (limited to 'libblkid/src')
-rw-r--r--libblkid/src/superblocks/udf.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/libblkid/src/superblocks/udf.c b/libblkid/src/superblocks/udf.c
index 74f3fd85d..0169d720c 100644
--- a/libblkid/src/superblocks/udf.c
+++ b/libblkid/src/superblocks/udf.c
@@ -136,13 +136,13 @@ static int probe_udf(blkid_probe pr,
{
struct volume_descriptor *vd;
struct volume_structure_descriptor *vsd;
- unsigned int bs;
- unsigned int pbs[5];
- unsigned int b;
- unsigned int type;
- unsigned int count;
- unsigned int loc;
- unsigned int i;
+ uint32_t bs;
+ uint32_t pbs[5];
+ uint32_t b;
+ uint16_t type;
+ uint32_t count;
+ uint32_t loc;
+ size_t i;
int have_label = 0;
int have_uuid = 0;
int have_logvolid = 0;
@@ -190,7 +190,7 @@ nsr:
anchor:
/* read Anchor Volume Descriptor (AVDP), checking block size */
- for (i = 0; i < 5; i++) {
+ for (i = 0; i < ARRAY_SIZE(pbs); i++) {
vd = (struct volume_descriptor *)
blkid_probe_get_buffer(pr, 256 * pbs[i], sizeof(*vd));
if (!vd)