From: Tobias Stoeckmann <tobias@stoeckmann.org>
Date: Fri, 3 Apr 2026 08:12:18 +0000 (+0200)
Subject: debug: Introduce UL_DEBUG_ALL
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d9e24c605cf0f46fca6ebd9da881bd6c9eeddb2c;p=thirdparty%2Futil-linux.git

debug: Introduce UL_DEBUG_ALL

Use a common macro definition for all *_DEBUG_ALL definitions. Sometimes
they slightly differ, yet they always mean the same thing.

Unifying these definitions also helps when parsing the mask, since "all"
would be set to 0xFFFF in debug code if not overwritten by debug mask
names.

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

diff --git a/disk-utils/cfdisk.c b/disk-utils/cfdisk.c
index 16337fa5d..475597f8a 100644
--- a/disk-utils/cfdisk.c
+++ b/disk-utils/cfdisk.c
@@ -262,7 +262,6 @@ UL_DEBUG_DEFINE_MASKNAMES(cfdisk) = UL_DEBUG_EMPTY_MASKNAMES;
 #define CFDISK_DEBUG_MENU	(1 << 3)
 #define CFDISK_DEBUG_MISC	(1 << 4)
 #define CFDISK_DEBUG_TABLE	(1 << 5)
-#define CFDISK_DEBUG_ALL	0xFFFF
 
 #define DBG(m, x)       __UL_DBG(cfdisk, CFDISK_DEBUG_, m, x)
 
diff --git a/disk-utils/fdisk.h b/disk-utils/fdisk.h
index 72d36531f..f71d4bc14 100644
--- a/disk-utils/fdisk.h
+++ b/disk-utils/fdisk.h
@@ -32,7 +32,6 @@
 #define FDISKPROG_DEBUG_MENU	(1 << 3)
 #define FDISKPROG_DEBUG_MISC	(1 << 4)
 #define FDISKPROG_DEBUG_ASK	(1 << 5)
-#define FDISKPROG_DEBUG_ALL	0xFFFF
 
 extern int pwipemode;
 extern struct fdisk_table *original_layout;
diff --git a/disk-utils/sfdisk.c b/disk-utils/sfdisk.c
index aeab826c2..a29e7a765 100644
--- a/disk-utils/sfdisk.c
+++ b/disk-utils/sfdisk.c
@@ -65,7 +65,6 @@ UL_DEBUG_DEFINE_MASKNAMES(sfdisk) = UL_DEBUG_EMPTY_MASKNAMES;
 #define SFDISKPROG_DEBUG_PARSE	(1 << 2)
 #define SFDISKPROG_DEBUG_MISC	(1 << 3)
 #define SFDISKPROG_DEBUG_ASK	(1 << 4)
-#define SFDISKPROG_DEBUG_ALL	0xFFFF
 
 #define DBG(m, x)       __UL_DBG(sfdisk, SFDISKPROG_DEBUG_, m, x)
 #define ON_DBG(m, x)    __UL_DBG_CALL(sfdisk, SFDISKPROG_DEBUG_, m, x)
diff --git a/include/debug.h b/include/debug.h
index b34c065a9..fd53b676a 100644
--- a/include/debug.h
+++ b/include/debug.h
@@ -51,9 +51,10 @@ struct ul_debug_maskname {
 #define UL_DEBUG_MASK(m)         m ## _debug_mask
 #define UL_DEBUG_DEFINE_MASK(m)  int UL_DEBUG_MASK(m)
 #define UL_DEBUG_DECLARE_MASK(m) extern UL_DEBUG_DEFINE_MASK(m)
+#define UL_DEBUG_ALL             0xFFFFFF
 
 /*
- * Internal mask flags (above 0xffffff)
+ * Internal mask flags (above UL_DEBUG_ALL)
  */
 #define __UL_DEBUG_FL_NOADDR	(1 << 24)	/* Don't print object address */
 
diff --git a/lib/colors.c b/lib/colors.c
index 92afc9b96..630864f3a 100644
--- a/lib/colors.c
+++ b/lib/colors.c
@@ -55,7 +55,6 @@ UL_DEBUG_DEFINE_MASKNAMES(termcolors) = UL_DEBUG_EMPTY_MASKNAMES;
 #define TERMCOLORS_DEBUG_INIT	(1 << 1)
 #define TERMCOLORS_DEBUG_CONF	(1 << 2)
 #define TERMCOLORS_DEBUG_SCHEME	(1 << 3)
-#define TERMCOLORS_DEBUG_ALL	0xFFFF
 
 #define DBG(m, x)       __UL_DBG(termcolors, TERMCOLORS_DEBUG_, m, x)
 #define ON_DBG(m, x)    __UL_DBG_CALL(termcolors, TERMCOLORS_DEBUG_, m, x)
diff --git a/lib/debug.c b/lib/debug.c
index 5e7907d55..21829d75f 100644
--- a/lib/debug.c
+++ b/lib/debug.c
@@ -57,12 +57,12 @@ int ul_debug_parse_mask(const struct ul_debug_maskname flagnames[],
 				}
 			}
 			/* nothing else we can do by OR-ing the mask */
-			if (res == 0xffff)
+			if (res == UL_DEBUG_ALL)
 				break;
 		}
 		free(msbuf);
 	} else if (ptr && strcmp(ptr, "all") == 0)
-		res = 0xffff;
+		res = UL_DEBUG_ALL;
 
 	return res;
 }
diff --git a/lib/netaddrq.c b/lib/netaddrq.c
index 318544c43..cc8ca67ed 100644
--- a/lib/netaddrq.c
+++ b/lib/netaddrq.c
@@ -32,12 +32,10 @@ const int max_ifaces = 12;
 #define ULNETADDRQ_DEBUG_LIST	(1 << 3)
 #define ULNETADDRQ_DEBUG_BEST	(1 << 4)
 
-#define ULNETADDRQ_DEBUG_ALL	0x1F
-
 static UL_DEBUG_DEFINE_MASK(netaddrq);
 UL_DEBUG_DEFINE_MASKNAMES(netaddrq) =
 {
-	{ "all",   ULNETADDRQ_DEBUG_ALL,	"complete address processing" },
+	{ "all",   UL_DEBUG_ALL,		"complete address processing" },
 	{ "help",  ULNETADDRQ_DEBUG_HELP,	"this help" },
 	{ "addrq", ULNETADDRQ_DEBUG_ADDRQ,	"address rating" },
 	{ "list",  ULNETADDRQ_DEBUG_LIST,	"list processing" },
diff --git a/lib/netlink.c b/lib/netlink.c
index a65852c19..ab47f46dc 100644
--- a/lib/netlink.c
+++ b/lib/netlink.c
@@ -29,12 +29,10 @@
 #define ULNETLINK_DEBUG_NLMSG	(1 << 2)
 #define ULNETLINK_DEBUG_ADDR	(1 << 3)
 
-#define ULNETLINK_DEBUG_ALL	0x0F
-
 static UL_DEBUG_DEFINE_MASK(netlink);
 UL_DEBUG_DEFINE_MASKNAMES(netlink) =
 {
-	{ "all",   ULNETLINK_DEBUG_ALL,		"complete netlink debugging" },
+	{ "all",   UL_DEBUG_ALL,		"complete netlink debugging" },
 	{ "help",  ULNETLINK_DEBUG_HELP,	"this help" },
 	{ "nlmsg", ULNETLINK_DEBUG_NLMSG,	"netlink message debugging" },
 	{ "addr",  ULNETLINK_DEBUG_ADDR,	"netlink address processing" },
diff --git a/lib/pty-session.c b/lib/pty-session.c
index ea883ef6a..adbbef979 100644
--- a/lib/pty-session.c
+++ b/lib/pty-session.c
@@ -35,7 +35,6 @@ UL_DEBUG_DEFINE_MASKNAMES(ulpty) = UL_DEBUG_EMPTY_MASKNAMES;
 #define ULPTY_DEBUG_SIG		(1 << 3)
 #define ULPTY_DEBUG_IO		(1 << 4)
 #define ULPTY_DEBUG_DONE	(1 << 5)
-#define ULPTY_DEBUG_ALL		0xFFFF
 
 #define DBG(m, x)		__UL_DBG(ulpty, ULPTY_DEBUG_, m, x)
 #define DBG_OBJ(m, h, x)	__UL_DBG_OBJ(ulpty, ULPTY_DEBUG_, m, h, x)
diff --git a/libblkid/src/blkidP.h b/libblkid/src/blkidP.h
index f1bb3f8f5..4d738c0fd 100644
--- a/libblkid/src/blkidP.h
+++ b/libblkid/src/blkidP.h
@@ -349,7 +349,6 @@ struct blkid_struct_cache
 #define BLKID_DEBUG_SAVE	(1 << 11)
 #define BLKID_DEBUG_TAG		(1 << 12)
 #define BLKID_DEBUG_BUFFER	(1 << 13)
-#define BLKID_DEBUG_ALL		0xFFFF		/* (1 << 16) aka FFFF is expected by API */
 
 UL_DEBUG_DECLARE_MASK(libblkid);
 #define DBG(m, x)		__UL_DBG(libblkid, BLKID_DEBUG_, m, x)
diff --git a/libblkid/src/cache.c b/libblkid/src/cache.c
index 3b9641c6c..e82c80ca4 100644
--- a/libblkid/src/cache.c
+++ b/libblkid/src/cache.c
@@ -209,7 +209,7 @@ int main(int argc, char** argv)
 	blkid_cache cache = NULL;
 	int ret;
 
-	blkid_init_debug(BLKID_DEBUG_ALL);
+	blkid_init_debug(UL_DEBUG_ALL);
 
 	if ((argc > 2)) {
 		fprintf(stderr, "Usage: %s [filename] \n", argv[0]);
diff --git a/libblkid/src/config.c b/libblkid/src/config.c
index 39024b42e..4b5baab8e 100644
--- a/libblkid/src/config.c
+++ b/libblkid/src/config.c
@@ -274,7 +274,7 @@ int main(int argc, char *argv[])
 	struct blkid_config *conf;
 	char *filename = NULL;
 
-	blkid_init_debug(BLKID_DEBUG_ALL);
+	blkid_init_debug(UL_DEBUG_ALL);
 
 	if (argc == 2)
 		filename = argv[1];
diff --git a/libblkid/src/devname.c b/libblkid/src/devname.c
index b9717e23a..b7f3c3bf5 100644
--- a/libblkid/src/devname.c
+++ b/libblkid/src/devname.c
@@ -624,7 +624,7 @@ int main(int argc, char **argv)
 	blkid_cache cache = NULL;
 	int ret;
 
-	blkid_init_debug(BLKID_DEBUG_ALL);
+	blkid_init_debug(UL_DEBUG_ALL);
 	if (argc != 1) {
 		fprintf(stderr, "Usage: %s\n"
 			"Probe all devices and exit\n", argv[0]);
diff --git a/libblkid/src/devno.c b/libblkid/src/devno.c
index 2f39a11f3..b0f4f2ff1 100644
--- a/libblkid/src/devno.c
+++ b/libblkid/src/devno.c
@@ -328,7 +328,7 @@ int main(int argc, char** argv)
 	dev_t	devno, disk_devno;
 	const char *errmsg = "Couldn't parse %s: %s\n";
 
-	blkid_init_debug(BLKID_DEBUG_ALL);
+	blkid_init_debug(UL_DEBUG_ALL);
 	if ((argc != 2) && (argc != 3)) {
 		fprintf(stderr, "Usage:\t%s device_number\n\t%s major minor\n"
 			"Resolve a device number to a device name\n",
diff --git a/libblkid/src/init.c b/libblkid/src/init.c
index 172225faf..cc1da0dcc 100644
--- a/libblkid/src/init.c
+++ b/libblkid/src/init.c
@@ -18,7 +18,7 @@
 UL_DEBUG_DEFINE_MASK(libblkid);
 UL_DEBUG_DEFINE_MASKNAMES(libblkid) =
 {
-	{ "all", BLKID_DEBUG_ALL,	"info about all subsystems" },
+	{ "all", UL_DEBUG_ALL,		"info about all subsystems" },
 	{ "cache", BLKID_DEBUG_CACHE,	"blkid tags cache" },
 	{ "config", BLKID_DEBUG_CONFIG, "config file utils" },
 	{ "dev", BLKID_DEBUG_DEV,       "device utils" },
@@ -37,7 +37,7 @@ UL_DEBUG_DEFINE_MASKNAMES(libblkid) =
 
 /**
  * blkid_init_debug:
- * @mask: debug mask (0xffff to enable full debugging)
+ * @mask: debug mask (UL_DEBUG_ALL to enable full debugging)
  *
  * If the @mask is not specified then this function reads
  * LIBBLKID_DEBUG environment variable to get the mask.
diff --git a/libblkid/src/read.c b/libblkid/src/read.c
index d62edfae3..898ec3e4e 100644
--- a/libblkid/src/read.c
+++ b/libblkid/src/read.c
@@ -438,7 +438,7 @@ int main(int argc, char**argv)
 	blkid_cache cache = NULL;
 	int ret;
 
-	blkid_init_debug(BLKID_DEBUG_ALL);
+	blkid_init_debug(UL_DEBUG_ALL);
 	if (argc > 2) {
 		fprintf(stderr, "Usage: %s [filename]\n"
 			"Test parsing of the cache (filename)\n", argv[0]);
diff --git a/libblkid/src/resolve.c b/libblkid/src/resolve.c
index 16653fa8e..f54a4dc70 100644
--- a/libblkid/src/resolve.c
+++ b/libblkid/src/resolve.c
@@ -101,7 +101,7 @@ int main(int argc, char **argv)
 	char *value;
 	blkid_cache cache;
 
-	blkid_init_debug(BLKID_DEBUG_ALL);
+	blkid_init_debug(UL_DEBUG_ALL);
 	if (argc != 2 && argc != 3) {
 		fprintf(stderr, "Usage:\t%s tagname=value\n"
 			"\t%s tagname devname\n"
diff --git a/libblkid/src/save.c b/libblkid/src/save.c
index 295924e15..8031e984f 100644
--- a/libblkid/src/save.c
+++ b/libblkid/src/save.c
@@ -216,7 +216,7 @@ int main(int argc, char **argv)
 	blkid_cache cache = NULL;
 	int ret;
 
-	blkid_init_debug(BLKID_DEBUG_ALL);
+	blkid_init_debug(UL_DEBUG_ALL);
 	if (argc != 2) {
 		fprintf(stderr, "Usage: %s [filename]\n"
 			"Test loading/saving a cache (filename)\n", argv[0]);
diff --git a/libfdisk/src/fdiskP.h b/libfdisk/src/fdiskP.h
index 7927d85b4..d9a9d9666 100644
--- a/libfdisk/src/fdiskP.h
+++ b/libfdisk/src/fdiskP.h
@@ -42,7 +42,6 @@
 #define LIBFDISK_DEBUG_WIPE	(1 << 10)
 #define LIBFDISK_DEBUG_ITEM	(1 << 11)
 #define LIBFDISK_DEBUG_GPT	(1 << 12)
-#define LIBFDISK_DEBUG_ALL	0xFFFF
 
 UL_DEBUG_DECLARE_MASK(libfdisk);
 #define DBG(m, x)		__UL_DBG(libfdisk, LIBFDISK_DEBUG_, m, x)
diff --git a/libfdisk/src/init.c b/libfdisk/src/init.c
index 501a7d6d1..e2e82700d 100644
--- a/libfdisk/src/init.c
+++ b/libfdisk/src/init.c
@@ -12,7 +12,7 @@
 UL_DEBUG_DEFINE_MASK(libfdisk);
 UL_DEBUG_DEFINE_MASKNAMES(libfdisk) =
 {
-	{ "all",	LIBFDISK_DEBUG_ALL,	"info about all subsystems" },
+	{ "all",	UL_DEBUG_ALL,		"info about all subsystems" },
 	{ "ask",	LIBFDISK_DEBUG_ASK,	"fdisk dialogs" },
 	{ "help",	LIBFDISK_DEBUG_HELP,	"this help" },
 	{ "cxt",	LIBFDISK_DEBUG_CXT,	"library context (handler)" },
@@ -29,7 +29,7 @@ UL_DEBUG_DEFINE_MASKNAMES(libfdisk) =
 
 /**
  * fdisk_init_debug:
- * @mask: debug mask (0xffff to enable full debugging)
+ * @mask: debug mask (UL_DEBUG_ALL to enable full debugging)
  *
  * If the @mask is not specified then this function reads
  * LIBFDISK_DEBUG environment variable to get the mask.
diff --git a/libmount/src/init.c b/libmount/src/init.c
index 869be507f..9a6fbe6de 100644
--- a/libmount/src/init.c
+++ b/libmount/src/init.c
@@ -23,7 +23,7 @@
 UL_DEBUG_DEFINE_MASK(libmount);
 UL_DEBUG_DEFINE_MASKNAMES(libmount) =
 {
-	{ "all", MNT_DEBUG_ALL,		"info about all subsystems" },
+	{ "all", UL_DEBUG_ALL,		"info about all subsystems" },
 	{ "cache", MNT_DEBUG_CACHE,	"paths and tags cache" },
 	{ "cxt", MNT_DEBUG_CXT,		"library context (handler)" },
 	{ "diff", MNT_DEBUG_DIFF,	"mountinfo changes tracking" },
@@ -46,7 +46,7 @@ UL_DEBUG_DEFINE_MASKNAMES(libmount) =
 
 /**
  * mnt_init_debug:
- * @mask: debug mask (0xffff to enable full debugging)
+ * @mask: debug mask (UL_DEBUG_ALL to enable full debugging)
  *
  * If the @mask is not specified, then this function reads
  * the LIBMOUNT_DEBUG environment variable to get the mask.
diff --git a/libmount/src/mountP.h b/libmount/src/mountP.h
index 6b65909d3..2c5512c80 100644
--- a/libmount/src/mountP.h
+++ b/libmount/src/mountP.h
@@ -57,8 +57,6 @@
 #define MNT_DEBUG_OPTLIST	(1 << 16)
 #define MNT_DEBUG_STATMNT	(1 << 17)
 
-#define MNT_DEBUG_ALL		0xFFFFFF
-
 UL_DEBUG_DECLARE_MASK(libmount);
 #define DBG(m, x)		__UL_DBG(libmount, MNT_DEBUG_, m, x)
 #define DBG_OBJ(m, h, x)	__UL_DBG_OBJ(libmount, MNT_DEBUG_, m, h, x)
diff --git a/libsmartcols/src/init.c b/libsmartcols/src/init.c
index 5d5169184..03967f9dc 100644
--- a/libsmartcols/src/init.c
+++ b/libsmartcols/src/init.c
@@ -20,7 +20,7 @@
 UL_DEBUG_DEFINE_MASK(libsmartcols);
 UL_DEBUG_DEFINE_MASKNAMES(libsmartcols) =
 {
-	{ "all", SCOLS_DEBUG_ALL,	"info about all subsystems" },
+	{ "all", UL_DEBUG_ALL,		"info about all subsystems" },
 	{ "buff", SCOLS_DEBUG_BUFF,	"output buffer utils" },
 	{ "cell", SCOLS_DEBUG_CELL,	"table cell utils" },
 	{ "col", SCOLS_DEBUG_COL,	"cols utils" },
@@ -35,7 +35,7 @@ UL_DEBUG_DEFINE_MASKNAMES(libsmartcols) =
 
 /**
  * scols_init_debug:
- * @mask: debug mask (0xffff to enable full debugging)
+ * @mask: debug mask (UL_DEBUG_ALL to enable full debugging)
  *
  * If the @mask is not specified, then this function reads
  * the LIBSMARTCOLS_DEBUG environment variable to get the mask.
diff --git a/libsmartcols/src/smartcolsP.h b/libsmartcols/src/smartcolsP.h
index 2f4a50ddf..3df44bc2e 100644
--- a/libsmartcols/src/smartcolsP.h
+++ b/libsmartcols/src/smartcolsP.h
@@ -36,7 +36,6 @@
 #define SCOLS_DEBUG_GROUP	(1 << 7)
 #define SCOLS_DEBUG_FLTR	(1 << 8)
 #define SCOLS_DEBUG_FPARAM	(1 << 9)
-#define SCOLS_DEBUG_ALL		0xFFFF
 
 UL_DEBUG_DECLARE_MASK(libsmartcols);
 #define DBG(m, x)		__UL_DBG(libsmartcols, SCOLS_DEBUG_, m, x)
diff --git a/login-utils/su-common.c b/login-utils/su-common.c
index d7dd160dd..e030b04ad 100644
--- a/login-utils/su-common.c
+++ b/login-utils/su-common.c
@@ -83,7 +83,6 @@ UL_DEBUG_DEFINE_MASKNAMES(su) = UL_DEBUG_EMPTY_MASKNAMES;
 #define SU_DEBUG_MISC		(1 << 6)
 #define SU_DEBUG_SIG		(1 << 7)
 #define SU_DEBUG_PTY		(1 << 8)
-#define SU_DEBUG_ALL		0xFFFF
 
 #define DBG(m, x)       __UL_DBG(su, SU_DEBUG_, m, x)
 #define ON_DBG(m, x)    __UL_DBG_CALL(su, SU_DEBUG_, m, x)
diff --git a/lsfd-cmd/lsfd.h b/lsfd-cmd/lsfd.h
index 35b2bcd24..bb8f85bb8 100644
--- a/lsfd-cmd/lsfd.h
+++ b/lsfd-cmd/lsfd.h
@@ -47,7 +47,6 @@ UL_DEBUG_DECLARE_MASK(lsfd);
 
 #define LSFD_DEBUG_INIT	     (1 << 1)
 #define LSFD_DEBUG_ENDPOINTS (1 << 2)
-#define LSFD_DEBUG_ALL       0xFFFF
 
 #define DBG(m, x)       __UL_DBG(lsfd, LSFD_DEBUG_, m, x)
 
diff --git a/misc-utils/lsblk.h b/misc-utils/lsblk.h
index 709537c9d..79dbbef3d 100644
--- a/misc-utils/lsblk.h
+++ b/misc-utils/lsblk.h
@@ -24,7 +24,6 @@
 #define LSBLK_DEBUG_DEV		(1 << 3)
 #define LSBLK_DEBUG_TREE	(1 << 4)
 #define LSBLK_DEBUG_DEP		(1 << 5)
-#define LSBLK_DEBUG_ALL		0xFFFF
 
 UL_DEBUG_DECLARE_MASK(lsblk);
 #define DBG(m, x)		__UL_DBG(lsblk, LSBLK_DEBUG_, m, x)
diff --git a/misc-utils/whereis.c b/misc-utils/whereis.c
index 3062fc20f..d780140fc 100644
--- a/misc-utils/whereis.c
+++ b/misc-utils/whereis.c
@@ -71,7 +71,6 @@ UL_DEBUG_DEFINE_MASKNAMES(whereis) = UL_DEBUG_EMPTY_MASKNAMES;
 #define WHEREIS_DEBUG_SEARCH	(1 << 5)
 #define WHEREIS_DEBUG_STATIC	(1 << 6)
 #define WHEREIS_DEBUG_LIST	(1 << 7)
-#define WHEREIS_DEBUG_ALL	0xFFFF
 
 #define DBG(m, x)		__UL_DBG(whereis, WHEREIS_DEBUG_, m, x)
 #define DBG_OBJ(m, h, x)	__UL_DBG_OBJ(whereis, WHEREIS_DEBUG_, m, h, x)
diff --git a/sys-utils/hwclock.h b/sys-utils/hwclock.h
index 7073bc31c..66dc85da5 100644
--- a/sys-utils/hwclock.h
+++ b/sys-utils/hwclock.h
@@ -23,7 +23,6 @@
 #define HWCLOCK_DEBUG_INIT		(1 << 0)
 #define HWCLOCK_DEBUG_RANDOM_SLEEP	(1 << 1)
 #define HWCLOCK_DEBUG_DELTA_VS_TARGET	(1 << 2)
-#define HWCLOCK_DEBUG_ALL		0xFFFF
 
 UL_DEBUG_DECLARE_MASK(hwclock);
 #define DBG(m, x)	__UL_DBG(hwclock, HWCLOCK_DEBUG_, m, x)
diff --git a/sys-utils/lscpu.h b/sys-utils/lscpu.h
index c7ff03789..b01f081e8 100644
--- a/sys-utils/lscpu.h
+++ b/sys-utils/lscpu.h
@@ -31,7 +31,6 @@
 #define LSCPU_DEBUG_TYPE	(1 << 4)
 #define LSCPU_DEBUG_CPU		(1 << 5)
 #define LSCPU_DEBUG_VIRT	(1 << 6)
-#define LSBLK_DEBUG_ALL		0xFFFF
 
 UL_DEBUG_DECLARE_MASK(lscpu);
 #define DBG(m, x)		__UL_DBG(lscpu, LSCPU_DEBUG_, m, x)
diff --git a/sys-utils/lsns.c b/sys-utils/lsns.c
index c8ee3ceac..3d0e9db34 100644
--- a/sys-utils/lsns.c
+++ b/sys-utils/lsns.c
@@ -64,7 +64,6 @@ UL_DEBUG_DEFINE_MASKNAMES(lsns) = UL_DEBUG_EMPTY_MASKNAMES;
 #define LSNS_DEBUG_PROC		(1 << 2)
 #define LSNS_DEBUG_NS		(1 << 3)
 #define LSNS_DEBUG_FILTER	(1 << 4)
-#define LSNS_DEBUG_ALL		0xFFFF
 
 #define LSNS_NETNS_UNUSABLE -2
 
diff --git a/term-utils/script-playutils.h b/term-utils/script-playutils.h
index f3bce5fe4..b380fd442 100644
--- a/term-utils/script-playutils.h
+++ b/term-utils/script-playutils.h
@@ -10,7 +10,6 @@
 #define SCRIPTREPLAY_DEBUG_TIMING (1 << 2)
 #define SCRIPTREPLAY_DEBUG_LOG	(1 << 3)
 #define SCRIPTREPLAY_DEBUG_MISC	(1 << 4)
-#define SCRIPTREPLAY_DEBUG_ALL	0xFFFF
 
 UL_DEBUG_DECLARE_MASK(scriptreplay);
 
diff --git a/term-utils/script.c b/term-utils/script.c
index 4f4e911ff..c105f6aa2 100644
--- a/term-utils/script.c
+++ b/term-utils/script.c
@@ -80,7 +80,6 @@ UL_DEBUG_DEFINE_MASKNAMES(script) = UL_DEBUG_EMPTY_MASKNAMES;
 #define SCRIPT_DEBUG_IO		(1 << 3)
 #define SCRIPT_DEBUG_SIGNAL	(1 << 4)
 #define SCRIPT_DEBUG_MISC	(1 << 5)
-#define SCRIPT_DEBUG_ALL	0xFFFF
 
 #define DBG(m, x)       __UL_DBG(script, SCRIPT_DEBUG_, m, x)
 #define ON_DBG(m, x)    __UL_DBG_CALL(script, SCRIPT_DEBUG_, m, x)