diff options
author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-09-11 22:56:30 -0400 |
---|---|---|
committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-09-11 22:56:30 -0400 |
commit | fa89550518af96a8804749c0ab0916599a94c1da (patch) | |
tree | 57db50190ad4bcdbc9ef54efc528db4286daedac /src/grp-machine | |
parent | f4b50a2aa19f5a99008565f4127952ea8f2e4f61 (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')
7 files changed, 14 insertions, 13 deletions
diff --git a/src/grp-machine/grp-import/systemd-export/export-raw.c b/src/grp-machine/grp-import/systemd-export/export-raw.c index 1e3f6e034e..c17fc952d3 100644 --- a/src/grp-machine/grp-import/systemd-export/export-raw.c +++ b/src/grp-machine/grp-import/systemd-export/export-raw.c @@ -30,13 +30,14 @@ #include "basic/alloc-util.h" #include "basic/btrfs-util.h" #include "basic/copy.h" -#include "export-raw.h" #include "basic/fd-util.h" #include "basic/fileio.h" -#include "import-common.h" #include "basic/ratelimit.h" #include "basic/string-util.h" #include "basic/util.h" +#include "import-common.h" + +#include "export-raw.h" #define COPY_BUFFER_SIZE (16*1024) 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 { diff --git a/src/grp-machine/grp-import/systemd-pull/pull-job.h b/src/grp-machine/grp-import/systemd-pull/pull-job.h index d8308e4046..296e32bd09 100644 --- a/src/grp-machine/grp-import/systemd-pull/pull-job.h +++ b/src/grp-machine/grp-import/systemd-pull/pull-job.h @@ -22,11 +22,11 @@ #include <gcrypt.h> #include "basic/macro.h" -#include "curl-util.h" #include "import-compress.h" -typedef struct PullJob PullJob; +#include "curl-util.h" +typedef struct PullJob PullJob; typedef void (*PullJobFinished)(PullJob *job); typedef int (*PullJobOpenDisk)(PullJob *job); typedef int (*PullJobHeader)(PullJob *job, const char *header, size_t sz); diff --git a/src/grp-machine/grp-import/systemd-pull/pull-raw.c b/src/grp-machine/grp-import/systemd-pull/pull-raw.c index 59257d6a0c..9602915a1f 100644 --- a/src/grp-machine/grp-import/systemd-pull/pull-raw.c +++ b/src/grp-machine/grp-import/systemd-pull/pull-raw.c @@ -41,11 +41,11 @@ #include "basic/utf8.h" #include "basic/util.h" #include "basic/web-util.h" -#include "curl-util.h" #include "import-common.h" #include "qcow2-util.h" #include "shared/import-util.h" +#include "curl-util.h" #include "pull-common.h" #include "pull-job.h" #include "pull-raw.h" diff --git a/src/grp-machine/grp-import/systemd-pull/pull-tar.c b/src/grp-machine/grp-import/systemd-pull/pull-tar.c index e6031db0ed..121ca31dbd 100644 --- a/src/grp-machine/grp-import/systemd-pull/pull-tar.c +++ b/src/grp-machine/grp-import/systemd-pull/pull-tar.c @@ -39,10 +39,10 @@ #include "basic/utf8.h" #include "basic/util.h" #include "basic/web-util.h" -#include "curl-util.h" #include "import-common.h" #include "shared/import-util.h" +#include "curl-util.h" #include "pull-common.h" #include "pull-job.h" #include "pull-tar.h" diff --git a/src/grp-machine/systemd-machined/machine.h b/src/grp-machine/systemd-machined/machine.h index cba0311c23..e93f0cf222 100644 --- a/src/grp-machine/systemd-machined/machine.h +++ b/src/grp-machine/systemd-machined/machine.h @@ -19,11 +19,11 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -typedef struct Machine Machine; -typedef enum KillWho KillWho; - #include "basic/list.h" +typedef enum KillWho KillWho; +typedef struct Machine Machine; + #include "machined.h" #include "operation.h" |