diff options
author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-08-01 16:33:32 -0400 |
---|---|---|
committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-08-01 16:33:32 -0400 |
commit | 272b48187cee0b42b6e936ad2c045f13b391f3ad (patch) | |
tree | 383049270ccbac5040e4404bbe71ac49d0c423db /src/grp-machine/libmachine-core | |
parent | 46277a7844c854210eaa0a3612fa297ec33ddb7b (diff) |
find src \( -name '*.h' -o -name '*.c' \) -type f -exec ./fixup_includes {} \;
Diffstat (limited to 'src/grp-machine/libmachine-core')
-rw-r--r-- | src/grp-machine/libmachine-core/image-dbus.c | 7 | ||||
-rw-r--r-- | src/grp-machine/libmachine-core/machine.c | 9 | ||||
-rw-r--r-- | src/grp-machine/libmachine-core/machine.h | 1 | ||||
-rw-r--r-- | src/grp-machine/libmachine-core/machined-dbus.c | 15 | ||||
-rw-r--r-- | src/grp-machine/libmachine-core/operation.c | 3 | ||||
-rw-r--r-- | src/grp-machine/libmachine-core/test-machine-tables.c | 3 |
6 files changed, 22 insertions, 16 deletions
diff --git a/src/grp-machine/libmachine-core/image-dbus.c b/src/grp-machine/libmachine-core/image-dbus.c index 13630fb881..584777e5ad 100644 --- a/src/grp-machine/libmachine-core/image-dbus.c +++ b/src/grp-machine/libmachine-core/image-dbus.c @@ -19,14 +19,15 @@ #include "basic/alloc-util.h" #include "basic/bus-label.h" -#include "shared/bus-util.h" #include "basic/fd-util.h" -#include "image-dbus.h" #include "basic/io-util.h" -#include "shared/machine-image.h" #include "basic/process-util.h" #include "basic/strv.h" #include "basic/user-util.h" +#include "shared/bus-util.h" +#include "shared/machine-image.h" + +#include "image-dbus.h" static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_type, image_type, ImageType); diff --git a/src/grp-machine/libmachine-core/machine.c b/src/grp-machine/libmachine-core/machine.c index e238983397..82d8f66395 100644 --- a/src/grp-machine/libmachine-core/machine.c +++ b/src/grp-machine/libmachine-core/machine.c @@ -24,16 +24,12 @@ #include <systemd/sd-messages.h> #include "basic/alloc-util.h" -#include "bus-error.h" -#include "shared/bus-util.h" #include "basic/escape.h" #include "basic/extract-word.h" #include "basic/fd-util.h" #include "basic/fileio.h" #include "basic/formats-util.h" #include "basic/hashmap.h" -#include "machine-dbus.h" -#include "machine.h" #include "basic/mkdir.h" #include "basic/parse-util.h" #include "basic/process-util.h" @@ -42,6 +38,11 @@ #include "basic/terminal-util.h" #include "basic/unit-name.h" #include "basic/util.h" +#include "sd-bus/bus-error.h" +#include "shared/bus-util.h" + +#include "machine-dbus.h" +#include "machine.h" Machine* machine_new(Manager *manager, MachineClass class, const char *name) { Machine *m; diff --git a/src/grp-machine/libmachine-core/machine.h b/src/grp-machine/libmachine-core/machine.h index c61b00b39f..cba0311c23 100644 --- a/src/grp-machine/libmachine-core/machine.h +++ b/src/grp-machine/libmachine-core/machine.h @@ -23,6 +23,7 @@ typedef struct Machine Machine; typedef enum KillWho KillWho; #include "basic/list.h" + #include "machined.h" #include "operation.h" diff --git a/src/grp-machine/libmachine-core/machined-dbus.c b/src/grp-machine/libmachine-core/machined-dbus.c index 7b6d8f77ac..7caecd43a0 100644 --- a/src/grp-machine/libmachine-core/machined-dbus.c +++ b/src/grp-machine/libmachine-core/machined-dbus.c @@ -25,24 +25,25 @@ #include "basic/alloc-util.h" #include "basic/btrfs-util.h" -#include "bus-common-errors.h" -#include "shared/bus-util.h" #include "basic/cgroup-util.h" #include "basic/fd-util.h" #include "basic/formats-util.h" #include "basic/hostname-util.h" -#include "image-dbus.h" #include "basic/io-util.h" -#include "machine-dbus.h" -#include "shared/machine-image.h" -#include "shared/machine-pool.h" -#include "machined.h" #include "basic/path-util.h" #include "basic/process-util.h" #include "basic/stdio-util.h" #include "basic/strv.h" #include "basic/unit-name.h" #include "basic/user-util.h" +#include "sd-bus/bus-common-errors.h" +#include "shared/bus-util.h" +#include "shared/machine-image.h" +#include "shared/machine-pool.h" + +#include "image-dbus.h" +#include "machine-dbus.h" +#include "machined.h" static int property_get_pool_path( sd_bus *bus, diff --git a/src/grp-machine/libmachine-core/operation.c b/src/grp-machine/libmachine-core/operation.c index 69f6db2866..f1bcb1d860 100644 --- a/src/grp-machine/libmachine-core/operation.c +++ b/src/grp-machine/libmachine-core/operation.c @@ -19,9 +19,10 @@ #include "basic/alloc-util.h" #include "basic/fd-util.h" -#include "operation.h" #include "basic/process-util.h" +#include "operation.h" + static int operation_done(sd_event_source *s, const siginfo_t *si, void *userdata) { _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL; Operation *o = userdata; diff --git a/src/grp-machine/libmachine-core/test-machine-tables.c b/src/grp-machine/libmachine-core/test-machine-tables.c index 4f87a7d06b..7d44c55a4b 100644 --- a/src/grp-machine/libmachine-core/test-machine-tables.c +++ b/src/grp-machine/libmachine-core/test-machine-tables.c @@ -17,9 +17,10 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "machine.h" #include "shared/test-tables.h" +#include "machine.h" + int main(int argc, char **argv) { test_table(machine_class, MACHINE_CLASS); test_table(machine_state, MACHINE_STATE); |