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-journal/libjournal-core | |
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-journal/libjournal-core')
-rw-r--r-- | src/grp-journal/libjournal-core/journald-server.c | 1 | ||||
-rw-r--r-- | src/grp-journal/libjournal-core/journald-stream.c | 13 | ||||
-rw-r--r-- | src/grp-journal/libjournal-core/test-compress.c | 2 |
3 files changed, 9 insertions, 7 deletions
diff --git a/src/grp-journal/libjournal-core/journald-server.c b/src/grp-journal/libjournal-core/journald-server.c index 4dca4b02b3..8bc2e55709 100644 --- a/src/grp-journal/libjournal-core/journald-server.c +++ b/src/grp-journal/libjournal-core/journald-server.c @@ -24,6 +24,7 @@ #include <sys/mman.h> #include <sys/signalfd.h> #include <sys/statvfs.h> + #include <linux/sockios.h> #include <libudev.h> diff --git a/src/grp-journal/libjournal-core/journald-stream.c b/src/grp-journal/libjournal-core/journald-stream.c index 4b0062bc9a..e90dfac1cd 100644 --- a/src/grp-journal/libjournal-core/journald-stream.c +++ b/src/grp-journal/libjournal-core/journald-stream.c @@ -33,12 +33,6 @@ #include "basic/fd-util.h" #include "basic/fileio.h" #include "basic/io-util.h" -#include "journald-console.h" -#include "journald-kmsg.h" -#include "journald-server.h" -#include "journald-stream.h" -#include "journald-syslog.h" -#include "journald-wall.h" #include "basic/mkdir.h" #include "basic/parse-util.h" #include "basic/selinux-util.h" @@ -47,6 +41,13 @@ #include "basic/string-util.h" #include "basic/syslog-util.h" +#include "journald-console.h" +#include "journald-kmsg.h" +#include "journald-server.h" +#include "journald-stream.h" +#include "journald-syslog.h" +#include "journald-wall.h" + #define STDOUT_STREAMS_MAX 4096 typedef enum StdoutStreamState { diff --git a/src/grp-journal/libjournal-core/test-compress.c b/src/grp-journal/libjournal-core/test-compress.c index 8cd098cabc..5682c28e8c 100644 --- a/src/grp-journal/libjournal-core/test-compress.c +++ b/src/grp-journal/libjournal-core/test-compress.c @@ -22,12 +22,12 @@ #endif #include "basic/alloc-util.h" -#include "compress.h" #include "basic/fd-util.h" #include "basic/fileio.h" #include "basic/macro.h" #include "basic/random-util.h" #include "basic/util.h" +#include "sd-journal/compress.h" #ifdef HAVE_XZ # define XZ_OK 0 |