bus: remove static introspection file export

18 files changed, 16 insertions, 49 deletions

diff --git a/src/core/dbus-automount.c b/src/core/dbus-automount.c
index 060cbf7707..720f9ba6d1 100644
--- a/src/core/dbus-automount.c
+++ b/src/core/dbus-automount.c
@@ -47,7 +47,7 @@
         BUS_UNIT_INTERFACES_LIST                     \
         "org.freedesktop.systemd1.Automount\0"
 
-const char bus_automount_interface[] _introspect_("Automount") = BUS_AUTOMOUNT_INTERFACE;
+const char bus_automount_interface[] = BUS_AUTOMOUNT_INTERFACE;
 
 const char bus_automount_invalidating_properties[] =
         "Result\0";
diff --git a/src/core/dbus-device.c b/src/core/dbus-device.c
index dbd91fe3db..ef484a86b7 100644
--- a/src/core/dbus-device.c
+++ b/src/core/dbus-device.c
@@ -43,7 +43,7 @@
         BUS_UNIT_INTERFACES_LIST                     \
         "org.freedesktop.systemd1.Device\0"
 
-const char bus_device_interface[] _introspect_("Device") = BUS_DEVICE_INTERFACE;
+const char bus_device_interface[] = BUS_DEVICE_INTERFACE;
 
 const char bus_device_invalidating_properties[] =
         "SysFSPath\0";
diff --git a/src/core/dbus-job.c b/src/core/dbus-job.c
index eac2448915..e1d7504e85 100644
--- a/src/core/dbus-job.c
+++ b/src/core/dbus-job.c
@@ -45,7 +45,7 @@
         BUS_INTROSPECTABLE_INTERFACE                                  \
         "</node>\n"
 
-const char bus_job_interface[] _introspect_("Job") = BUS_JOB_INTERFACE;
+const char bus_job_interface[] = BUS_JOB_INTERFACE;
 
 #define INTERFACES_LIST                              \
         BUS_GENERIC_INTERFACES_LIST                  \
diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c
index 8f4d01737a..46f55d088b 100644
--- a/src/core/dbus-manager.c
+++ b/src/core/dbus-manager.c
@@ -321,7 +321,7 @@
         BUS_GENERIC_INTERFACES_LIST                  \
         "org.freedesktop.systemd1.Manager\0"
 
-const char bus_manager_interface[] _introspect_("Manager") = BUS_MANAGER_INTERFACE;
+const char bus_manager_interface[] = BUS_MANAGER_INTERFACE;
 
 static DEFINE_BUS_PROPERTY_APPEND_ENUM(bus_manager_append_exec_output, exec_output, ExecOutput);
 
diff --git a/src/core/dbus-mount.c b/src/core/dbus-mount.c
index 72e187063c..70b2d48330 100644
--- a/src/core/dbus-mount.c
+++ b/src/core/dbus-mount.c
@@ -62,7 +62,7 @@
         BUS_UNIT_INTERFACES_LIST                     \
         "org.freedesktop.systemd1.Mount\0"
 
-const char bus_mount_interface[] _introspect_("Mount") = BUS_MOUNT_INTERFACE;
+const char bus_mount_interface[] = BUS_MOUNT_INTERFACE;
 
 const char bus_mount_invalidating_properties[] =
         "What\0"
diff --git a/src/core/dbus-path.c b/src/core/dbus-path.c
index 1e62083d9b..a523b81446 100644
--- a/src/core/dbus-path.c
+++ b/src/core/dbus-path.c
@@ -50,7 +50,7 @@
         BUS_UNIT_INTERFACES_LIST                     \
         "org.freedesktop.systemd1.Path\0"
 
-const char bus_path_interface[] _introspect_("Path") = BUS_PATH_INTERFACE;
+const char bus_path_interface[] = BUS_PATH_INTERFACE;
 
 const char bus_path_invalidating_properties[] =
         "Result\0";
diff --git a/src/core/dbus-scope.c b/src/core/dbus-scope.c
index 783a969fb3..c790d26cfe 100644
--- a/src/core/dbus-scope.c
+++ b/src/core/dbus-scope.c
@@ -51,7 +51,7 @@
         BUS_UNIT_INTERFACES_LIST                     \
         "org.freedesktop.systemd1.Scope\0"
 
-const char bus_scope_interface[] _introspect_("Scope") = BUS_SCOPE_INTERFACE;
+const char bus_scope_interface[] = BUS_SCOPE_INTERFACE;
 
 static DEFINE_BUS_PROPERTY_APPEND_ENUM(bus_scope_append_scope_result, scope_result, ScopeResult);
 
diff --git a/src/core/dbus-service.c b/src/core/dbus-service.c
index 696c4462fe..c888570c4b 100644
--- a/src/core/dbus-service.c
+++ b/src/core/dbus-service.c
@@ -81,7 +81,7 @@
         BUS_UNIT_INTERFACES_LIST                     \
         "org.freedesktop.systemd1.Service\0"
 
-const char bus_service_interface[] _introspect_("Service") = BUS_SERVICE_INTERFACE;
+const char bus_service_interface[] = BUS_SERVICE_INTERFACE;
 
 const char bus_service_invalidating_properties[] =
         "ExecStartPre\0"
diff --git a/src/core/dbus-slice.c b/src/core/dbus-slice.c
index dac9fbdf5f..eeefcdbcd6 100644
--- a/src/core/dbus-slice.c
+++ b/src/core/dbus-slice.c
@@ -47,7 +47,7 @@
         BUS_UNIT_INTERFACES_LIST                     \
         "org.freedesktop.systemd1.Slice\0"
 
-const char bus_slice_interface[] _introspect_("Slice") = BUS_SLICE_INTERFACE;
+const char bus_slice_interface[] = BUS_SLICE_INTERFACE;
 
 DBusHandlerResult bus_slice_message_handler(Unit *u, DBusConnection *c, DBusMessage *message) {
         Slice *s = SLICE(u);
diff --git a/src/core/dbus-snapshot.c b/src/core/dbus-snapshot.c
index 2ae8574f59..9978df6022 100644
--- a/src/core/dbus-snapshot.c
+++ b/src/core/dbus-snapshot.c
@@ -44,7 +44,7 @@
         BUS_UNIT_INTERFACES_LIST                     \
         "org.freedesktop.systemd1.Snapshot\0"
 
-const char bus_snapshot_interface[] _introspect_("Snapshot") = BUS_SNAPSHOT_INTERFACE;
+const char bus_snapshot_interface[] = BUS_SNAPSHOT_INTERFACE;
 
 static const BusProperty bus_snapshot_properties[] = {
         { "Cleanup", bus_property_append_bool, "b", offsetof(Snapshot, cleanup) },
diff --git a/src/core/dbus-socket.c b/src/core/dbus-socket.c
index 30c4b6302c..60a8d0501c 100644
--- a/src/core/dbus-socket.c
+++ b/src/core/dbus-socket.c
@@ -87,7 +87,7 @@
         BUS_UNIT_INTERFACES_LIST                     \
         "org.freedesktop.systemd1.Socket\0"
 
-const char bus_socket_interface[] _introspect_("Socket") = BUS_SOCKET_INTERFACE;
+const char bus_socket_interface[] = BUS_SOCKET_INTERFACE;
 
 const char bus_socket_invalidating_properties[] =
         "ExecStartPre\0"
diff --git a/src/core/dbus-swap.c b/src/core/dbus-swap.c
index 06edfdcde4..0da86bd6fa 100644
--- a/src/core/dbus-swap.c
+++ b/src/core/dbus-swap.c
@@ -59,7 +59,7 @@
         BUS_UNIT_INTERFACES_LIST                     \
         "org.freedesktop.systemd1.Swap\0"
 
-const char bus_swap_interface[] _introspect_("Swap") = BUS_SWAP_INTERFACE;
+const char bus_swap_interface[] = BUS_SWAP_INTERFACE;
 
 const char bus_swap_invalidating_properties[] =
         "What\0"
diff --git a/src/core/dbus-target.c b/src/core/dbus-target.c
index 6a775506cc..f143d897fa 100644
--- a/src/core/dbus-target.c
+++ b/src/core/dbus-target.c
@@ -44,7 +44,7 @@
         BUS_UNIT_INTERFACES_LIST                     \
         "org.freedesktop.systemd1.Target\0"
 
-const char bus_target_interface[] _introspect_("Target") = BUS_TARGET_INTERFACE;
+const char bus_target_interface[] = BUS_TARGET_INTERFACE;
 
 DBusHandlerResult bus_target_message_handler(Unit *u, DBusConnection *c, DBusMessage *message) {
         const BusBoundProperties bps[] = {
diff --git a/src/core/dbus-timer.c b/src/core/dbus-timer.c
index 4082f7f9b9..c6f1dd9b7f 100644
--- a/src/core/dbus-timer.c
+++ b/src/core/dbus-timer.c
@@ -51,7 +51,7 @@
         BUS_UNIT_INTERFACES_LIST                     \
         "org.freedesktop.systemd1.Timer\0"
 
-const char bus_timer_interface[] _introspect_("Timer") = BUS_TIMER_INTERFACE;
+const char bus_timer_interface[] = BUS_TIMER_INTERFACE;
 
 const char bus_timer_invalidating_properties[] =
         "TimersMonotonic\0"
diff --git a/src/core/dbus-unit.c b/src/core/dbus-unit.c
index b6f5c39810..032915d14e 100644
--- a/src/core/dbus-unit.c
+++ b/src/core/dbus-unit.c
@@ -32,7 +32,7 @@
 #include "path-util.h"
 #include "fileio.h"
 
-const char bus_unit_interface[] _introspect_("Unit") = BUS_UNIT_INTERFACE;
+const char bus_unit_interface[] = BUS_UNIT_INTERFACE;
 
 #define INVALIDATING_PROPERTIES                 \
         "LoadState\0"                           \
diff --git a/src/core/main.c b/src/core/main.c
index fe291f8410..5d30893bf4 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -735,7 +735,6 @@ static int parse_argv(int argc, char *argv[]) {
                 ARG_SHOW_STATUS,
                 ARG_DESERIALIZE,
                 ARG_SWITCHED_ROOT,
-                ARG_INTROSPECT,
                 ARG_DEFAULT_STD_OUTPUT,
                 ARG_DEFAULT_STD_ERROR
         };
@@ -758,7 +757,6 @@ static int parse_argv(int argc, char *argv[]) {
                 { "show-status",              optional_argument, NULL, ARG_SHOW_STATUS              },
                 { "deserialize",              required_argument, NULL, ARG_DESERIALIZE              },
                 { "switched-root",            no_argument,       NULL, ARG_SWITCHED_ROOT            },
-                { "introspect",               optional_argument, NULL, ARG_INTROSPECT               },
                 { "default-standard-output",  required_argument, NULL, ARG_DEFAULT_STD_OUTPUT,      },
                 { "default-standard-error",   required_argument, NULL, ARG_DEFAULT_STD_ERROR,       },
                 { NULL,                       0,                 NULL, 0                            }
@@ -930,27 +928,6 @@ static int parse_argv(int argc, char *argv[]) {
                         arg_switched_root = true;
                         break;
 
-                case ARG_INTROSPECT: {
-                        const char * const * i = NULL;
-
-                        for (i = bus_interface_table; *i; i += 2)
-                                if (!optarg || streq(i[0], optarg)) {
-                                        fputs(DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE
-                                              "<node>\n", stdout);
-                                        fputs(i[1], stdout);
-                                        fputs("</node>\n", stdout);
-
-                                        if (optarg)
-                                                break;
-                                }
-
-                        if (!i[0] && optarg)
-                                log_error("Unknown interface %s.", optarg);
-
-                        arg_action = ACTION_DONE;
-                        break;
-                }
-
                 case 'h':
                         arg_action = ACTION_HELP;
                         break;
@@ -1013,7 +990,6 @@ static int help(void) {
                "  -h --help                      Show this help\n"
                "     --test                      Determine startup sequence, dump it and exit\n"
                "     --dump-configuration-items  Dump understood unit configuration items\n"
-               "     --introspect[=INTERFACE]    Extract D-Bus interface data\n"
                "     --unit=UNIT                 Set default unit\n"
                "     --system                    Run a system instance, even if PID != 1\n"
                "     --user                      Run a user instance\n"
diff --git a/src/locale/localed.c b/src/locale/localed.c
index 3cac634a4c..0b5f97ee8b 100644
--- a/src/locale/localed.c
+++ b/src/locale/localed.c
@@ -78,7 +78,7 @@
         BUS_GENERIC_INTERFACES_LIST             \
         "org.freedesktop.locale1\0"
 
-const char locale_interface[] _introspect_("locale1") = INTERFACE;
+const char locale_interface[] = INTERFACE;
 
 enum {
         /* We don't list LC_ALL here on purpose. People should be
@@ -1336,14 +1336,6 @@ int main(int argc, char *argv[]) {
         label_init("/etc");
         umask(0022);
 
-        if (argc == 2 && streq(argv[1], "--introspect")) {
-                fputs(DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE
-                      "<node>\n", stdout);
-                fputs(locale_interface, stdout);
-                fputs("</node>\n", stdout);
-                return 0;
-        }
-
         if (argc != 1) {
                 log_error("This program takes no arguments.");
                 r = -EINVAL;
diff --git a/src/shared/macro.h b/src/shared/macro.h
index 3cf17bb867..d3f4245d5d 100644
--- a/src/shared/macro.h
+++ b/src/shared/macro.h
@@ -44,7 +44,6 @@
 #define _public_ __attribute__ ((visibility("default")))
 #define _hidden_ __attribute__ ((visibility("hidden")))
 #define _weakref_(x) __attribute__((weakref(#x)))
-#define _introspect_(x) __attribute__((section("introspect." x)))
 #define _alignas_(x) __attribute__((aligned(__alignof(x))))
 #define _cleanup_(x) __attribute__((cleanup(x)))