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 16337fa5d1b2a3cd51d151ea04e6c7d9e40abb31..475597f8af7fe043a27a47ace2b8ec0c292d01d7 100644 (file)
--- 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 72d36531f8cd47b061b580e1f57bcf08efdb2a3e..f71d4bc1428cccbb196b75bf959b571eed590766 100644 (file)
--- 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 aeab826c277f82b93e60f74ee9d07c709a905bd3..a29e7a765dc1c212c960e5545ac5bda387327366 100644 (file)
--- 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 b34c065a997568ee5237bc63d11456fda6e62c6a..fd53b676a246d23dd1ffc651cdfcae33aa0f2a3b 100644 (file)
--- 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 92afc9b9629f6c7a7c29fd72497e3ada3b603a2a..630864f3a988d1b18d5b8d4cec72d1e2c036e427 100644 (file)
--- 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 5e7907d55f85b60d1f74973b62dffb0bff77f0fe..21829d75f76a9127cd1abfcd7295d8cbaede2ab9 100644 (file)
--- 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 318544c43a27e002cba8c101f21d198cdc2bc113..cc8ca67edefde5ba59cff2704f3c2b08998ffd05 100644 (file)
--- 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 a65852c19774f2c62de08002787aeaf81c05f37d..ab47f46dccc7d8d6eef7affd5172cdf63a2b331d 100644 (file)
--- 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 ea883ef6a4fd8c7d0b9cb570ca28e1ab04fa725f..adbbef979692067b8aae9bc1b17e4aef44983974 100644 (file)
--- 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 f1bb3f8f5cbeab75d76824934f49e7239fe2909f..4d738c0fd73b8e363f33fb840f113b5eb027636f 100644 (file)
--- 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 3b9641c6c9734e6d0051a02435dbc916a620fc76..e82c80ca4f4893a2e80898e247c70cd5f0dca549 100644 (file)
--- 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 39024b42e85a81a5cabd244be5ce5c16fa147ca0..4b5baab8e06bac56f989914e842dcda097a5cbc4 100644 (file)
--- 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 b9717e23ab23cc913293c94b6fd2ed6ef9fd1dd2..b7f3c3bf5abe51e409e486f6c1ca9d6269be7a38 100644 (file)
--- 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 2f39a11f3f50b089c5a6f375e510caf7b182c48e..b0f4f2ff10a49af77786e0415bf0b868a115c821 100644 (file)
--- 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 172225fafa1ee147298e3f304f87d9901f371d5a..cc1da0dcc2f5b6adb59747a309eaecc898bb7d5d 100644 (file)
--- 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 d62edfae3fc79b3812fcf21dfb85c7dcd428b796..898ec3e4ecc9e491222111620b1e19658479a35e 100644 (file)
--- 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 16653fa8e1d7b1afa3c703d516eb66764cfa5239..f54a4dc70de41f9c8d8b8d5e256d0126939dbbce 100644 (file)
--- 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 295924e15a8367b82137b3111b081fd678a56bf3..8031e984fd8b4fa62d9b3277ba1b412909c71f4f 100644 (file)
--- 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 7927d85b4ef2edefb6b3eeb368af7ac120d2a6fe..d9a9d96661553982bc126d0df95038e71d046125 100644 (file)
--- 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 501a7d6d11594cecee0ee42cbc1b267f87d7d8de..e2e82700de83a11f0f1c2dcd9945cf22930ace8c 100644 (file)
--- 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 869be507f4cb3f15e9011ba45e46c88d85769b64..9a6fbe6de18f9d914d90a4d545f5b10f9cc5d471 100644 (file)
--- 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 6b65909d34023673f6cfe39dfbc981e4e94aedbd..2c5512c807a4cb6419aba8d2e10063c0b568a253 100644 (file)
--- 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 5d51691841dfea7b7221f1049388015bbe910d0b..03967f9dcf1f9a625e6f751b1f83389c2867cf9f 100644 (file)
--- 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 2f4a50ddfac9252df4ad4e62fa3248cde5651330..3df44bc2eb80957d562f18af72176b174767da06 100644 (file)
--- 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 d7dd160dd5060095666961d142f6b1c2e98b68bf..e030b04ad9cee4c29cd4da134073a8f0c4f51084 100644 (file)
--- 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 35b2bcd24e510f6ab74745b6c9dd356280445740..bb8f85bb8ad312110c60ba2d11ba47bdcfd0aaf6 100644 (file)
--- 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 709537c9dbd96211375d4ee2b6c8a7d3491c342d..79dbbef3d4b3333993f92cbeff9aac73f70fb982 100644 (file)
--- 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 3062fc20f76c59b1084e8733d6199fc4e3de861e..d780140fccbccb7892c4c8a375ce3c065aa0089f 100644 (file)
--- 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 7073bc31c2edfc1bf31c24ad6514edf6344c2f8e..66dc85da55d3c1f19ab99af888516c19fe59edcf 100644 (file)
--- 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 c7ff037899eee9e7dc8cbf9d913fd12c17b64c18..b01f081e8c23639e4604f9f2e6f1a240e571b454 100644 (file)
--- 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 c8ee3ceacaf47dad4591ebf52e47111b040ac2e2..3d0e9db342c6803bcf3f01c01cf1c3895250b044 100644 (file)
--- 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 f3bce5fe4ffe13a3c3674d8b493fa2ee0893b2ea..b380fd442ca6a21a8de8d6eae11a3e14a609fa83 100644 (file)
--- 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 4f4e911ff60513904460b6231b2b6833cfe12f44..c105f6aa2611cb519270cb1230be2ad96517ca13 100644 (file)
--- 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)