SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bus: remove static introspection file export

Browse Source
This commit is contained in:
Kay Sievers
2013-10-21 00:41:26 +02:00
parent af8601fa8b
commit ca2871d9b0
23 changed files with 17 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/dbus-automount.c
+1 -1
View File
@@ -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";
src/core/dbus-device.c
+1 -1
View File
@@ -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";
src/core/dbus-job.c
+1 -1
View File
@@ -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 \
src/core/dbus-manager.c
+1 -1
View File
@@ -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);
src/core/dbus-mount.c
+1 -1
View File
@@ -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"
src/core/dbus-path.c
+1 -1
View File
@@ -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";
src/core/dbus-scope.c
+1 -1
View File
@@ -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);
src/core/dbus-service.c
+1 -1
View File
@@ -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"
src/core/dbus-slice.c
+1 -1
View File
@@ -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);
src/core/dbus-snapshot.c
+1 -1
View File
@@ -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) },
src/core/dbus-socket.c
+1 -1
View File
@@ -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"
src/core/dbus-swap.c
+1 -1
View File
@@ -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"
src/core/dbus-target.c
+1 -1
View File
@@ -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[] = {
src/core/dbus-timer.c
+1 -1
View File
@@ -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"
src/core/dbus-unit.c
+1 -1
View File
@@ -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" \
src/core/main.c
-24
View File
@@ -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"