From: Andrei Pavel Date: Wed, 22 Mar 2023 11:13:46 +0000 (+0000) Subject: Applying suggested changes X-Git-Tag: Kea-2.3.6~51 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=13fae7730d23d326f9bcda4ea1788be4abd89bce;p=thirdparty%2Fkea.git Applying suggested changes --- diff --git a/src/lib/dhcpsrv/client_class_def.h b/src/lib/dhcpsrv/client_class_def.h index 80655974de..0cede454c8 100644 --- a/src/lib/dhcpsrv/client_class_def.h +++ b/src/lib/dhcpsrv/client_class_def.h @@ -224,14 +224,13 @@ public: /// @brief Sets offer lifetime for the class. /// - /// Will be used for the offer lifetime (may be empty if not defined) + /// @param offer_lft the offer lifetime assigned to the class (may be empty if not defined) void setOfferLft(const util::Optional& offer_lft) { offer_lft_ = offer_lft; } /// @brief Returns offer lifetime for the class. /// - /// @param inheritance inheritance mode to be used. /// @return offer lifetime value util::Optional getOfferLft() const { return (offer_lft_); diff --git a/src/lib/dhcpsrv/network.h b/src/lib/dhcpsrv/network.h index e6b81bfc25..de3ce2a64a 100644 --- a/src/lib/dhcpsrv/network.h +++ b/src/lib/dhcpsrv/network.h @@ -1312,7 +1312,7 @@ public: /// @brief Sets offer lifetime for the network. /// - /// Will be used for the offer lifetime (may be empty if not defined) + /// @param offer_lft the offer lifetime assigned to the class (may be empty if not defined) void setOfferLft(const util::Optional& offer_lft) { offer_lft_ = offer_lft; } diff --git a/src/lib/dhcpsrv/tests/alloc_engine4_unittest.cc b/src/lib/dhcpsrv/tests/alloc_engine4_unittest.cc index d2e650d913..f375756577 100644 --- a/src/lib/dhcpsrv/tests/alloc_engine4_unittest.cc +++ b/src/lib/dhcpsrv/tests/alloc_engine4_unittest.cc @@ -5782,7 +5782,7 @@ TEST_F(AllocEngine4Test, discoverOfferLftReuseExpiredLease4) { // Verifies that AllocEngine::getOfferLft(ctx4) returns the appropriate // lifetime value based on the context content. -TEST_F(AllocEngine4Test, getOfferft4) { +TEST_F(AllocEngine4Test, getOfferLft4) { AllocEngine engine(0); // Let's make three classes, two with offer-lifetime and one without, diff --git a/src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc b/src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc index 9b6eb3c467..3d6703d850 100644 --- a/src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc +++ b/src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc @@ -426,7 +426,7 @@ public: // position of the data element which caused failure. if (rcode_ != 0) { EXPECT_TRUE(errorContainsPosition(status, "")) - << "error text:" << error_text_; + << "error text: " << error_text_; } } diff --git a/src/share/database/scripts/mysql/upgrade_014_to_015.sh.in b/src/share/database/scripts/mysql/upgrade_014_to_015.sh.in index a65ac76e38..3bc0afde19 100644 --- a/src/share/database/scripts/mysql/upgrade_014_to_015.sh.in +++ b/src/share/database/scripts/mysql/upgrade_014_to_015.sh.in @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2022-2023 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2023 Internet Systems Consortium, Inc. ("ISC") # # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this