From 623f13d8198b83df890f014b1d27255f4d78f35b Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 21 Oct 2016 03:00:49 -0400 Subject: wip --- src/grp-resolve/libbasic-dns/Makefile | 2 +- src/grp-resolve/libbasic-dns/dns-type.c | 4 ++-- src/grp-resolve/libbasic-dns/dns-type.h | 2 +- src/grp-resolve/libbasic-dns/resolved-dns-answer.c | 6 +++--- src/grp-resolve/libbasic-dns/resolved-dns-answer.h | 2 +- src/grp-resolve/libbasic-dns/resolved-dns-dnssec.c | 10 +++++----- src/grp-resolve/libbasic-dns/resolved-dns-dnssec.h | 2 +- src/grp-resolve/libbasic-dns/resolved-dns-packet.c | 14 +++++++------- src/grp-resolve/libbasic-dns/resolved-dns-packet.h | 8 ++++---- src/grp-resolve/libbasic-dns/resolved-dns-question.c | 4 ++-- src/grp-resolve/libbasic-dns/resolved-dns-question.h | 2 +- src/grp-resolve/libbasic-dns/resolved-dns-rr.c | 16 ++++++++-------- src/grp-resolve/libbasic-dns/resolved-dns-rr.h | 10 +++++----- src/grp-resolve/libbasic-dns/test-dns-packet.c | 16 ++++++++-------- src/grp-resolve/libbasic-dns/test-dnssec-complex.c | 10 +++++----- src/grp-resolve/libbasic-dns/test-dnssec.c | 6 +++--- src/grp-resolve/libbasic-dns/test-resolve-tables.c | 2 +- 17 files changed, 58 insertions(+), 58 deletions(-) (limited to 'src/grp-resolve/libbasic-dns') diff --git a/src/grp-resolve/libbasic-dns/Makefile b/src/grp-resolve/libbasic-dns/Makefile index e5c32d8539..294283d062 100644 --- a/src/grp-resolve/libbasic-dns/Makefile +++ b/src/grp-resolve/libbasic-dns/Makefile @@ -121,7 +121,7 @@ test_dnssec_complex_LDADD = \ libsystemd-shared.la noinst_LTLIBRARIES = libbasic-dns.la -libbasic_dns_la_LIBADD = libshared.la +libbasic_dns_la_LIBADD = libsystemd-shared.la $(outdir)/dns-type.lo: $(outdir)/dns_type-from-name.h $(outdir)/dns_type-to-name.h include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-resolve/libbasic-dns/dns-type.c b/src/grp-resolve/libbasic-dns/dns-type.c index eceb72f545..44e4970fbf 100644 --- a/src/grp-resolve/libbasic-dns/dns-type.c +++ b/src/grp-resolve/libbasic-dns/dns-type.c @@ -19,8 +19,8 @@ #include -#include "basic/parse-util.h" -#include "basic/string-util.h" +#include "systemd-basic/parse-util.h" +#include "systemd-basic/string-util.h" #include "dns-type.h" diff --git a/src/grp-resolve/libbasic-dns/dns-type.h b/src/grp-resolve/libbasic-dns/dns-type.h index be548b6073..df1642f85e 100644 --- a/src/grp-resolve/libbasic-dns/dns-type.h +++ b/src/grp-resolve/libbasic-dns/dns-type.h @@ -19,7 +19,7 @@ along with systemd; If not, see . ***/ -#include "basic/macro.h" +#include "systemd-basic/macro.h" /* DNS record types, taken from * http://www.iana.org/assignments/dns-parameters/dns-parameters.xhtml. diff --git a/src/grp-resolve/libbasic-dns/resolved-dns-answer.c b/src/grp-resolve/libbasic-dns/resolved-dns-answer.c index c45505b441..95c1398056 100644 --- a/src/grp-resolve/libbasic-dns/resolved-dns-answer.c +++ b/src/grp-resolve/libbasic-dns/resolved-dns-answer.c @@ -17,9 +17,9 @@ along with systemd; If not, see . ***/ -#include "basic/alloc-util.h" -#include "basic/string-util.h" -#include "shared/dns-domain.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/string-util.h" +#include "systemd-shared/dns-domain.h" #include "resolved-dns-answer.h" #include "resolved-dns-dnssec.h" diff --git a/src/grp-resolve/libbasic-dns/resolved-dns-answer.h b/src/grp-resolve/libbasic-dns/resolved-dns-answer.h index bbb836fc7e..447604d008 100644 --- a/src/grp-resolve/libbasic-dns/resolved-dns-answer.h +++ b/src/grp-resolve/libbasic-dns/resolved-dns-answer.h @@ -19,7 +19,7 @@ along with systemd; If not, see . ***/ -#include "basic/macro.h" +#include "systemd-basic/macro.h" typedef struct DnsAnswer DnsAnswer; typedef struct DnsAnswerItem DnsAnswerItem; diff --git a/src/grp-resolve/libbasic-dns/resolved-dns-dnssec.c b/src/grp-resolve/libbasic-dns/resolved-dns-dnssec.c index a53f2daa28..6b14287a51 100644 --- a/src/grp-resolve/libbasic-dns/resolved-dns-dnssec.c +++ b/src/grp-resolve/libbasic-dns/resolved-dns-dnssec.c @@ -21,11 +21,11 @@ #include #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 "systemd-basic/alloc-util.h" +#include "systemd-basic/hexdecoct.h" +#include "systemd-basic/string-table.h" +#include "systemd-gcrypt/gcrypt-util.h" +#include "systemd-shared/dns-domain.h" #include "resolved-dns-dnssec.h" #include "resolved-dns-packet.h" diff --git a/src/grp-resolve/libbasic-dns/resolved-dns-dnssec.h b/src/grp-resolve/libbasic-dns/resolved-dns-dnssec.h index b73cc24100..b91abe98ac 100644 --- a/src/grp-resolve/libbasic-dns/resolved-dns-dnssec.h +++ b/src/grp-resolve/libbasic-dns/resolved-dns-dnssec.h @@ -19,7 +19,7 @@ along with systemd; If not, see . ***/ -#include "shared/dns-domain.h" +#include "systemd-shared/dns-domain.h" typedef enum DnssecResult DnssecResult; typedef enum DnssecVerdict DnssecVerdict; diff --git a/src/grp-resolve/libbasic-dns/resolved-dns-packet.c b/src/grp-resolve/libbasic-dns/resolved-dns-packet.c index e5a497e0ed..28667bb3e8 100644 --- a/src/grp-resolve/libbasic-dns/resolved-dns-packet.c +++ b/src/grp-resolve/libbasic-dns/resolved-dns-packet.c @@ -17,13 +17,13 @@ along with systemd; If not, see . ***/ -#include "basic/alloc-util.h" -#include "basic/string-table.h" -#include "basic/strv.h" -#include "basic/unaligned.h" -#include "basic/utf8.h" -#include "basic/util.h" -#include "shared/dns-domain.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/string-table.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/unaligned.h" +#include "systemd-basic/utf8.h" +#include "systemd-basic/util.h" +#include "systemd-shared/dns-domain.h" #include "resolved-dns-packet.h" diff --git a/src/grp-resolve/libbasic-dns/resolved-dns-packet.h b/src/grp-resolve/libbasic-dns/resolved-dns-packet.h index a9e95ebd75..cb03de8986 100644 --- a/src/grp-resolve/libbasic-dns/resolved-dns-packet.h +++ b/src/grp-resolve/libbasic-dns/resolved-dns-packet.h @@ -22,10 +22,10 @@ #include #include -#include "basic/hashmap.h" -#include "basic/in-addr-util.h" -#include "basic/macro.h" -#include "basic/sparse-endian.h" +#include "systemd-basic/hashmap.h" +#include "systemd-basic/in-addr-util.h" +#include "systemd-basic/macro.h" +#include "systemd-basic/sparse-endian.h" typedef struct DnsPacket DnsPacket; typedef struct DnsPacketHeader DnsPacketHeader; diff --git a/src/grp-resolve/libbasic-dns/resolved-dns-question.c b/src/grp-resolve/libbasic-dns/resolved-dns-question.c index ee53dbff9d..686bc01a09 100644 --- a/src/grp-resolve/libbasic-dns/resolved-dns-question.c +++ b/src/grp-resolve/libbasic-dns/resolved-dns-question.c @@ -17,8 +17,8 @@ along with systemd; If not, see . ***/ -#include "basic/alloc-util.h" -#include "shared/dns-domain.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-shared/dns-domain.h" #include "dns-type.h" #include "resolved-dns-question.h" diff --git a/src/grp-resolve/libbasic-dns/resolved-dns-question.h b/src/grp-resolve/libbasic-dns/resolved-dns-question.h index fe47a6bd9e..fb1b2d2410 100644 --- a/src/grp-resolve/libbasic-dns/resolved-dns-question.h +++ b/src/grp-resolve/libbasic-dns/resolved-dns-question.h @@ -19,7 +19,7 @@ along with systemd; If not, see . ***/ -#include "basic/macro.h" +#include "systemd-basic/macro.h" typedef struct DnsQuestion DnsQuestion; diff --git a/src/grp-resolve/libbasic-dns/resolved-dns-rr.c b/src/grp-resolve/libbasic-dns/resolved-dns-rr.c index 73ca3c7fb9..fbe0ff65d6 100644 --- a/src/grp-resolve/libbasic-dns/resolved-dns-rr.c +++ b/src/grp-resolve/libbasic-dns/resolved-dns-rr.c @@ -19,14 +19,14 @@ #include -#include "basic/alloc-util.h" -#include "basic/escape.h" -#include "basic/hexdecoct.h" -#include "basic/string-table.h" -#include "basic/string-util.h" -#include "basic/strv.h" -#include "basic/terminal-util.h" -#include "shared/dns-domain.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/escape.h" +#include "systemd-basic/hexdecoct.h" +#include "systemd-basic/string-table.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/terminal-util.h" +#include "systemd-shared/dns-domain.h" #include "dns-type.h" #include "resolved-dns-dnssec.h" diff --git a/src/grp-resolve/libbasic-dns/resolved-dns-rr.h b/src/grp-resolve/libbasic-dns/resolved-dns-rr.h index 13240e57ed..864c7c237f 100644 --- a/src/grp-resolve/libbasic-dns/resolved-dns-rr.h +++ b/src/grp-resolve/libbasic-dns/resolved-dns-rr.h @@ -21,11 +21,11 @@ #include -#include "basic/bitmap.h" -#include "basic/hashmap.h" -#include "basic/in-addr-util.h" -#include "basic/list.h" -#include "basic/string-util.h" +#include "systemd-basic/bitmap.h" +#include "systemd-basic/hashmap.h" +#include "systemd-basic/in-addr-util.h" +#include "systemd-basic/list.h" +#include "systemd-basic/string-util.h" #include "dns-type.h" diff --git a/src/grp-resolve/libbasic-dns/test-dns-packet.c b/src/grp-resolve/libbasic-dns/test-dns-packet.c index c9e210fa94..059011513c 100644 --- a/src/grp-resolve/libbasic-dns/test-dns-packet.c +++ b/src/grp-resolve/libbasic-dns/test-dns-packet.c @@ -20,14 +20,14 @@ #include #include -#include "basic/alloc-util.h" -#include "basic/fileio.h" -#include "basic/glob-util.h" -#include "basic/log.h" -#include "basic/macro.h" -#include "basic/string-util.h" -#include "basic/strv.h" -#include "basic/unaligned.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/fileio.h" +#include "systemd-basic/glob-util.h" +#include "systemd-basic/log.h" +#include "systemd-basic/macro.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/unaligned.h" #include "resolved-dns-packet.h" #include "resolved-dns-rr.h" diff --git a/src/grp-resolve/libbasic-dns/test-dnssec-complex.c b/src/grp-resolve/libbasic-dns/test-dnssec-complex.c index ef78cd1ea5..afa01d9858 100644 --- a/src/grp-resolve/libbasic-dns/test-dnssec-complex.c +++ b/src/grp-resolve/libbasic-dns/test-dnssec-complex.c @@ -21,12 +21,12 @@ #include -#include "basic/af-list.h" -#include "basic/alloc-util.h" -#include "basic/random-util.h" -#include "basic/string-util.h" -#include "basic/time-util.h" #include "sd-bus/bus-common-errors.h" +#include "systemd-basic/af-list.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/random-util.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/time-util.h" #include "dns-type.h" diff --git a/src/grp-resolve/libbasic-dns/test-dnssec.c b/src/grp-resolve/libbasic-dns/test-dnssec.c index 1f05196d8e..1e7b4913b0 100644 --- a/src/grp-resolve/libbasic-dns/test-dnssec.c +++ b/src/grp-resolve/libbasic-dns/test-dnssec.c @@ -21,9 +21,9 @@ #include #include -#include "basic/alloc-util.h" -#include "basic/hexdecoct.h" -#include "basic/string-util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/hexdecoct.h" +#include "systemd-basic/string-util.h" #include "resolved-dns-dnssec.h" #include "resolved-dns-rr.h" diff --git a/src/grp-resolve/libbasic-dns/test-resolve-tables.c b/src/grp-resolve/libbasic-dns/test-resolve-tables.c index 0eaab70687..6f96235dec 100644 --- a/src/grp-resolve/libbasic-dns/test-resolve-tables.c +++ b/src/grp-resolve/libbasic-dns/test-resolve-tables.c @@ -17,7 +17,7 @@ along with systemd; If not, see . ***/ -#include "shared/test-tables.h" +#include "systemd-shared/test-tables.h" #include "dns-type.h" -- cgit v1.2.3-54-g00ecf