summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMarc-Antoine Perennou <Marc-Antoine@Perennou.com>2013-01-31 09:49:35 +0100
committerAuke Kok <auke-jan.h.kok@intel.com>2013-02-13 14:36:01 -0800
commitcdf3f17bfb20eac2929c8b6a582b988b790f071d (patch)
tree95a87b6a99fd2471e984454dd902de2caf418105 /src
parent93eec5c774336ff6da2ef30c7f41cdb4d9de5494 (diff)
dbus: import struct unit_info from systemctl
Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
Diffstat (limited to 'src')
-rw-r--r--src/shared/dbus-common.h13
-rw-r--r--src/systemctl/systemctl.c13
2 files changed, 13 insertions, 13 deletions
diff --git a/src/shared/dbus-common.h b/src/shared/dbus-common.h
index e141c9ec90..800c0ea23a 100644
--- a/src/shared/dbus-common.h
+++ b/src/shared/dbus-common.h
@@ -199,6 +199,19 @@ int bus_parse_strv(DBusMessage *m, char ***_l);
int bus_parse_strv_iter(DBusMessageIter *iter, char ***_l);
int bus_parse_strv_pairs_iter(DBusMessageIter *iter, char ***_l);
+struct unit_info {
+ const char *id;
+ const char *description;
+ const char *load_state;
+ const char *active_state;
+ const char *sub_state;
+ const char *following;
+ const char *unit_path;
+ uint32_t job_id;
+ const char *job_type;
+ const char *job_path;
+};
+
int bus_append_strv_iter(DBusMessageIter *iter, char **l);
int bus_iter_get_basic_and_next(DBusMessageIter *iter, int type, void *data, bool next);
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 5deacbf36b..0d1be19862 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -275,19 +275,6 @@ static bool avoid_bus(void) {
return false;
}
-struct unit_info {
- const char *id;
- const char *description;
- const char *load_state;
- const char *active_state;
- const char *sub_state;
- const char *following;
- const char *unit_path;
- uint32_t job_id;
- const char *job_type;
- const char *job_path;
-};
-
static int compare_unit_info(const void *a, const void *b) {
const char *d1, *d2;
const struct unit_info *u = a, *v = b;