summaryrefslogtreecommitdiff
path: root/src/grp-machine/grp-import/systemd-import
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2016-09-11 22:56:30 -0400
committerLuke Shumaker <lukeshu@sbcglobal.net>2016-09-11 22:56:30 -0400
commitfa89550518af96a8804749c0ab0916599a94c1da (patch)
tree57db50190ad4bcdbc9ef54efc528db4286daedac /src/grp-machine/grp-import/systemd-import
parentf4b50a2aa19f5a99008565f4127952ea8f2e4f61 (diff)
Run the new fixup script.
The biggest change is that it keeps looking for new #include blocks. This means that it (more) correctly handles #ifdef'd #includes. I'm not 100% in love with it, but it's pretty good for automated. What I really don't like is it did some silly things with newlines in typedef blocks. I've avoided committing those. I think it may be possible to get it to do the right thing. But really, the typedef blocks are a hack for poorly structured headers. Now that it keeps looking for new #include blocks, I could strip out the typedef support, and it would mostly work; but it wouldn't be able to move some headers back to the top. IDK what to do.
Diffstat (limited to 'src/grp-machine/grp-import/systemd-import')
-rw-r--r--src/grp-machine/grp-import/systemd-import/import-raw.c4
-rw-r--r--src/grp-machine/grp-import/systemd-import/import-tar.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/grp-machine/grp-import/systemd-import/import-raw.c b/src/grp-machine/grp-import/systemd-import/import-raw.c
index 658c912f88..55a6d044ab 100644
--- a/src/grp-machine/grp-import/systemd-import/import-raw.c
+++ b/src/grp-machine/grp-import/systemd-import/import-raw.c
@@ -37,11 +37,11 @@
#include "basic/rm-rf.h"
#include "basic/string-util.h"
#include "basic/util.h"
+#include "import-common.h"
+#include "import-compress.h"
#include "qcow2-util.h"
#include "shared/machine-pool.h"
-#include "import-common.h"
-#include "import-compress.h"
#include "import-raw.h"
struct RawImport {
diff --git a/src/grp-machine/grp-import/systemd-import/import-tar.c b/src/grp-machine/grp-import/systemd-import/import-tar.c
index f66a7e7e4c..0d61b5f01d 100644
--- a/src/grp-machine/grp-import/systemd-import/import-tar.c
+++ b/src/grp-machine/grp-import/systemd-import/import-tar.c
@@ -37,11 +37,11 @@
#include "basic/rm-rf.h"
#include "basic/string-util.h"
#include "basic/util.h"
+#include "import-common.h"
+#include "import-compress.h"
#include "qcow2-util.h"
#include "shared/machine-pool.h"
-#include "import-common.h"
-#include "import-compress.h"
#include "import-tar.h"
struct TarImport {