From: Karel Zak <kzak@redhat.com>
Date: Tue, 19 May 2026 08:28:21 +0000 (+0200)
Subject: libblkid: (dasd) remove unnecessary 'rc' variable
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=da633e98174500bb3b11d64f189922108644788a;p=thirdparty%2Futil-linux.git

libblkid: (dasd) remove unnecessary 'rc' variable

Return probe results directly instead of storing in an
intermediate variable.

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/libblkid/src/partitions/dasd.c b/libblkid/src/partitions/dasd.c
index 92044eb22..c750a2d84 100644
--- a/libblkid/src/partitions/dasd.c
+++ b/libblkid/src/partitions/dasd.c
@@ -282,7 +282,6 @@ static int probe_dasd_pt(blkid_probe pr,
 	const struct dasd_volume_label_cdl *cdl = NULL;
 	const struct dasd_volume_label_ldl *ldl = NULL;
 	const char *magic;
-	int rc;
 	size_t i = 0;
 
 	blocksize = blkid_probe_get_sectorsize(pr);
@@ -375,11 +374,9 @@ static int probe_dasd_pt(blkid_probe pr,
 	blkid_parttable_set_id(tab, (unsigned char *) volser);
 
 	if (is_cdl)
-		rc = probe_dasd_pt_cdl(pr, ls, tab, blocksize);
-	else
-		rc = probe_dasd_pt_ldl(pr, ls, tab, ldl, blocksize);
+		return probe_dasd_pt_cdl(pr, ls, tab, blocksize);
 
-	return rc;
+	return probe_dasd_pt_ldl(pr, ls, tab, ldl, blocksize);
 }
 
 const struct blkid_idinfo dasd_pt_idinfo =