From: Tobias Stoeckmann <tobias@stoeckmann.org>
Date: Mon, 23 Mar 2026 12:17:31 +0000 (+0100)
Subject: debug: Remove ul_debugobj
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e5ad10e29db323bc5749f101839d5141ca1e998;p=thirdparty%2Futil-linux.git

debug: Remove ul_debugobj

Merge its functionality into ul_debug_prefix and use proper macros in
tools which still call it directly. This adjusts output, but makes it
actually more readable.

Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>
---

diff --git a/include/debug.h b/include/debug.h
index 1af2799cf..b34c065a9 100644
--- a/include/debug.h
+++ b/include/debug.h
@@ -112,7 +112,6 @@ struct ul_debug_maskname {
 
 extern void ul_debug(const char *mesg, ...)
 		__attribute__ ((__format__ (__printf__, 1, 2)));
-extern void ul_debugobj(const void *handler, int mask);
 extern void ul_debug_prefix(const char *lib, const char *flag,
 			    const void *handler, int mask);
 extern int ul_debug_parse_mask(const struct ul_debug_maskname flagnames[],
diff --git a/lib/debug.c b/lib/debug.c
index 4ec79a0e8..5e7907d55 100644
--- a/lib/debug.c
+++ b/lib/debug.c
@@ -20,17 +20,12 @@ void ul_debug(const char *mesg, ...)
 	fputc('\n', stderr);
 }
 
-void ul_debugobj(const void *handler, int mask)
-{
-	if (handler && !(mask & __UL_DEBUG_FL_NOADDR))
-		fprintf(stderr, "[%p]: ", handler);
-}
-
 void ul_debug_prefix(const char *lib, const char *flag,
 		     const void *handler, int mask)
 {
 	fprintf(stderr, "%d: %s: %8s: ", getpid(), lib, flag);
-	ul_debugobj(handler, mask);
+	if (handler && !(mask & __UL_DEBUG_FL_NOADDR))
+		fprintf(stderr, "[%p]: ", handler);
 }
 
 int ul_debug_parse_mask(const struct ul_debug_maskname flagnames[],
diff --git a/libfdisk/src/table.c b/libfdisk/src/table.c
index 9582eba70..8585ca054 100644
--- a/libfdisk/src/table.c
+++ b/libfdisk/src/table.c
@@ -341,15 +341,14 @@ void fdisk_debug_print_table(struct fdisk_table *tb)
 
 	fdisk_reset_iter(&itr, FDISK_ITER_FORWARD);
 	while (fdisk_table_next_partition(tb, &itr, &pa) == 0) {
-		ul_debugobj(tb, UL_DEBUG_MASK(libfdisk));
-		ul_debug("partition %p [partno=%zu, start=%ju, end=%ju, size=%ju%s%s%s] ",
+		DBG_OBJ(PART, tb, ul_debug("partition %p [partno=%zu, start=%ju, end=%ju, size=%ju%s%s%s] ",
 			    pa, pa->partno,
 			    (uintmax_t) fdisk_partition_get_start(pa),
 			    (uintmax_t) fdisk_partition_get_end(pa),
 			    (uintmax_t) fdisk_partition_get_size(pa),
 			    fdisk_partition_is_nested(pa) ? " nested" : "",
 			    fdisk_partition_is_freespace(pa) ? " freespace" : "",
-			    fdisk_partition_is_container(pa) ? " container" : "");
+			    fdisk_partition_is_container(pa) ? " container" : ""));
 	}
 
 }
diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c
index e041169b4..e9a5ae39b 100644
--- a/misc-utils/lsblk.c
+++ b/misc-utils/lsblk.c
@@ -1319,10 +1319,8 @@ static void device_to_scols(
 
 	DBG_OBJ(DEV, dev, ul_debug("add '%s' to scols", dev->name));
 	ON_DBG(DEV,
-		if (ul_path_isopen_dirfd(dev->sysfs)) {
-			ul_debugobj(dev, UL_DEBUG_MASK(lsblk));
-			ul_debug("%s ---> is open!", dev->name);
-		}
+		if (ul_path_isopen_dirfd(dev->sysfs))
+			DBG_OBJ(DEV, dev, ul_debug("%s ---> is open!", dev->name));
 	);
 
 	if (!parent && dev->wholedisk)