From fa89550518af96a8804749c0ab0916599a94c1da Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 11 Sep 2016 22:56:30 -0400 Subject: 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. --- src/grp-resolve/libbasic-dns/resolved-dns-dnssec.c | 5 +++-- src/grp-resolve/libbasic-dns/resolved-dns-dnssec.h | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'src/grp-resolve/libbasic-dns') diff --git a/src/grp-resolve/libbasic-dns/resolved-dns-dnssec.c b/src/grp-resolve/libbasic-dns/resolved-dns-dnssec.c index 39afbada25..7d58edcdfa 100644 --- a/src/grp-resolve/libbasic-dns/resolved-dns-dnssec.c +++ b/src/grp-resolve/libbasic-dns/resolved-dns-dnssec.c @@ -22,12 +22,13 @@ #endif #include "basic/alloc-util.h" +#include "basic/hexdecoct.h" +#include "basic/string-table.h" #include "shared/dns-domain.h" #include "shared/gcrypt-util.h" -#include "basic/hexdecoct.h" + #include "resolved-dns-dnssec.h" #include "resolved-dns-packet.h" -#include "basic/string-table.h" #define VERIFY_RRS_MAX 256 #define MAX_KEY_SIZE (32*1024) diff --git a/src/grp-resolve/libbasic-dns/resolved-dns-dnssec.h b/src/grp-resolve/libbasic-dns/resolved-dns-dnssec.h index 81879e287f..b73cc24100 100644 --- a/src/grp-resolve/libbasic-dns/resolved-dns-dnssec.h +++ b/src/grp-resolve/libbasic-dns/resolved-dns-dnssec.h @@ -19,11 +19,11 @@ along with systemd; If not, see . ***/ +#include "shared/dns-domain.h" + typedef enum DnssecResult DnssecResult; typedef enum DnssecVerdict DnssecVerdict; -#include "shared/dns-domain.h" - #include "resolved-dns-answer.h" #include "resolved-dns-rr.h" -- cgit v1.2.3-54-g00ecf