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-resolve/systemd-resolve | |
| 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-resolve/systemd-resolve')
| -rw-r--r-- | src/grp-resolve/systemd-resolve/resolve-tool.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/grp-resolve/systemd-resolve/resolve-tool.c b/src/grp-resolve/systemd-resolve/resolve-tool.c index d9f28576b7..dee23289b3 100644 --- a/src/grp-resolve/systemd-resolve/resolve-tool.c +++ b/src/grp-resolve/systemd-resolve/resolve-tool.c @@ -28,13 +28,12 @@ #include "basic/in-addr-util.h" #include "basic/parse-util.h" #include "basic/terminal-util.h" +#include "resolved-def.h" +#include "resolved-dns-packet.h" #include "sd-bus/bus-error.h" #include "shared/bus-util.h" #include "shared/gcrypt-util.h" -#include "resolved-def.h" -#include "resolved-dns-packet.h" - #define DNS_CALL_TIMEOUT_USEC (45*USEC_PER_SEC) static int arg_family = AF_UNSPEC; |