summaryrefslogtreecommitdiff
path: root/src/grp-machine/grp-import/systemd-export
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2016-08-01 16:33:32 -0400
committerLuke Shumaker <lukeshu@sbcglobal.net>2016-08-01 16:33:32 -0400
commit272b48187cee0b42b6e936ad2c045f13b391f3ad (patch)
tree383049270ccbac5040e4404bbe71ac49d0c423db /src/grp-machine/grp-import/systemd-export
parent46277a7844c854210eaa0a3612fa297ec33ddb7b (diff)
find src \( -name '*.h' -o -name '*.c' \) -type f -exec ./fixup_includes {} \;
Diffstat (limited to 'src/grp-machine/grp-import/systemd-export')
-rw-r--r--src/grp-machine/grp-import/systemd-export/export-raw.h2
-rw-r--r--src/grp-machine/grp-import/systemd-export/export-tar.c5
-rw-r--r--src/grp-machine/grp-import/systemd-export/export-tar.h2
-rw-r--r--src/grp-machine/grp-import/systemd-export/export.c9
4 files changed, 10 insertions, 8 deletions
diff --git a/src/grp-machine/grp-import/systemd-export/export-raw.h b/src/grp-machine/grp-import/systemd-export/export-raw.h
index 13d7809b9d..00f6931d7b 100644
--- a/src/grp-machine/grp-import/systemd-export/export-raw.h
+++ b/src/grp-machine/grp-import/systemd-export/export-raw.h
@@ -21,8 +21,8 @@
#include <systemd/sd-event.h>
-#include "import-compress.h"
#include "basic/macro.h"
+#include "import-compress.h"
typedef struct RawExport RawExport;
diff --git a/src/grp-machine/grp-import/systemd-export/export-tar.c b/src/grp-machine/grp-import/systemd-export/export-tar.c
index 9a8d48dc2e..e2b3c5f2e9 100644
--- a/src/grp-machine/grp-import/systemd-export/export-tar.c
+++ b/src/grp-machine/grp-import/systemd-export/export-tar.c
@@ -21,14 +21,15 @@
#include "basic/alloc-util.h"
#include "basic/btrfs-util.h"
-#include "export-tar.h"
#include "basic/fd-util.h"
#include "basic/fileio.h"
-#include "import-common.h"
#include "basic/process-util.h"
#include "basic/ratelimit.h"
#include "basic/string-util.h"
#include "basic/util.h"
+#include "import-common.h"
+
+#include "export-tar.h"
#define COPY_BUFFER_SIZE (16*1024)
diff --git a/src/grp-machine/grp-import/systemd-export/export-tar.h b/src/grp-machine/grp-import/systemd-export/export-tar.h
index 0a59033d5b..9efde8931d 100644
--- a/src/grp-machine/grp-import/systemd-export/export-tar.h
+++ b/src/grp-machine/grp-import/systemd-export/export-tar.h
@@ -21,8 +21,8 @@
#include <systemd/sd-event.h>
-#include "import-compress.h"
#include "basic/macro.h"
+#include "import-compress.h"
typedef struct TarExport TarExport;
diff --git a/src/grp-machine/grp-import/systemd-export/export.c b/src/grp-machine/grp-import/systemd-export/export.c
index a64b79bba0..5db164c7d1 100644
--- a/src/grp-machine/grp-import/systemd-export/export.c
+++ b/src/grp-machine/grp-import/systemd-export/export.c
@@ -22,16 +22,17 @@
#include <systemd/sd-event.h>
#include "basic/alloc-util.h"
-#include "export-raw.h"
-#include "export-tar.h"
#include "basic/fd-util.h"
#include "basic/fs-util.h"
#include "basic/hostname-util.h"
-#include "shared/import-util.h"
-#include "shared/machine-image.h"
#include "basic/signal-util.h"
#include "basic/string-util.h"
#include "basic/verbs.h"
+#include "shared/import-util.h"
+#include "shared/machine-image.h"
+
+#include "export-raw.h"
+#include "export-tar.h"
static ImportCompressType arg_compress = IMPORT_COMPRESS_UNKNOWN;