From: Karel Zak <kzak@redhat.com>
Date: Tue, 30 Jun 2026 13:52:08 +0000 (+0200)
Subject: wipefs: use blkid_probe_open_device()
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=779fc7a8d78f22074a423dd81a1fcd54b350c13b;p=thirdparty%2Futil-linux.git

wipefs: use blkid_probe_open_device()

Convert wipefs new_probe() to use blkid_probe_open_device() instead
of open() + blkid_probe_set_device(). The flags argument allows
passing the open mode directly.

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

diff --git a/misc-utils/wipefs.c b/misc-utils/wipefs.c
index dad1ad277..c596d6f87 100644
--- a/misc-utils/wipefs.c
+++ b/misc-utils/wipefs.c
@@ -367,21 +367,11 @@ new_probe(const char *devname, int mode)
 	if (!devname)
 		return NULL;
 
-	if (mode) {
-		int fd = open(devname, mode | O_NONBLOCK);
-		if (fd < 0)
-			goto error;
-
-		pr = blkid_new_probe();
-		if (!pr || blkid_probe_set_device(pr, fd, 0, 0) != 0) {
-			close(fd);
-			goto error;
-		}
-	} else
-		pr = blkid_new_probe_from_filename(devname);
-
+	pr = blkid_new_probe();
 	if (!pr)
 		goto error;
+	if (blkid_probe_open_device(pr, devname, mode ? mode | O_NONBLOCK : 0))
+		goto error;
 
 	blkid_probe_enable_superblocks(pr, 1);
 	blkid_probe_set_superblocks_flags(pr,