From 06cd836342cd393ec1ae2d25733973dd7a656168 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 22 Feb 2021 12:20:34 +0100 Subject: [PATCH] resolved: inline trivial function --- src/resolve/resolved-dns-stub.c | 9 --------- src/resolve/resolved-dns-stub.h | 6 +++++- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/resolve/resolved-dns-stub.c b/src/resolve/resolved-dns-stub.c index 78f7cb854f4..2cfabb3629e 100644 --- a/src/resolve/resolved-dns-stub.c +++ b/src/resolve/resolved-dns-stub.c @@ -89,15 +89,6 @@ DnsStubListenerExtra *dns_stub_listener_extra_free(DnsStubListenerExtra *p) { return mfree(p); } -uint16_t dns_stub_listener_extra_port(DnsStubListenerExtra *p) { - assert(p); - - if (p->port > 0) - return p->port; - - return 53; -} - static void stub_packet_hash_func(const DnsPacket *p, struct siphash *state) { assert(p); diff --git a/src/resolve/resolved-dns-stub.h b/src/resolve/resolved-dns-stub.h index cf03d7f7000..3b9bf65b217 100644 --- a/src/resolve/resolved-dns-stub.h +++ b/src/resolve/resolved-dns-stub.h @@ -35,7 +35,11 @@ extern const struct hash_ops dns_stub_listener_extra_hash_ops; int dns_stub_listener_extra_new(Manager *m, DnsStubListenerExtra **ret); DnsStubListenerExtra *dns_stub_listener_extra_free(DnsStubListenerExtra *p); -uint16_t dns_stub_listener_extra_port(DnsStubListenerExtra *p); +static inline uint16_t dns_stub_listener_extra_port(DnsStubListenerExtra *p) { + assert(p); + + return p->port > 0 ? p->port : 53; +} void manager_dns_stub_stop(Manager *m); int manager_dns_stub_start(Manager *m); -- 2.47.3