From b95162945c162d2387aa93d83b17b4ef10d46a9b Mon Sep 17 00:00:00 2001 From: Aki Tuomi Date: Fri, 30 Oct 2020 21:46:11 +0200 Subject: [PATCH] pdns: svc-records - Delete default constructor It is not usable --- pdns/svc-records.cc | 2 -- pdns/svc-records.hh | 2 +- pdns/test-svc_records_cc.cc | 10 +++++----- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/pdns/svc-records.cc b/pdns/svc-records.cc index 90d1e77a98..cba2776056 100644 --- a/pdns/svc-records.cc +++ b/pdns/svc-records.cc @@ -56,8 +56,6 @@ std::string SvcParam::keyToString(const SvcParam::SvcParamKey& k) { return "key" + std::to_string(k); } -SvcParam::SvcParam() {}; - SvcParam::SvcParam(const SvcParamKey &key) { d_key = key; if (d_key != SvcParamKey::no_default_alpn) { diff --git a/pdns/svc-records.hh b/pdns/svc-records.hh index 5f154c99f8..327227dda8 100644 --- a/pdns/svc-records.hh +++ b/pdns/svc-records.hh @@ -42,7 +42,7 @@ class SvcParam { }; //! empty Param, unusable - SvcParam(); + SvcParam() = delete; //! To create a value-less SvcParam (like no-default-alpn) SvcParam(const SvcParamKey &key); diff --git a/pdns/test-svc_records_cc.cc b/pdns/test-svc_records_cc.cc index a096cc68c1..98b41d25b7 100644 --- a/pdns/test-svc_records_cc.cc +++ b/pdns/test-svc_records_cc.cc @@ -73,7 +73,6 @@ BOOST_AUTO_TEST_CASE(test_SvcParam_ctor_no_value) { BOOST_AUTO_TEST_CASE(test_SvcParam_ctor_value) { string val = "foobar"; auto base64val = Base64Encode(val); - SvcParam param; BOOST_CHECK_THROW(SvcParam(SvcParam::mandatory, val), std::invalid_argument); BOOST_CHECK_THROW(SvcParam(SvcParam::alpn, val), std::invalid_argument); @@ -82,6 +81,7 @@ BOOST_AUTO_TEST_CASE(test_SvcParam_ctor_value) { BOOST_CHECK_THROW(SvcParam(SvcParam::ipv4hint, val), std::invalid_argument); BOOST_CHECK_THROW(SvcParam(SvcParam::ipv6hint, val), std::invalid_argument); + SvcParam param(SvcParam::keyFromString("no-default-alpn")); BOOST_CHECK_NO_THROW(param = SvcParam(SvcParam::ech, base64val)); BOOST_CHECK_EQUAL(param.getECH(), base64val); BOOST_CHECK_THROW(param.getValue(), std::invalid_argument); @@ -118,7 +118,7 @@ BOOST_AUTO_TEST_CASE(test_SvcParam_ctor_set_string_value) { set mandatoryVal = {"alpn", "key666"}; set mandatoryExpected = {SvcParam::alpn, (SvcParam::SvcParamKey)666}; - SvcParam param; + SvcParam param(SvcParam::keyFromString("no-default-alpn")); BOOST_CHECK_NO_THROW(param = SvcParam(SvcParam::keyFromString("mandatory"), std::move(mandatoryVal))); auto retval = param.getMandatory(); @@ -141,7 +141,7 @@ BOOST_AUTO_TEST_CASE(test_SvcParam_ctor_vector_string_value) { BOOST_CHECK_THROW(SvcParam(SvcParam::ech, std::move(val)), std::invalid_argument); BOOST_CHECK_THROW(SvcParam(SvcParam::ipv6hint, std::move(val)), std::invalid_argument); - SvcParam param; + SvcParam param(SvcParam::keyFromString("no-default-alpn")); BOOST_CHECK_NO_THROW(param = SvcParam(SvcParam::keyFromString("alpn"), std::move(val))); auto alpns = param.getALPN(); @@ -176,7 +176,7 @@ BOOST_AUTO_TEST_CASE(test_SvcParam_ctor_set_comboaddress_value) { BOOST_CHECK_THROW(SvcParam(SvcParam::ipv6hint, std::move(mixedVal)), std::invalid_argument); BOOST_CHECK_THROW(SvcParam(SvcParam::ipv4hint, std::move(mixedVal)), std::invalid_argument); - SvcParam param; + SvcParam param(SvcParam::keyFromString("no-default-alpn")); BOOST_CHECK_NO_THROW(param = SvcParam(SvcParam::ipv4hint, std::move(v4Val))); auto retval = param.getIPHints(); @@ -208,7 +208,7 @@ BOOST_AUTO_TEST_CASE(test_SvcParam_ctor_uint16_value) { BOOST_CHECK_THROW(SvcParam(SvcParam::ech, port), std::invalid_argument); BOOST_CHECK_THROW(SvcParam(SvcParam::ipv6hint, port), std::invalid_argument); - SvcParam param; + SvcParam param(SvcParam::keyFromString("no-default-alpn")); BOOST_CHECK_NO_THROW(param = SvcParam(SvcParam::port, port)); BOOST_CHECK_EQUAL(param.getPort(), port); BOOST_CHECK_THROW(param.getMandatory(), std::invalid_argument); -- 2.47.2