[#3605] Remove extra semis

src/bin/agent/ca_command_mgr.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2017-2022 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2017-2024 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
@@ -20,7 +20,7 @@ namespace agent {
 class CommandForwardingError : public Exception {
 public:
     CommandForwardingError(const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 /// @brief Command Manager for Control Agent.

src/bin/agent/ca_process.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2016-2021 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2016-2024 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
@@ -149,7 +149,7 @@ private:
 /// @brief Defines a shared pointer to CtrlAgentProcess.
 typedef boost::shared_ptr<CtrlAgentProcess> CtrlAgentProcessPtr;
 
-}; // namespace isc::agent
-}; // namespace isc
+}  // namespace isc::agent
+}  // namespace isc
 
 #endif // CTRL_AGENT_PROCESS_H

src/bin/agent/parser_context_decl.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2017 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2017-2024 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
@@ -14,7 +14,7 @@ namespace agent {
 
 class ParserContext;
 
-}; // end of isc::dhcp namespace
-}; // end of isc namespace
+}  // end of isc::dhcp namespace
+}  // end of isc namespace
 
 #endif

src/bin/d2/check_exists_add.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2023 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2023-2024 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
@@ -20,7 +20,7 @@ class CheckExistsAddTransactionError : public isc::Exception {
 public:
     CheckExistsAddTransactionError(const char* file, size_t line,
                                const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 /// @brief Embodies the "life-cycle" required to carry out a DDNS Add update.

src/bin/d2/check_exists_remove.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2023 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2023-2024 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
@@ -19,7 +19,7 @@ class CheckExistsRemoveTransactionError : public isc::Exception {
 public:
     CheckExistsRemoveTransactionError(const char* file, size_t line,
                                const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 /// @brief Embodies the "life-cycle" required to carry out a DDNS Remove update.

src/bin/d2/d2_controller.h

@@ -83,7 +83,7 @@ private:
     friend class NakedD2Controller;
 };
 
-}; // namespace isc::d2
-}; // namespace isc
+}  // namespace isc::d2
+}  // namespace isc
 
 #endif

src/bin/d2/d2_queue_mgr.h

@@ -28,7 +28,7 @@ typedef std::deque<dhcp_ddns::NameChangeRequestPtr> RequestQueue;
 class D2QueueMgrError : public isc::Exception {
 public:
     D2QueueMgrError(const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 /// @brief Thrown if the queue manager's receive handler is passed
@@ -37,7 +37,7 @@ public:
 class D2QueueMgrReceiveError : public isc::Exception {
 public:
     D2QueueMgrReceiveError(const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 /// @brief Thrown if the request queue is full when an enqueue is attempted.
@@ -45,21 +45,21 @@ public:
 class D2QueueMgrQueueFull : public isc::Exception {
 public:
     D2QueueMgrQueueFull(const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 /// @brief Thrown if the request queue empty and a read is attempted.
 class D2QueueMgrQueueEmpty : public isc::Exception {
 public:
     D2QueueMgrQueueEmpty(const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 /// @brief Thrown if a queue index is beyond the end of the queue
 class D2QueueMgrInvalidIndex : public isc::Exception {
 public:
     D2QueueMgrInvalidIndex(const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 /// @brief D2QueueMgr creates and manages a queue of DNS update requests.

src/bin/d2/d2_update_mgr.h

@@ -27,7 +27,7 @@ namespace d2 {
 class D2UpdateMgrError : public isc::Exception {
 public:
     D2UpdateMgrError(const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 /// @brief Defines a list of transactions.

src/bin/d2/nc_add.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2013-2021 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013-2024 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
@@ -20,7 +20,7 @@ class NameAddTransactionError : public isc::Exception {
 public:
     NameAddTransactionError(const char* file, size_t line,
                                const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 /// @brief Embodies the "life-cycle" required to carry out a DDNS Add update.

src/bin/d2/nc_remove.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2013-2021 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013-2024 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
@@ -19,7 +19,7 @@ class NameRemoveTransactionError : public isc::Exception {
 public:
     NameRemoveTransactionError(const char* file, size_t line,
                                const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 /// @brief Embodies the "life-cycle" required to carry out a DDNS Remove update.

src/bin/d2/parser_context.h

@@ -28,7 +28,7 @@ namespace d2 {
 class D2ParseError : public isc::Exception {
 public:
     D2ParseError(const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 /// @brief Evaluation context, an interface to the expression evaluation.

src/bin/d2/parser_context_decl.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2017 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2017-2024 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
@@ -14,7 +14,7 @@ namespace d2 {
 
 class D2ParserContext;
 
-}; // end of isc::dhcp namespace
-}; // end of isc namespace
+}  // end of isc::dhcp namespace
+}  // end of isc namespace
 
 #endif

src/bin/d2/simple_add.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2020-2021 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2020-2024 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
@@ -20,7 +20,7 @@ class SimpleAddTransactionError : public isc::Exception {
 public:
     SimpleAddTransactionError(const char* file, size_t line,
                                const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 /// @brief Embodies the "life-cycle" required to carry out a DDNS Add update.

src/bin/d2/simple_add_without_dhcid.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2023 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2023-2024 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
@@ -20,7 +20,7 @@ class SimpleAddWithoutDHCIDTransactionError : public isc::Exception {
 public:
     SimpleAddWithoutDHCIDTransactionError(const char* file, size_t line,
                                const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 /// @brief Embodies the "life-cycle" required to carry out a DDNS Add update

src/bin/d2/simple_remove.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2020-2021 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2020-2024 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
@@ -19,7 +19,7 @@ class SimpleRemoveTransactionError : public isc::Exception {
 public:
     SimpleRemoveTransactionError(const char* file, size_t line,
                                const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 /// @brief Embodies the "life-cycle" required to carry out a DDNS Remove update.

src/bin/d2/simple_remove_without_dhcid.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2023 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2023-2024 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
@@ -19,7 +19,7 @@ class SimpleRemoveWithoutDHCIDTransactionError : public isc::Exception {
 public:
     SimpleRemoveWithoutDHCIDTransactionError(const char* file, size_t line,
                                const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 /// @brief Embodies the "life-cycle" required to carry out a DDNS Remove update without

src/bin/d2/tests/d2_controller_unittests.cc

@@ -300,5 +300,5 @@ TEST_F(D2ControllerTest, sigtermShutdown) {
     /// @todo add a way to trap log file and search it
 }
 
-}; // end of isc::d2 namespace
-}; // end of isc namespace
+}  // end of isc::d2 namespace
+}  // end of isc namespace

src/bin/dhcp4/parser_context.h

@@ -28,7 +28,7 @@ namespace dhcp {
 class Dhcp4ParseError : public isc::Exception {
 public:
     Dhcp4ParseError(const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 /// @brief Evaluation context, an interface to the expression evaluation.
@@ -421,7 +421,7 @@ public:
     isc::data::ElementPtr parseCommon();
 };
 
-}; // end of isc::eval namespace
-}; // end of isc namespace
+}  // namespace dhcp
+}  // namespace isc
 
 #endif

src/bin/dhcp4/parser_context_decl.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2016 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2016-2024 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
@@ -14,7 +14,7 @@ namespace dhcp {
 
 class Parser4Context;
 
-}; // end of isc::dhcp namespace
-}; // end of isc namespace
+}  // namespace dhcp
+}  // namespace isc
 
 #endif

src/bin/dhcp4/tests/d2_unittest.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2015 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2014-2024 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
@@ -108,8 +108,8 @@ public:
     D2Dhcpv4Srv srv_;
 };
 
-}; // end of isc::dhcp::test namespace
-}; // end of isc::dhcp namespace
-}; // end of isc namespace
+}  // end of isc::dhcp::test namespace
+}  // end of isc::dhcp namespace
+}  // end of isc namespace
 
 #endif // D2_UNITTEST_H

src/bin/dhcp4/tests/dhcp4_client.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2020 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2014-2024 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
@@ -25,7 +25,7 @@ namespace test {
 class Dhcp4ClientError : public isc::Exception {
 public:
     Dhcp4ClientError(const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 /// @brief DHCPv4 client used for unit testing.

src/bin/dhcp6/dhcp6_srv.h

@@ -48,7 +48,7 @@ namespace dhcp {
 class DHCPv6DiscardMessageError : public Exception {
 public:
     DHCPv6DiscardMessageError(const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 /// @brief DHCPv6 server service.

src/bin/dhcp6/parser_context.h

@@ -28,7 +28,7 @@ namespace dhcp {
 class Dhcp6ParseError : public isc::Exception {
 public:
     Dhcp6ParseError(const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 /// @brief Evaluation context, an interface to the expression evaluation.
@@ -427,7 +427,7 @@ public:
     isc::data::ElementPtr parseCommon();
 };
 
-}; // end of isc::eval namespace
-}; // end of isc namespace
+}  // namespace dhcp
+}  // namespace isc
 
 #endif

src/bin/dhcp6/parser_context_decl.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2016 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2016-2024 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
@@ -14,7 +14,7 @@ namespace dhcp {
 
 class Parser6Context;
 
-}; // end of isc::dhcp namespace
-}; // end of isc namespace
+}  // namespace dhcp
+}  // namespace isc
 
 #endif

src/bin/dhcp6/tests/d2_unittest.h

@@ -106,8 +106,8 @@ public:
     D2Dhcpv6Srv srv_;
 };
 
-}; // end of isc::dhcp::test namespace
-}; // end of isc::dhcp namespace
-}; // end of isc namespace
+}  // end of isc::dhcp::test namespace
+}  // end of isc::dhcp namespace
+}  // end of isc namespace
 
 #endif // D2_UNITTEST_H

src/bin/dhcp6/tests/dhcp6_client.cc

@@ -92,7 +92,7 @@ void getLeasesByPool(const Dhcp6Client::Configuration& config,
     }
 }
 
-}; // end of anonymous namespace
+}  // end of anonymous namespace
 
 namespace isc {
 namespace dhcp {

src/bin/lfc/lfc_controller.cc

@@ -35,7 +35,7 @@ using namespace isc::log;
 namespace {
 /// @brief Maximum number of errors to allow when reading leases from the file.
 const uint32_t MAX_LEASE_ERRORS = 100;
-}; // namespace anonymous
+}  // namespace anonymous
 
 namespace isc {
 namespace lfc {
@@ -438,5 +438,5 @@ LFCController::startLogger(const bool test_mode) const {
     }
 }
 
-}; // namespace isc::lfc
-}; // namespace isc
+}  // namespace isc::lfc
+}  // namespace isc

src/bin/lfc/lfc_controller.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2015-2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2015-2024 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
@@ -17,7 +17,7 @@ namespace lfc {
 class InvalidUsage : public isc::Exception {
 public:
     InvalidUsage(const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 /// @brief Exceptions thrown when a method is unable to manipulate
@@ -25,7 +25,7 @@ public:
 class RunTimeFail : public isc::Exception {
 public:
     RunTimeFail(const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 /// @brief Process controller for LFC process
@@ -197,7 +197,7 @@ private:
     void startLogger(const bool test_mode) const;
 };
 
-}; // namespace isc::lfc
-}; // namespace isc
+}  // namespace isc::lfc
+}  // namespace isc
 
 #endif // LFC_CONTROLLER_H

src/hooks/dhcp/high_availability/ha_config.h

@@ -28,7 +28,7 @@ namespace ha {
 class HAConfigValidationError : public Exception {
 public:
     HAConfigValidationError(const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 class HAConfig;

src/hooks/dhcp/lease_cmds/lease_cmds_exceptions.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2022 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2022-2024 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
@@ -19,7 +19,7 @@
 class LeaseCmdsConflict : public isc::Exception {
 public:
     LeaseCmdsConflict(const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 #endif // LEASE_CMDS_EXCEPTIONS_H

src/hooks/dhcp/lease_cmds/lease_parser.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2017-2022 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2017-2024 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
@@ -98,7 +98,7 @@ public:
     virtual ~Lease6Parser() {}
 };
 
-}; // end of isc::dhcp namespace
-}; // end of isc namespace
+}  // end of isc::dhcp namespace
+}  // end of isc namespace
 
 #endif

src/hooks/dhcp/stat_cmds/stat_cmds.cc

@@ -43,7 +43,7 @@ namespace stat_cmds {
 class NotFound: public isc::Exception {
 public:
     NotFound (const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 /// @brief Implements command handling for stat-leaseX-get commands

src/hooks/dhcp/user_chk/user_data_source.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2013-2015 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013-2024 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
@@ -17,7 +17,7 @@ class UserDataSourceError : public isc::Exception {
 public:
     UserDataSourceError(const char* file, size_t line,
                                const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 /// @brief Defines an interface for reading user data into a registry.

src/lib/asiolink/process_spawn.h

@@ -22,7 +22,7 @@ namespace asiolink {
 class ProcessSpawnError : public Exception {
 public:
     ProcessSpawnError(const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 /// @brief Forward declaration to the implementation of the @c ProcessSpawn

src/lib/asiolink/unix_domain_socket.h

@@ -20,7 +20,7 @@ namespace asiolink {
 class UnixDomainSocketError : public Exception {
 public:
     UnixDomainSocketError(const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 class UnixDomainSocketImpl;

src/lib/cc/cfg_to_element.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2017 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2017-2024 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
@@ -19,7 +19,7 @@ namespace isc {
 class ToElementError : public isc::Exception {
 public:
     ToElementError(const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 namespace data {
@@ -42,7 +42,7 @@ struct CfgToElement {
     virtual isc::data::ElementPtr toElement() const = 0;
 };
 
-}; // namespace isc::dhcp
-}; // namespace isc
+}  // namespace dhcp
+}  // namespace isc
 
 #endif // CFG_TO_ELEMENT_H

src/lib/cc/command_interpreter.h

@@ -219,7 +219,7 @@ isc::data::ConstElementPtr
 combineCommandsLists(const isc::data::ConstElementPtr& response1,
                      const isc::data::ConstElementPtr& response2);
 
-}; // end of namespace isc::config
-}; // end of namespace isc
+}  // namespace config
+}  // namespace isc
 
 #endif // COMMAND_INTERPRETER_H

src/lib/cc/data.h

@@ -172,7 +172,7 @@ protected:
 
 public:
     // base class; make dtor virtual
-    virtual ~Element() {};
+    virtual ~Element() {}
 
     /// @return the type of this element
     types getType() const { return (type_); }
@@ -232,24 +232,24 @@ public:
     /// getValue() below
     //@{
     virtual int64_t intValue() const
-    { throwTypeError("intValue() called on non-integer Element"); };
+    { throwTypeError("intValue() called on non-integer Element"); }
     virtual isc::util::int128_t bigIntValue() const {
         throwTypeError("bigIntValue() called on non-big-integer Element");
     }
     virtual double doubleValue() const
-    { throwTypeError("doubleValue() called on non-double Element"); };
+    { throwTypeError("doubleValue() called on non-double Element"); }
     virtual bool boolValue() const
-    { throwTypeError("boolValue() called on non-Bool Element"); };
+    { throwTypeError("boolValue() called on non-Bool Element"); }
     virtual std::string stringValue() const
-    { throwTypeError("stringValue() called on non-string Element"); };
+    { throwTypeError("stringValue() called on non-string Element"); }
     virtual const std::vector<ElementPtr>& listValue() const {
         // replace with real exception or empty vector?
         throwTypeError("listValue() called on non-list Element");
-    };
+    }
     virtual const std::map<std::string, ConstElementPtr>& mapValue() const {
         // replace with real exception or empty map?
         throwTypeError("mapValue() called on non-map Element");
-    };
+    }
     //@}
 
     /// @name Exception-safe getters
@@ -281,8 +281,8 @@ public:
     //@{
     virtual bool setValue(const long long int v);
     virtual bool setValue(const isc::util::int128_t& v);
-    bool setValue(const long int i) { return (setValue(static_cast<long long int>(i))); };
-    bool setValue(const int i) { return (setValue(static_cast<long long int>(i))); };
+    bool setValue(const long int i) { return (setValue(static_cast<long long int>(i))); }
+    bool setValue(const int i) { return (setValue(static_cast<long long int>(i))); }
     virtual bool setValue(const double v);
     virtual bool setValue(const bool t);
     virtual bool setValue(const std::string& v);
@@ -673,7 +673,7 @@ class DoubleElement : public Element {
 
 public:
     DoubleElement(double v, const Position& pos = ZERO_POSITION())
-        : Element(real, pos), d(v) {};
+        : Element(real, pos), d(v) {}
     double doubleValue() const { return (d); }
     using Element::getValue;
     bool getValue(double& t) const { t = d; return (true); }
@@ -688,7 +688,7 @@ class BoolElement : public Element {
 
 public:
     BoolElement(const bool v, const Position& pos = ZERO_POSITION())
-        : Element(boolean, pos), b(v) {};
+        : Element(boolean, pos), b(v) {}
     bool boolValue() const { return (b); }
     using Element::getValue;
     bool getValue(bool& t) const { t = b; return (true); }
@@ -701,7 +701,7 @@ public:
 class NullElement : public Element {
 public:
     NullElement(const Position& pos = ZERO_POSITION())
-        : Element(null, pos) {};
+        : Element(null, pos) {}
     void toJSON(std::ostream& ss) const;
     bool equals(const Element& other) const;
 };
@@ -711,7 +711,7 @@ class StringElement : public Element {
 
 public:
     StringElement(std::string v, const Position& pos = ZERO_POSITION())
-        : Element(string, pos), s(v) {};
+        : Element(string, pos), s(v) {}
     std::string stringValue() const { return (s); }
     using Element::getValue;
     bool getValue(std::string& t) const { t = s; return (true); }
@@ -745,9 +745,9 @@ public:
     void set(size_t i, ElementPtr e) {
         l.at(i) = e;
     }
-    void add(ElementPtr e) { l.push_back(e); };
+    void add(ElementPtr e) { l.push_back(e); }
     using Element::remove;
-    void remove(int i) { l.erase(l.begin() + i); };
+    void remove(int i) { l.erase(l.begin() + i); }
     void toJSON(std::ostream& ss) const;
     size_t size() const { return (l.size()); }
     bool empty() const { return (l.empty()); }

src/lib/cc/dhcp_config_error.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2017 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2017-2024 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
@@ -18,7 +18,7 @@ namespace isc {
 class ParseError : public isc::Exception {
  public:
  ParseError(const char* file, size_t line, const char* what) :
-    isc::Exception(file, line, what) { };
+    isc::Exception(file, line, what) { }
 };
 
 /// An exception that is thrown if an error occurs while configuring
@@ -66,7 +66,7 @@ public:
         : isc::Exception(file, line, what) {}
 };
 
-}; // end of isc::dhcp namespace
-}; // end of isc namespace
+}  // namespace dhcp
+}  // namespace isc
 
 #endif // DHCP_CONFIG_ERROR_H

src/lib/cc/json_feed.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2017-2021 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2017-2024 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
@@ -30,7 +30,7 @@ typedef boost::shared_ptr<const JSONFeed> ConstJSONFeedPtr;
 class JSONFeedError : public Exception {
 public:
     JSONFeedError(const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 /// @brief State model for asynchronous read of data in JSON format.

src/lib/cc/user_context.cc

@@ -1,4 +1,4 @@
-// Copyright (C) 2017-2020 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2017-2024 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
@@ -26,5 +26,5 @@ UserContext::toElement(ConstElementPtr map) {
     return (result);
 }
 
-}; // end of isc::dhcp namespace
-}; // end of isc namespace
+}  // end of isc::dhcp namespace
+}  // end of isc namespace

src/lib/config/base_command_mgr.cc

@@ -39,7 +39,7 @@ struct BaseCommandMgrHooks {
 // module is called.
 BaseCommandMgrHooks Hooks;
 
-}; // anonymous namespace
+}  // anonymous namespace
 
 namespace isc {
 namespace config {

src/lib/config/base_command_mgr.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2017-2023 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2017-2024 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
@@ -20,14 +20,14 @@ namespace config {
 class InvalidCommandHandler : public Exception {
 public:
     InvalidCommandHandler(const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 /// @brief Exception indicating that the command name is not valid
 class InvalidCommandName : public Exception {
 public:
     InvalidCommandName(const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 /// @brief Commands Manager, responsible for processing external commands.
@@ -103,7 +103,7 @@ public:
     BaseCommandMgr();
 
     /// @brief Destructor.
-    virtual ~BaseCommandMgr() { };
+    virtual ~BaseCommandMgr() { }
 
     /// @brief Triggers command processing.
     ///

src/lib/config/unix_command_mgr.h

@@ -20,14 +20,14 @@ namespace config {
 class BadSocketInfo : public Exception {
 public:
     BadSocketInfo(const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 /// @brief An exception indicating a problem with socket operation
 class SocketError : public Exception {
 public:
     SocketError(const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 class UnixCommandMgrImpl;

src/lib/d2srv/d2_config.h

@@ -136,7 +136,7 @@ namespace d2 {
 class D2CfgError : public isc::Exception {
 public:
     D2CfgError(const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 /// @brief Acts as a storage vault for D2 global scalar parameters

src/lib/d2srv/nc_trans.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2013-2021 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013-2024 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
@@ -28,7 +28,7 @@ class NameChangeTransactionError : public isc::Exception {
 public:
     NameChangeTransactionError(const char* file, size_t line,
                                const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 /// @brief Defines the type used as the unique key for transactions.

src/lib/d2srv/tests/nc_trans_unittests.cc

@@ -1259,4 +1259,4 @@ TEST_F(NameChangeTransactionTest, addPtrRdata) {
     EXPECT_EQ(ncr->getFqdn(), rdata_it->getCurrent().toText());
 }
 
-}; // anonymous namespace
+}  // anonymous namespace

src/lib/database/database_connection.h

@@ -147,7 +147,7 @@ public:
     }
 
     /// @brief Destructor
-    virtual ~DatabaseConnection(){};
+    virtual ~DatabaseConnection(){}
 
     /// @brief Instantiates a ReconnectCtl based on the connection's
     /// reconnect parameters

src/lib/dhcp/duid_factory.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2015-2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2015-2024 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
@@ -179,7 +179,7 @@ private:
 
 };
 
-}; // end of isc::dhcp namespace
-}; // end of isc namespace
+}  // end of isc::dhcp namespace
+}  // end of isc namespace
 
 #endif /* DUID_FACTORY_H */

src/lib/dhcp/hwaddr.cc

@@ -81,5 +81,5 @@ bool HWAddr::operator!=(const HWAddr& other) const {
     return !(*this == other);
 }
 
-}; // end of isc::dhcp namespace
-}; // end of isc namespace
+}  // end of isc::dhcp namespace
+}  // end of isc namespace

src/lib/dhcp/hwaddr.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2013-2015 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013-2024 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
@@ -153,7 +153,7 @@ public:
 /// @brief Shared pointer to a hardware address structure
 typedef boost::shared_ptr<HWAddr> HWAddrPtr;
 
-}; // end of isc::dhcp namespace
-}; // end of isc namespace
+}  // namespace dhcp
+}  // namespace isc
 
 #endif // HWADDR_H

src/lib/dhcp/iface_mgr.h

@@ -41,21 +41,21 @@ namespace dhcp {
 class IfaceDetectError : public Exception {
 public:
     IfaceDetectError(const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 /// @brief Exception thrown when it is not allowed to set new Packet Filter.
 class PacketFilterChangeDenied : public Exception {
 public:
     PacketFilterChangeDenied(const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 /// @brief Exception thrown when a call to select is interrupted by a signal.
 class SignalInterruptOnSelect : public Exception {
 public:
     SignalInterruptOnSelect(const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 /// @brief IfaceMgr exception thrown thrown when socket opening
@@ -63,7 +63,7 @@ public:
 class SocketConfigError : public Exception {
 public:
     SocketConfigError(const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 /// @brief IfaceMgr exception thrown thrown when error occurred during
@@ -71,7 +71,7 @@ public:
 class SocketReadError : public Exception {
 public:
     SocketReadError(const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 /// @brief IfaceMgr exception thrown thrown when error occurred during
@@ -79,21 +79,21 @@ public:
 class SocketWriteError : public Exception {
 public:
     SocketWriteError(const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 /// @brief IfaceMgr exception thrown when there is no suitable interface.
 class IfaceNotFound : public Exception {
 public:
     IfaceNotFound(const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 /// @brief IfaceMgr exception thrown when there is no suitable socket found.
 class SocketNotFound : public Exception {
 public:
     SocketNotFound(const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 /// @brief Represents a single network interface
@@ -221,7 +221,7 @@ public:
     /// @brief Returns interface name.
     ///
     /// @return interface name
-    std::string getName() const { return name_; };
+    std::string getName() const { return name_; }
 
     /// @brief Sets up hardware type of the interface.
     ///

src/lib/dhcp/opaque_data_tuple.h

@@ -23,7 +23,7 @@ namespace dhcp {
 class OpaqueDataTupleError : public Exception {
 public:
     OpaqueDataTupleError(const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 

src/lib/dhcp/option.h

@@ -52,7 +52,7 @@ typedef boost::shared_ptr<OptionCollection> OptionCollectionPtr;
 class SkipRemainingOptionsError : public Exception {
 public:
     SkipRemainingOptionsError (const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 /// @brief Exception thrown during option unpacking
@@ -67,7 +67,7 @@ public:
 class SkipThisOptionError : public Exception {
 public:
     SkipThisOptionError (const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 /// @brief Wrapper exception thrown by unpackOptionsX functions to
@@ -75,7 +75,7 @@ public:
 class OptionParseError : public Exception {
 public:
     OptionParseError (const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 class Option {

src/lib/dhcp/option6_status_code.cc

@@ -22,7 +22,7 @@ namespace {
 const size_t OPTION6_STATUS_CODE_MIN_LEN = sizeof(uint16_t);
 const size_t OPTION4_SLP_SERVICE_SCOPEMIN_LEN = sizeof(uint8_t);
 
-}; // end of anonymous namespace
+}  // end of anonymous namespace
 
 namespace isc {
 namespace dhcp {

src/lib/dhcp/option_data_types.h

@@ -23,14 +23,14 @@ namespace dhcp {
 class InvalidDataType : public Exception {
 public:
     InvalidDataType(const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 /// @brief Exception to be thrown when cast to the data type was unsuccessful.
 class BadDataTypeCast : public Exception {
 public:
     BadDataTypeCast(const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 /// @brief Data types of DHCP option fields.

src/lib/dhcp/option_definition.h

@@ -30,14 +30,14 @@ namespace dhcp {
 class InvalidOptionValue : public Exception {
 public:
     InvalidOptionValue(const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 /// @brief Exception to be thrown when option definition is invalid.
 class MalformedOptionDefinition : public Exception {
 public:
     MalformedOptionDefinition(const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 /// @brief Exception to be thrown when the particular option definition
@@ -45,7 +45,7 @@ public:
 class DuplicateOptionDefinition : public Exception {
 public:
     DuplicateOptionDefinition(const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 /// @brief Forward declaration to OptionDefinition.
@@ -384,7 +384,7 @@ public:
     /// @brief Return option data type.
     ///
     /// @return option data type.
-    OptionDataType getType() const { return (type_); };
+    OptionDataType getType() const { return (type_); }
 
     /// @brief Returns const pointer to the user context
     data::ConstElementPtr getContext() const {

src/lib/dhcp/option_space.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2012-2020 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012-2024 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
@@ -23,7 +23,7 @@ namespace dhcp {
 class InvalidOptionSpace : public Exception {
 public:
     InvalidOptionSpace(const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 /// OptionSpace forward declaration.

src/lib/dhcp/packet_queue.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2018-2022 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2018-2024 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
@@ -57,7 +57,7 @@ public:
         :  queue_type_(queue_type) {}
 
     /// Virtual destructor
-    virtual ~PacketQueue(){};
+    virtual ~PacketQueue(){}
 
     /// @brief Adds a packet to the queue
     ///
@@ -117,7 +117,7 @@ public:
     /// @return Fetches the logical name of the type of this queue.
     std::string getQueueType() {
         return (queue_type_);
-    };
+    }
 
 private:
     /// @brief Logical name of the this queue's implementation type.
@@ -135,7 +135,7 @@ typedef boost::shared_ptr<PacketQueue<Pkt4Ptr>> PacketQueue4Ptr;
 /// DHCPv6 packet queue factories.
 typedef boost::shared_ptr<PacketQueue<Pkt6Ptr>> PacketQueue6Ptr;
 
-}; // namespace isc::dhcp
-}; // namespace isc
+}  // namespace dhcp
+}  // namespace isc
 
 #endif // PACKET_QUEUE_H

src/lib/dhcp/packet_queue_ring.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2018-2022 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2018-2024 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
@@ -257,7 +257,7 @@ public:
     virtual ~PacketQueueRing6(){}
 };
 
-}; // namespace isc::dhcp
-}; // namespace isc
+}  // namespace isc::dhcp
+}  // namespace isc
 
 #endif // PACKET_QUEUE_RING_H

src/lib/dhcp/pkt4.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2011-2023 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2011-2024 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
@@ -140,12 +140,12 @@ public:
     /// @brief Sets hops field.
     ///
     /// @param hops value to be set
-    void setHops(uint8_t hops) { hops_ = hops; };
+    void setHops(uint8_t hops) { hops_ = hops; }
 
     /// @brief Returns hops field.
     ///
     /// @return hops field
-    uint8_t getHops() const { return (hops_); };
+    uint8_t getHops() const { return (hops_); }
 
     // Note: There's no need to manipulate OP field directly,
     // thus no setOp() method. See op_ comment.
@@ -153,75 +153,75 @@ public:
     /// @brief Returns op field.
     ///
     /// @return op field
-    uint8_t getOp() const { return (op_); };
+    uint8_t getOp() const { return (op_); }
 
     /// @brief Sets secs field.
     ///
     /// @param secs value to be set
-    void setSecs(uint16_t secs) { secs_ = secs; };
+    void setSecs(uint16_t secs) { secs_ = secs; }
 
     /// @brief Returns secs field.
     ///
     /// @return secs field
-    uint16_t getSecs() const { return (secs_); };
+    uint16_t getSecs() const { return (secs_); }
 
     /// @brief Sets flags field.
     ///
     /// @param flags value to be set
-    void setFlags(uint16_t flags) { flags_ = flags; };
+    void setFlags(uint16_t flags) { flags_ = flags; }
 
     /// @brief Returns flags field.
     ///
     /// @return flags field
-    uint16_t getFlags() const { return (flags_); };
+    uint16_t getFlags() const { return (flags_); }
 
     /// @brief Returns ciaddr field.
     ///
     /// @return ciaddr field
     const isc::asiolink::IOAddress&
-    getCiaddr() const { return (ciaddr_); };
+    getCiaddr() const { return (ciaddr_); }
 
     /// @brief Sets ciaddr field.
     ///
     /// @param ciaddr value to be set
     void
-    setCiaddr(const isc::asiolink::IOAddress& ciaddr) { ciaddr_ = ciaddr; };
+    setCiaddr(const isc::asiolink::IOAddress& ciaddr) { ciaddr_ = ciaddr; }
 
     /// @brief Returns siaddr field.
     ///
     /// @return siaddr field
     const isc::asiolink::IOAddress&
-    getSiaddr() const { return (siaddr_); };
+    getSiaddr() const { return (siaddr_); }
 
     /// @brief Sets siaddr field.
     ///
     /// @param siaddr value to be set
     void
-    setSiaddr(const isc::asiolink::IOAddress& siaddr) { siaddr_ = siaddr; };
+    setSiaddr(const isc::asiolink::IOAddress& siaddr) { siaddr_ = siaddr; }
 
     /// @brief Returns yiaddr field.
     ///
     /// @return yiaddr field
     const isc::asiolink::IOAddress&
-    getYiaddr() const { return (yiaddr_); };
+    getYiaddr() const { return (yiaddr_); }
 
     /// @brief Sets yiaddr field.
     ///
     /// @param yiaddr value to be set
     void
-    setYiaddr(const isc::asiolink::IOAddress& yiaddr) { yiaddr_ = yiaddr; };
+    setYiaddr(const isc::asiolink::IOAddress& yiaddr) { yiaddr_ = yiaddr; }
 
     /// @brief Returns giaddr field.
     ///
     /// @return giaddr field
     const isc::asiolink::IOAddress&
-    getGiaddr() const { return (giaddr_); };
+    getGiaddr() const { return (giaddr_); }
 
     /// @brief Sets giaddr field.
     ///
     /// @param giaddr value to be set
     void
-    setGiaddr(const isc::asiolink::IOAddress& giaddr) { giaddr_ = giaddr; };
+    setGiaddr(const isc::asiolink::IOAddress& giaddr) { giaddr_ = giaddr; }
 
     /// @brief Returns DHCP message type (e.g. 1 = DHCPDISCOVER).
     ///
@@ -262,7 +262,7 @@ public:
     ///
     /// @return sname field
     const OptionBuffer
-    getSname() const { return (std::vector<uint8_t>(sname_, &sname_[MAX_SNAME_LEN])); };
+    getSname() const { return (std::vector<uint8_t>(sname_, &sname_[MAX_SNAME_LEN])); }
 
     /// @brief Sets sname field.
     ///
@@ -277,7 +277,7 @@ public:
     ///
     /// @return pointer to file field
     const OptionBuffer
-    getFile() const { return (std::vector<uint8_t>(file_, &file_[MAX_FILE_LEN])); };
+    getFile() const { return (std::vector<uint8_t>(file_, &file_[MAX_FILE_LEN])); }
 
     /// Sets file field
     ///

src/lib/dhcp/pkt6.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2011-2022 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2011-2024 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
@@ -222,7 +222,7 @@ public:
     /// @brief Sets message type (e.g. 1 = SOLICIT).
     ///
     /// @param type message type to be set
-    virtual void setType(uint8_t type) { msg_type_=type; };
+    virtual void setType(uint8_t type) { msg_type_=type; }
 
     /// @brief Retrieves the DUID from the Client Identifier option.
     ///

src/lib/dhcp/pkt_filter.h

@@ -18,7 +18,7 @@ namespace dhcp {
 class InvalidPacketFilter : public Exception {
 public:
     InvalidPacketFilter(const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 /// Forward declaration to the structure describing a socket.

src/lib/dhcp/protocol_util.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2013-2021 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013-2024 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
@@ -22,7 +22,7 @@ namespace dhcp {
 class InvalidPacketHeader : public Exception {
 public:
     InvalidPacketHeader(const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 /// Size of the Ethernet frame header.

src/lib/dhcp/socket_info.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2018-2024 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
@@ -62,7 +62,7 @@ struct SocketInfo {
 
 };
 
-}; // namespace isc::dhcp
-}; // namespace isc
+}  // namespace dhcp
+}  // namespace isc
 
 #endif // DHCP_SOCKET_INFO_H

src/lib/dhcp/tests/option_space_unittest.cc

@@ -1,4 +1,4 @@
-// Copyright (C) 2012-2017 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012-2024 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
@@ -139,4 +139,4 @@ TEST(OptionSpace6Test, setVendorSpace) {
 }
 
 
-}; // end of anonymous namespace
+}  // end of anonymous namespace

src/lib/dhcp/tests/pkt_filter6_test_utils.h

@@ -166,8 +166,8 @@ public:
 
 };
 
-}; // end of isc::dhcp::test namespace
-}; // end of isc::dhcp namespace
-}; // end of isc namespace
+}  // end of isc::dhcp::test namespace
+}  // end of isc::dhcp namespace
+}  // end of isc namespace
 
 #endif // PKT_FILTER6_TEST_UTILS_H

src/lib/dhcp/tests/pkt_filter_test_utils.h

@@ -199,8 +199,8 @@ public:
 };
 
 
-}; // end of isc::dhcp::test namespace
-}; // end of isc::dhcp namespace
-}; // end of isc namespace
+}  // end of isc::dhcp::test namespace
+}  // end of isc::dhcp namespace
+}  // end of isc namespace
 
 #endif // PKT_FILTER_TEST_UTILS_H

src/lib/dhcp/testutils/pkt_captures.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2023 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2014-2024 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
@@ -96,8 +96,8 @@ protected:
     static void captureSetDefaultFields(const isc::dhcp::Pkt4Ptr& pkt);
 };
 
-}; // end of namespace isc::dhcp::test
-}; // end of namespace isc::dhcp
-}; // end of namespace isc
+}  // namespace test
+}  // namespace dhcp
+}  // namespace isc
 
 #endif

src/lib/dhcp/testutils/pkt_captures4.cc

@@ -384,6 +384,6 @@ Pkt4Ptr PktCaptures::discoverGenexis() {
     return (packetFromCapture(hex_string));
 }
 
-}; // end of isc::dhcp::test namespace
-}; // end of isc::dhcp namespace
-}; // end of isc namespace
+}  // end of isc::dhcp::test namespace
+}  // end of isc::dhcp namespace
+}  // end of isc namespace

src/lib/dhcp/testutils/pkt_captures6.cc

@@ -506,6 +506,6 @@ isc::dhcp::Pkt6Ptr PktCaptures::captureSolicitWithTruncatedVIVSO() {
     return (pkt);
 }
 
-}; // end of isc::dhcp::test namespace
-}; // end of isc::dhcp namespace
-}; // end of isc namespace
+}  // end of isc::dhcp::test namespace
+}  // end of isc::dhcp namespace
+}  // end of isc namespace

src/lib/dhcp_ddns/ncr_io.h

@@ -94,21 +94,21 @@ extern std::string ncrProtocolToString(NameChangeProtocol protocol);
 class NcrListenerError : public isc::Exception {
 public:
     NcrListenerError(const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 /// @brief Exception thrown if an error occurs during IO source open.
 class NcrListenerOpenError : public isc::Exception {
 public:
     NcrListenerOpenError(const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 /// @brief Exception thrown if an error occurs initiating an IO receive.
 class NcrListenerReceiveError : public isc::Exception {
 public:
     NcrListenerReceiveError(const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 /// @brief Abstract interface for receiving NameChangeRequests.
@@ -213,7 +213,7 @@ public:
 
     /// @brief Destructor
     virtual ~NameChangeListener() {
-    };
+    }
 
     /// @brief Prepares the IO for reception and initiates the first receive.
     ///
@@ -360,28 +360,28 @@ typedef boost::shared_ptr<NameChangeListener> NameChangeListenerPtr;
 class NcrSenderError : public isc::Exception {
 public:
     NcrSenderError(const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 /// @brief Exception thrown if an error occurs during IO source open.
 class NcrSenderOpenError : public isc::Exception {
 public:
     NcrSenderOpenError(const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 /// @brief Exception thrown if an error occurs initiating an IO send.
 class NcrSenderQueueFull : public isc::Exception {
 public:
     NcrSenderQueueFull(const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 /// @brief Exception thrown if an error occurs initiating an IO send.
 class NcrSenderSendError : public isc::Exception {
 public:
     NcrSenderSendError(const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 /// @brief Abstract interface for sending NameChangeRequests.

src/lib/dhcp_ddns/ncr_msg.cc

@@ -751,5 +751,5 @@ NameChangeRequest::operator != (const NameChangeRequest& other) const {
 }
 
 
-}; // end of isc::dhcp namespace
-}; // end of isc namespace
+}  // end of isc::dhcp namespace
+}  // end of isc namespace

src/lib/dhcp_ddns/ncr_msg.h

@@ -30,7 +30,7 @@ namespace dhcp_ddns {
 class NcrMessageError : public isc::Exception {
 public:
     NcrMessageError(const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 /// @brief Exception thrown when there is an error occurred during computation
@@ -38,7 +38,7 @@ public:
 class DhcidRdataComputeError : public isc::Exception {
 public:
     DhcidRdataComputeError(const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 /// @brief Defines the types of DNS updates that can be requested.
@@ -795,8 +795,7 @@ private:
     NameChangeStatus status_;
 };
 
-
-}; // end of isc::dhcp_ddns namespace
-}; // end of isc namespace
+}  // namespace dhcp_ddns
+}  // namespace isc
 
 #endif

src/lib/dhcp_ddns/ncr_udp.h

@@ -122,7 +122,7 @@ namespace dhcp_ddns {
 class NcrUDPError : public isc::Exception {
 public:
     NcrUDPError(const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 class UDPCallback;

src/lib/dhcp_ddns/tests/test_utils.cc

@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2015 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2014-2024 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
@@ -33,5 +33,5 @@ int selectCheck(int fd_to_check) {
     return (select(maxfd + 1, &read_fds, NULL, NULL, &select_timeout));
 }
 
-}; // namespace isc::d2
-}; // namespace isc
+}  // namespace isc::d2
+}  // namespace isc

src/lib/dhcp_ddns/tests/test_utils.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2023 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2014-2024 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
@@ -23,7 +23,7 @@ namespace dhcp_ddns {
 /// read, > 0 if it is ready to read.
 int selectCheck(int fd_to_check);
 
-}; // namespace isc::dhcp_ddns;
-}; // namespace isc;
+}  // namespace isc::dhcp_ddns;
+}  // namespace isc;
 
 #endif

src/lib/dhcpsrv/alloc_engine.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2012-2023 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012-2024 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
@@ -430,7 +430,7 @@ public:
         /// in the client's message.
         void createIAContext() {
             ias_.push_back(IAContext());
-        };
+        }
 
         /// @brief Returns host from the most preferred subnet.
         ///

src/lib/dhcpsrv/allocator.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2022-2023 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2022-2024 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
@@ -169,7 +169,7 @@ protected:
     ///
     /// It is called by the @c initAfterConfigure and can be overridden in the
     /// derived allocators.
-    virtual void initAfterConfigureInternal() {};
+    virtual void initAfterConfigureInternal() {}
 
 private:
 

src/lib/dhcpsrv/base_host_data_source.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2023 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2014-2024 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
@@ -23,14 +23,14 @@ namespace dhcp {
 class DuplicateHost : public Exception {
 public:
     DuplicateHost(const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 /// @brief Exception thrown when a @c Host object is expected, but none are found.
 class HostNotFound : public Exception {
 public:
     HostNotFound(const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 /// @brief Exception thrown when an address is already reserved by a @c Host
@@ -38,7 +38,7 @@ public:
 class ReservedAddress : public Exception {
 public:
     ReservedAddress(const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 /// @brief Exception thrown when invalid IP address has been specified for
@@ -46,7 +46,7 @@ public:
 class BadHostAddress : public isc::BadValue {
 public:
     BadHostAddress(const char* file, size_t line, const char* what) :
-        isc::BadValue(file, line, what) { };
+        isc::BadValue(file, line, what) { }
 };
 
 /// @brief Wraps value holding size of the page with host reservations.
@@ -530,13 +530,13 @@ public:
     ///
     /// Commits all pending database operations.  On databases that don't
     /// support transactions, this is a no-op.
-    virtual void commit() {};
+    virtual void commit() {}
 
     /// @brief Rollback Transactions
     ///
     /// Rolls back all pending database operations.  On databases that don't
     /// support transactions, this is a no-op.
-    virtual void rollback() {};
+    virtual void rollback() {}
 
     /// @brief Controls whether IP reservations are unique or non-unique.
     ///

src/lib/dhcpsrv/cb_ctl_dhcp4.cc

@@ -38,7 +38,7 @@ struct CbCtlHooks {
 // module is called.
 CbCtlHooks hooks_;
 
-}; // anonymous namespace
+}  // anonymous namespace
 
 namespace isc {
 namespace dhcp {

src/lib/dhcpsrv/cb_ctl_dhcp6.cc

@@ -37,7 +37,7 @@ struct CbCtlHooks {
 // module is called.
 CbCtlHooks hooks_;
 
-}; // anonymous namespace
+}  // anonymous namespace
 
 namespace isc {
 namespace dhcp {

src/lib/dhcpsrv/cfg_iface.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2022 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2014-2024 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
@@ -24,28 +24,28 @@ namespace dhcp {
 class DuplicateIfaceName : public Exception {
 public:
     DuplicateIfaceName(const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 /// @brief Exception thrown when specified interface name is invalid.
 class InvalidIfaceName : public Exception {
 public:
     InvalidIfaceName(const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 /// @brief Exception thrown when specified interface doesn't exist in a system.
 class NoSuchIface : public Exception {
 public:
     NoSuchIface(const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 /// @brief Exception thrown when duplicated address specified.
 class DuplicateAddress : public Exception {
 public:
     DuplicateAddress(const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 /// @brief Exception thrown when specified unicast address is not assigned
@@ -53,7 +53,7 @@ public:
 class NoSuchAddress : public Exception {
 public:
     NoSuchAddress(const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 /// @brief Exception thrown when invalid socket type has been specified
@@ -61,7 +61,7 @@ public:
 class InvalidSocketType : public Exception {
 public:
     InvalidSocketType(const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 /// @brief Represents selection of interfaces for DHCP server.

src/lib/dhcpsrv/cfg_mac_source.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2015,2017 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2014-2024 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
@@ -80,7 +80,7 @@ class CfgMACSource : public isc::data::CfgToElement {
 
 };
 
-};
-};
+}  // namespace dhcp
+}  // namespace isc
 
 #endif

src/lib/dhcpsrv/cfg_option.h

@@ -108,7 +108,7 @@ public:
           cancelled_(cancel), formatted_value_(formatted_value),
           space_name_() {
         setContext(user_context);
-    };
+    }
 
     /// @brief Constructor.
     ///
@@ -116,7 +116,7 @@ public:
     /// @param cancel if true, option is never sent.
     OptionDescriptor(bool persist, bool cancel)
         : data::StampedElement(), option_(OptionPtr()), persistent_(persist),
-          cancelled_(cancel), formatted_value_(), space_name_() {};
+          cancelled_(cancel), formatted_value_(), space_name_() {}
 
     /// @brief Copy constructor.
     ///
@@ -130,7 +130,7 @@ public:
           space_name_(desc.space_name_),
           client_classes_(desc.client_classes_) {
         setContext(desc.getContext());
-    };
+    }
 
     /// @brief Assignment operator.
     ///

src/lib/dhcpsrv/cfgmgr.h

@@ -35,7 +35,7 @@ namespace dhcp {
 class DuplicateListeningIface : public Exception {
 public:
     DuplicateListeningIface(const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 /// @brief Configuration Manager

src/lib/dhcpsrv/d2_client_cfg.cc

@@ -217,5 +217,5 @@ operator<<(std::ostream& os, const D2ClientConfig& config) {
     return (os);
 }
 
-};  // namespace dhcp
-};  // namespace isc
+}  // namespace dhcp
+}  // namespace isc

src/lib/dhcpsrv/dhcp4o6_ipc.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2015-2017 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2015-2024 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
@@ -24,7 +24,7 @@ namespace dhcp {
 class Dhcp4o6IpcError : public Exception {
 public:
     Dhcp4o6IpcError(const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 /// @brief This class implements the communication between the DHCPv4

src/lib/dhcpsrv/host_container.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2023 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2014-2024 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
@@ -309,7 +309,7 @@ typedef HostContainer6::nth_index<4>::type HostContainer6Index4;
 typedef std::pair<HostContainer6Index4::iterator,
                   HostContainer6Index4::iterator> HostContainer6Index4Range;
 
-}; // end of isc::dhcp namespace
-}; // end of isc namespace
+}  // namespace dhcp
+}  // namespace isc
 
 #endif // HOST_CONTAINER_H

src/lib/dhcpsrv/key_from_key.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2013-2015 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013-2024 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
@@ -48,7 +48,7 @@ public:
 
     /// @brief Constructor.
     KeyFromKeyExtractor()
-        : key1_(KeyExtractor1()), key2_(KeyExtractor2()) { };
+        : key1_(KeyExtractor1()), key2_(KeyExtractor2()) { }
 
     /// @brief Extract key value from the object hierarchy.
     ///

src/lib/dhcpsrv/lease_mgr.h

@@ -183,14 +183,14 @@ public:
     LeaseStatsQuery(const SubnetID& first_subnet_id, const SubnetID& last_subnet_id);
 
     /// @brief virtual destructor
-    virtual ~LeaseStatsQuery() {};
+    virtual ~LeaseStatsQuery() {}
 
     /// @brief Executes the query
     ///
     /// This method should conduct whatever steps are required to
     /// calculate the lease statistical data by examining the
     /// lease data and making that results available row by row.
-    virtual void start() {};
+    virtual void start() {}
 
     /// @brief Fetches the next row of data
     ///
@@ -203,19 +203,19 @@ public:
     /// @brief Returns the value of first subnet ID specified (or zero)
     SubnetID getFirstSubnetID() const {
         return (first_subnet_id_);
-    };
+    }
 
     /// @brief Returns the value of last subnet ID specified (or zero)
     SubnetID getLastSubnetID() const {
         return (last_subnet_id_);
-    };
+    }
 
     /// @brief Returns the selection criteria mode
     /// The value returned is based upon the constructor variant used
     /// and it indicates which query variant will be executed.
     SelectMode getSelectMode() const {
         return (select_mode_);
-    };
+    }
 
 protected:
     /// @brief First (or only) subnet_id in the selection criteria

src/lib/dhcpsrv/network.h

@@ -226,7 +226,7 @@ public:
     /// @brief Virtual destructor.
     ///
     /// Does nothing at the moment.
-    virtual ~Network() { };
+    virtual ~Network() { }
 
     /// @brief Sets the optional callback function used to fetch globally
     /// configured parameters.
@@ -270,7 +270,7 @@ public:
     getIface(const Inheritance& inheritance = Inheritance::ALL) const {
         return (getProperty<Network>(&Network::getIface, iface_name_,
                                      inheritance));
-    };
+    }
 
     /// @brief Sets information about relay
     ///
@@ -1483,7 +1483,7 @@ public:
     /// option support is enabled (if true), or disabled (if false).
     void setRapidCommit(const util::Optional<bool>& rapid_commit) {
         rapid_commit_ = rapid_commit;
-    };
+    }
 
     /// @brief Returns allocator type for prefix delegation.
     ///

src/lib/dhcpsrv/packet-fuzzer.h

@@ -137,7 +137,7 @@ private:
 class FuzzInitFail : public Exception {
 public:
     FuzzInitFail(const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };  // class FuzzInitFail
 
 }  // namespace isc

src/lib/dhcpsrv/srv_config.h

@@ -49,7 +49,7 @@ class CfgMgr;
 class DdnsParams {
 public:
     /// @brief Default constructor
-    DdnsParams() : subnet_(), d2_client_enabled_(false) {};
+    DdnsParams() : subnet_(), d2_client_enabled_(false) {}
 
     /// @brief Constructor for DHPCv4 subnets
     ///

src/lib/dhcpsrv/subnet.h

@@ -339,7 +339,7 @@ protected:
     ///
     /// A virtual destructor is needed because other classes
     /// derive from this class.
-    virtual ~Subnet() { };
+    virtual ~Subnet() { }
 
     /// @brief Checks if used pool type is valid.
     ///

src/lib/dhcpsrv/subnet_id.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2022 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2014-2024 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
@@ -36,7 +36,7 @@ static const SubnetID SUBNET_ID_UNUSED = std::numeric_limits<uint32_t>::max();
 class DuplicateSubnetID : public Exception {
 public:
     DuplicateSubnetID(const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) { };
+        isc::Exception(file, line, what) { }
 };
 
 /// @brief Ordered list aka set of subnetIDs.

src/lib/dhcpsrv/tests/dhcp_queue_control_parser_unittest.cc

@@ -208,4 +208,4 @@ TEST_F(DHCPQueueControlParserTest, multiThreading) {
     EXPECT_EQ("false", queue_control->get("enable-queue")->str());
 }
 
-}; // anonymous namespace
+}  // anonymous namespace

src/lib/dhcpsrv/tests/host_data_source_factory_unittest.cc

@@ -23,7 +23,7 @@ using namespace isc::dhcp::test;
 
 namespace {
 
-// @brief Register memFactory 
+// @brief Register memFactory
 bool registerFactory() {
     static auto db_version = []() -> std::string {
         return (std::string("version 1"));
@@ -216,4 +216,4 @@ TEST_F(HostDataSourceFactoryTest, multiple) {
     EXPECT_FALSE(HostDataSourceFactory::del(sources_, "mem2"));
 }
 
-}; // end of anonymous namespace
+}  // end of anonymous namespace

src/lib/dhcpsrv/testutils/dhcp4o6_test_ipc.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2015-2016 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2015-2024 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
@@ -83,8 +83,8 @@ private:
     Pkt6Ptr pkt_received_;
 };
 
-}; // end of isc::dhcp::test namespace
-}; // end of isc::dhcp namespace
-}; // end of isc namespace
+}  // end of isc::dhcp::test namespace
+}  // end of isc::dhcp namespace
+}  // end of isc namespace
 
 #endif // DHCP4O6_TEST_IPC_H

src/lib/dhcpsrv/utils.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2012-2015 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012-2024 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
@@ -26,7 +26,7 @@ RFCViolation(const char* file, size_t line, const char* what) :
     isc::Exception(file, line, what) {}
 };
 
-}; // namespace isc::dhcp
-}; // namespace isc
+}  // namespace isc::dhcp
+}  // namespace isc
 
 #endif // DHCPSRV_UTILS_H