g/c now-unused debug subsystems

diff --git a/common/sudo_debug.c b/common/sudo_debug.c
index 92974bc7848c487985759f5f176d93e7411c053b..de98d0d9028e60d220a8dce6c215dc7e8a2a5047 100644 (file)
--- a/common/sudo_debug.c
+++ b/common/sudo_debug.c
@@ -77,7 +77,6 @@ const char *const sudo_debug_priorities[] = {
 /* Note: this must match the order in sudo_debug.h */
 const char *const sudo_debug_subsystems[] = {
     "main",
-    "memory",
     "args",
     "exec",
     "pty",
@@ -85,7 +84,6 @@ const char *const sudo_debug_subsystems[] = {
     "conv",
     "pcomm",
     "util",
-    "list",
     "netif",
     "audit",
     "edit",

diff --git a/include/sudo_debug.h b/include/sudo_debug.h
index 63f12c8adba31fb1401419458bea5c37333e0c82..81fbfac07da68b994742202bb09100ef72e1d7d5 100644 (file)
--- a/include/sudo_debug.h
+++ b/include/sudo_debug.h
@@ -45,31 +45,29 @@
  * Note: order must match sudo_debug_subsystems[]
  */
 #define SUDO_DEBUG_MAIN                (1<<4)  /* sudo main() */
-#define SUDO_DEBUG_MEMORY      (2<<4)  /* memory subsystems */
-#define SUDO_DEBUG_ARGS                (3<<4)  /* command line argument processing */
-#define SUDO_DEBUG_EXEC                (4<<4)  /* command execution */
-#define SUDO_DEBUG_PTY         (5<<4)  /* pseudo-tty */
-#define SUDO_DEBUG_UTMP                (6<<4)  /* utmp file ops */
-#define SUDO_DEBUG_CONV                (7<<4)  /* user conversation */
-#define SUDO_DEBUG_PCOMM       (8<<4)  /* plugin communications */
-#define SUDO_DEBUG_UTIL                (9<<4)  /* utility functions */
-#define SUDO_DEBUG_LIST                (10<<4) /* linked list functions */
-#define SUDO_DEBUG_NETIF       (11<<4) /* network interface functions */
-#define SUDO_DEBUG_AUDIT       (12<<4) /* audit */
-#define SUDO_DEBUG_EDIT                (13<<4) /* sudoedit */
-#define SUDO_DEBUG_SELINUX     (14<<4) /* selinux */
-#define SUDO_DEBUG_LDAP                (15<<4) /* sudoers LDAP */
-#define SUDO_DEBUG_MATCH       (16<<4) /* sudoers matching */
-#define SUDO_DEBUG_PARSER      (17<<4) /* sudoers parser */
-#define SUDO_DEBUG_ALIAS       (18<<4) /* sudoers alias functions */
-#define SUDO_DEBUG_DEFAULTS    (19<<4) /* sudoers defaults settings */
-#define SUDO_DEBUG_AUTH                (20<<4) /* authentication functions */
-#define SUDO_DEBUG_ENV         (21<<4) /* environment handling */
-#define SUDO_DEBUG_LOGGING     (22<<4) /* logging functions */
-#define SUDO_DEBUG_NSS         (23<<4) /* network service switch */
-#define SUDO_DEBUG_RBTREE      (24<<4) /* red-black tree functions */
-#define SUDO_DEBUG_PERMS       (25<<4) /* uid/gid swapping functions */
-#define SUDO_DEBUG_PLUGIN      (26<<4) /* main plugin functions */
+#define SUDO_DEBUG_ARGS                (2<<4)  /* command line argument processing */
+#define SUDO_DEBUG_EXEC                (3<<4)  /* command execution */
+#define SUDO_DEBUG_PTY         (4<<4)  /* pseudo-tty */
+#define SUDO_DEBUG_UTMP                (5<<4)  /* utmp file ops */
+#define SUDO_DEBUG_CONV                (6<<4)  /* user conversation */
+#define SUDO_DEBUG_PCOMM       (7<<4)  /* plugin communications */
+#define SUDO_DEBUG_UTIL                (8<<4)  /* utility functions */
+#define SUDO_DEBUG_NETIF       (9<<4)  /* network interface functions */
+#define SUDO_DEBUG_AUDIT       (10<<4) /* audit */
+#define SUDO_DEBUG_EDIT                (11<<4) /* sudoedit */
+#define SUDO_DEBUG_SELINUX     (12<<4) /* selinux */
+#define SUDO_DEBUG_LDAP                (13<<4) /* sudoers LDAP */
+#define SUDO_DEBUG_MATCH       (14<<4) /* sudoers matching */
+#define SUDO_DEBUG_PARSER      (15<<4) /* sudoers parser */
+#define SUDO_DEBUG_ALIAS       (16<<4) /* sudoers alias functions */
+#define SUDO_DEBUG_DEFAULTS    (17<<4) /* sudoers defaults settings */
+#define SUDO_DEBUG_AUTH                (18<<4) /* authentication functions */
+#define SUDO_DEBUG_ENV         (19<<4) /* environment handling */
+#define SUDO_DEBUG_LOGGING     (20<<4) /* logging functions */
+#define SUDO_DEBUG_NSS         (21<<4) /* network service switch */
+#define SUDO_DEBUG_RBTREE      (22<<4) /* red-black tree functions */
+#define SUDO_DEBUG_PERMS       (23<<4) /* uid/gid swapping functions */
+#define SUDO_DEBUG_PLUGIN      (24<<4) /* main plugin functions */
 #define SUDO_DEBUG_ALL         0xfff0  /* all subsystems */
 
 /* Extract priority and convert to an index. */