From 4813a5210f6fb979d8f7a592f71a2f9c4d3db179 Mon Sep 17 00:00:00 2001 From: Sami Kerola Date: Sat, 9 Feb 2019 09:34:52 +0000 Subject: various: fix 'uninitialized when used' warnings [clang] This change fixes "warning: variable 'var' may be uninitialized when used here [-Wconditional-uninitialized]" warnings reported in various files. Signed-off-by: Sami Kerola --- libblkid/src/partitions/dos.c | 2 +- libblkid/src/partitions/partitions.c | 2 +- libblkid/src/superblocks/ddf_raid.c | 2 +- libblkid/src/superblocks/hfs.c | 2 +- libblkid/src/superblocks/zfs.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'libblkid') diff --git a/libblkid/src/partitions/dos.c b/libblkid/src/partitions/dos.c index 659ca9a16..6c1b519f7 100644 --- a/libblkid/src/partitions/dos.c +++ b/libblkid/src/partitions/dos.c @@ -55,7 +55,7 @@ static int parse_dos_extended(blkid_probe pr, blkid_parttable tab, while (1) { struct dos_partition *p, *p0; - uint32_t start, size; + uint32_t start = 0, size; if (++ct_nodata > 100) return BLKID_PROBE_OK; diff --git a/libblkid/src/partitions/partitions.c b/libblkid/src/partitions/partitions.c index b5f393b99..299454765 100644 --- a/libblkid/src/partitions/partitions.c +++ b/libblkid/src/partitions/partitions.c @@ -1010,7 +1010,7 @@ blkid_partition blkid_partlist_get_partition_by_partno(blkid_partlist ls, int n) blkid_partition blkid_partlist_devno_to_partition(blkid_partlist ls, dev_t devno) { struct path_cxt *pc; - uint64_t start, size; + uint64_t start = 0, size; int i, rc, partno = 0; DBG(LOWPROBE, ul_debug("trying to convert devno 0x%llx to partition", diff --git a/libblkid/src/superblocks/ddf_raid.c b/libblkid/src/superblocks/ddf_raid.c index fc2c39d3e..0b82e73eb 100644 --- a/libblkid/src/superblocks/ddf_raid.c +++ b/libblkid/src/superblocks/ddf_raid.c @@ -78,7 +78,7 @@ static int probe_ddf(blkid_probe pr, size_t i; struct ddf_header *ddf = NULL; char version[DDF_REV_LENGTH + 1]; - uint64_t off, lba; + uint64_t off = 0, lba; if (pr->size < 0x30000) return 1; diff --git a/libblkid/src/superblocks/hfs.c b/libblkid/src/superblocks/hfs.c index 7b0117405..6f170a3cd 100644 --- a/libblkid/src/superblocks/hfs.c +++ b/libblkid/src/superblocks/hfs.c @@ -191,7 +191,7 @@ static int probe_hfsplus(blkid_probe pr, const struct blkid_idmag *mag) unsigned int off = 0; unsigned int blocksize; unsigned int cat_block; - unsigned int ext_block_start; + unsigned int ext_block_start = 0; unsigned int ext_block_count; unsigned int record_count; unsigned int leaf_node_head; diff --git a/libblkid/src/superblocks/zfs.c b/libblkid/src/superblocks/zfs.c index 1292b303b..4d4b46d55 100644 --- a/libblkid/src/superblocks/zfs.c +++ b/libblkid/src/superblocks/zfs.c @@ -218,7 +218,7 @@ static int probe_zfs(blkid_probe pr, const struct blkid_idmag *mag __attribute__((__unused__))) { int swab_endian = 0; - struct zfs_uberblock *ub; + struct zfs_uberblock *ub = NULL; loff_t offset = 0, ub_offset = 0; int label_no, found = 0, found_in_label; void *label; -- cgit v1.2.3-55-g7522