From e61d3d8aae949383f1cb76a9e232e81aadc59123 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 24 Jan 2018 12:52:21 +0900 Subject: [PATCH 1/3] core/device: remove unused variable Follow-up for bf70ff2cff719905f9dc3f726eaba79780dcae55. --- src/core/device.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/core/device.c b/src/core/device.c index 7ce971ff3b..a43664d3bd 100644 --- a/src/core/device.c +++ b/src/core/device.c @@ -796,7 +796,6 @@ static int device_dispatch_io(sd_event_source *source, int fd, uint32_t revents, } if (streq(action, "change")) { - _cleanup_free_ char *e = NULL; Unit *u; Device *d, *l, *n; From a219c2698ee468fedc574837987f90c5a4606e94 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 24 Jan 2018 12:54:12 +0900 Subject: [PATCH 2/3] systemctl: remove unused variable Follow-up for 98f609368723529a98f44948569fd2eb2dd9685d. --- src/systemctl/systemctl.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c index e5e3803f84..adfb1f01fe 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -6247,7 +6247,6 @@ static int normalize_names(char **names, bool warn_if_path) { } static int unit_exists(LookupPaths *lp, const char *unit) { - _cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL; _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL; _cleanup_free_ char *path = NULL; static const struct bus_properties_map property_map[] = { From 546e635a4ef2e360e5c3945b40dcd551a4cdaaa6 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 24 Jan 2018 12:58:04 +0900 Subject: [PATCH 3/3] resolve: fix build without gcrypt Follow-up for 73a4cd17c37f61159a365e55bdd5ff2b8327d439. Fixes #7977. --- src/resolve/resolved-dns-packet.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/resolve/resolved-dns-packet.c b/src/resolve/resolved-dns-packet.c index b6feddba98..2067dd5182 100644 --- a/src/resolve/resolved-dns-packet.c +++ b/src/resolve/resolved-dns-packet.c @@ -756,7 +756,7 @@ int dns_packet_append_opt(DnsPacket *p, uint16_t max_udp_size, bool edns0_do, in static const uint8_t rfc6975[] = { 0, 5, /* OPTION_CODE: DAU */ -#if GCRYPT_VERSION_NUMBER >= 0x010600 +#if HAVE_GCRYPT && GCRYPT_VERSION_NUMBER >= 0x010600 0, 7, /* LIST_LENGTH */ #else 0, 6, /* LIST_LENGTH */ @@ -767,7 +767,7 @@ int dns_packet_append_opt(DnsPacket *p, uint16_t max_udp_size, bool edns0_do, in DNSSEC_ALGORITHM_RSASHA512, DNSSEC_ALGORITHM_ECDSAP256SHA256, DNSSEC_ALGORITHM_ECDSAP384SHA384, -#if GCRYPT_VERSION_NUMBER >= 0x010600 +#if HAVE_GCRYPT && GCRYPT_VERSION_NUMBER >= 0x010600 DNSSEC_ALGORITHM_ED25519, #endif