From 33daef49b072f4aa7564fbbb80e7cab3629beecd Mon Sep 17 00:00:00 2001 From: Christian Taedcke Date: Wed, 15 Nov 2023 13:44:19 +0100 Subject: [PATCH] fs: fat: simplify gotos from read_bootsectandvi This simplifies the code a little bit. Signed-off-by: Christian Taedcke --- fs/fat/fat.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/fs/fat/fat.c b/fs/fat/fat.c index c368c3b076..77f225ccd8 100644 --- a/fs/fat/fat.c +++ b/fs/fat/fat.c @@ -531,7 +531,8 @@ read_bootsectandvi(boot_sector *bs, volume_info *volinfo, int *fatsize) if (disk_read(0, 1, block) < 0) { debug("Error: reading block\n"); - goto fail; + ret = -1; + goto out_free; } memcpy(bs, block, sizeof(boot_sector)); @@ -556,10 +557,8 @@ read_bootsectandvi(boot_sector *bs, volume_info *volinfo, int *fatsize) *fatsize = determine_legacy_fat_bits(bs); } memcpy(volinfo, vistart, sizeof(volume_info)); - goto exit; -fail: - ret = -1; -exit: + +out_free: free(block); return ret; } -- 2.39.5