From dd8140ae79de87f72a956c0806e303984e827c6b Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Tue, 21 Feb 2006 19:14:43 +0100 Subject: [PATCH] volume_id: add missing return --- extras/volume_id/libvolume_id/volume_id.c | 68 ++++++++++++----------- extras/volume_id/libvolume_id/volume_id.h | 2 +- 2 files changed, 36 insertions(+), 34 deletions(-) diff --git a/extras/volume_id/libvolume_id/volume_id.c b/extras/volume_id/libvolume_id/volume_id.c index 1daf1cbd7..6a900ab28 100644 --- a/extras/volume_id/libvolume_id/volume_id.c +++ b/extras/volume_id/libvolume_id/volume_id.c @@ -39,40 +39,42 @@ int volume_id_probe_raid(struct volume_id *id, uint64_t off, uint64_t size) /* probe for raid first, cause fs probes may be successful on raid members */ if (size) { if (volume_id_probe_linux_raid(id, off, size) == 0) - goto exit; + goto found; if (volume_id_probe_intel_software_raid(id, off, size) == 0) - goto exit; + goto found; if (volume_id_probe_lsi_mega_raid(id, off, size) == 0) - goto exit; + goto found; if (volume_id_probe_via_raid(id, off, size) == 0) - goto exit; + goto found; if (volume_id_probe_silicon_medley_raid(id, off, size) == 0) - goto exit; + goto found; if (volume_id_probe_nvidia_raid(id, off, size) == 0) - goto exit; + goto found; if (volume_id_probe_promise_fasttrack_raid(id, off, size) == 0) - goto exit; + goto found; if (volume_id_probe_highpoint_45x_raid(id, off, size) == 0) - goto exit; + goto found; } if (volume_id_probe_lvm1(id, off) == 0) - goto exit; + goto found; if (volume_id_probe_lvm2(id, off) == 0) - goto exit; + goto found; if (volume_id_probe_highpoint_37x_raid(id, off) == 0) - goto exit; + goto found; -exit: + return -1; + +found: /* If recognized, we free the allocated buffers */ volume_id_free_buffer(id); return 0; @@ -84,72 +86,72 @@ int volume_id_probe_filesystem(struct volume_id *id, uint64_t off, uint64_t size return -EINVAL; if (volume_id_probe_luks(id, off) == 0) - goto exit; + goto found; /* signature in the first block, only small buffer needed */ if (volume_id_probe_vfat(id, off) == 0) - goto exit; + goto found; if (volume_id_probe_xfs(id, off) == 0) - goto exit; + goto found; /* fill buffer with maximum */ volume_id_get_buffer(id, 0, SB_BUFFER_SIZE); if (volume_id_probe_linux_swap(id, off) == 0) - goto exit; + goto found; if (volume_id_probe_ext(id, off) == 0) - goto exit; + goto found; if (volume_id_probe_reiserfs(id, off) == 0) - goto exit; + goto found; if (volume_id_probe_jfs(id, off) == 0) - goto exit; + goto found; if (volume_id_probe_udf(id, off) == 0) - goto exit; + goto found; if (volume_id_probe_iso9660(id, off) == 0) - goto exit; + goto found; if (volume_id_probe_hfs_hfsplus(id, off) == 0) - goto exit; + goto found; if (volume_id_probe_ufs(id, off) == 0) - goto exit; + goto found; if (volume_id_probe_ntfs(id, off) == 0) - goto exit; + goto found; if (volume_id_probe_cramfs(id, off) == 0) - goto exit; + goto found; if (volume_id_probe_romfs(id, off) == 0) - goto exit; + goto found; if (volume_id_probe_hpfs(id, off) == 0) - goto exit; + goto found; if (volume_id_probe_sysv(id, off) == 0) - goto exit; + goto found; if (volume_id_probe_minix(id, off) == 0) - goto exit; + goto found; if (volume_id_probe_ocfs1(id, off) == 0) - goto exit; + goto found; if (volume_id_probe_ocfs2(id, off) == 0) - goto exit; + goto found; if (volume_id_probe_vxfs(id, off) == 0) - goto exit; + goto found; return -1; -exit: +found: /* If recognized, we free the allocated buffers */ volume_id_free_buffer(id); return 0; diff --git a/extras/volume_id/libvolume_id/volume_id.h b/extras/volume_id/libvolume_id/volume_id.h index 2caf75f53..78baf5982 100644 --- a/extras/volume_id/libvolume_id/volume_id.h +++ b/extras/volume_id/libvolume_id/volume_id.h @@ -14,7 +14,7 @@ #include #include -#define VOLUME_ID_VERSION 57 +#define VOLUME_ID_VERSION 58 #ifndef PACKED #define PACKED __attribute__((packed)) -- 2.30.2