From 7cbfbeaf3189d0d33ad9e41e88faf8eb6ec780fc Mon Sep 17 00:00:00 2001 From: Andrei Pavel Date: Mon, 25 Jul 2022 11:10:21 +0300 Subject: [PATCH] [#2505] release changes --- src/bin/dhcp4/dhcp4_srv.cc | 4 ++-- src/bin/dhcp4/tests/dhcp4_test_utils.h | 2 +- src/bin/dhcp6/dhcp6_srv.cc | 4 ++-- src/bin/dhcp6/tests/dhcp6_test_utils.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/bin/dhcp4/dhcp4_srv.cc b/src/bin/dhcp4/dhcp4_srv.cc index 406c0ff4a4..263cb8726c 100644 --- a/src/bin/dhcp4/dhcp4_srv.cc +++ b/src/bin/dhcp4/dhcp4_srv.cc @@ -1430,7 +1430,7 @@ Dhcpv4Srv::processDhcp4Query(Pkt4Ptr& query, Pkt4Ptr& rsp, // In MT there are 2 cases: // 1. packet is unparked before current thread smart pointer to // ScopedCalloutHandleState is destroyed: - // - the lamba uses the smart pointer to set the callout which adds the + // - the lambda uses the smart pointer to set the callout which adds the // task, but the task is added after ScopedCalloutHandleState is // destroyed, on the destruction of the last reference which is held // by the current thread. @@ -1438,7 +1438,7 @@ Dhcpv4Srv::processDhcp4Query(Pkt4Ptr& query, Pkt4Ptr& rsp, // ScopedCalloutHandleState is destroyed: // - the current thread reference to ScopedCalloutHandleState is // destroyed, but the reference in the lambda keeps it alive until - // the lamba is called and the last reference is released, at which + // the lambda is called and the last reference is released, at which // time the task is actually added. // Use the RAII wrapper to make sure that the callout handle state is // reset when this object goes out of scope. All hook points must do diff --git a/src/bin/dhcp4/tests/dhcp4_test_utils.h b/src/bin/dhcp4/tests/dhcp4_test_utils.h index fc20cb066e..17a3d5a75d 100644 --- a/src/bin/dhcp4/tests/dhcp4_test_utils.h +++ b/src/bin/dhcp4/tests/dhcp4_test_utils.h @@ -650,7 +650,7 @@ public: /// @brief Checks if server port can be overridden in packets being sent. void portsServerPort(); - /// @breif Check if example files contain valid configuration. + /// @brief Check if example files contain valid configuration. void checkConfigFiles(); /// @brief Check if the server configuration stored in file is valid. diff --git a/src/bin/dhcp6/dhcp6_srv.cc b/src/bin/dhcp6/dhcp6_srv.cc index 5b4debb1e3..1ad99099ea 100644 --- a/src/bin/dhcp6/dhcp6_srv.cc +++ b/src/bin/dhcp6/dhcp6_srv.cc @@ -1063,7 +1063,7 @@ Dhcpv6Srv::processDhcp6Query(Pkt6Ptr& query, Pkt6Ptr& rsp) { // In MT there are 2 cases: // 1. packet is unparked before current thread smart pointer to // ScopedCalloutHandleState is destroyed: - // - the lamba uses the smart pointer to set the callout which adds the + // - the lambda uses the smart pointer to set the callout which adds the // task, but the task is added after ScopedCalloutHandleState is // destroyed, on the destruction of the last reference which is held // by the current thread. @@ -1071,7 +1071,7 @@ Dhcpv6Srv::processDhcp6Query(Pkt6Ptr& query, Pkt6Ptr& rsp) { // ScopedCalloutHandleState is destroyed: // - the current thread reference to ScopedCalloutHandleState is // destroyed, but the reference in the lambda keeps it alive until - // the lamba is called and the last reference is released, at which + // the lambda is called and the last reference is released, at which // time the task is actually added. // Use the RAII wrapper to make sure that the callout handle state is // reset when this object goes out of scope. All hook points must do diff --git a/src/bin/dhcp6/tests/dhcp6_test_utils.h b/src/bin/dhcp6/tests/dhcp6_test_utils.h index 65481fef54..856f1a40f6 100644 --- a/src/bin/dhcp6/tests/dhcp6_test_utils.h +++ b/src/bin/dhcp6/tests/dhcp6_test_utils.h @@ -840,7 +840,7 @@ public: multi_threading_ = enabled; } - /// @breif Check if example files contain valid configuration. + /// @brief Check if example files contain valid configuration. void checkConfigFiles(); /// @brief Check if the server configuration stored in file is valid. -- 2.47.2