shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-28 02:50:16 +03:00
Code

Merge pull request #7979 from yuwata/unused-variables

Browse Source 
Small cleanups
This commit is contained in:
Lennart Poettering 2018-01-24 09:40:04 +01:00 committed by GitHub
commit 1302e7aa94
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/core/device.c
View File

@ -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;

4
src/resolve/resolved-dns-packet.c
View File

@ -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

1
src/systemctl/systemctl.c
View File

@ -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[] = {