[2187] Fixed typos.

diff --git a/src/bin/dhcp4/dhcp4_messages.mes b/src/bin/dhcp4/dhcp4_messages.mes
index 8784ea92d20a5be7bcb986c3a011ca450daa59a4..2ff8f5365bfc563e516963e353d441e89ec7de7a 100644 (file)
--- a/src/bin/dhcp4/dhcp4_messages.mes
+++ b/src/bin/dhcp4/dhcp4_messages.mes
@@ -53,7 +53,7 @@ packet on the specified interface.  Note that a packet marked as UNKNOWN
 may well be a valid DHCP packet, just a type not expected by the server
 (e.g. it will report a received OFFER packet as UNKNOWN).
 
-% DHCPV4_PACKET_SEND_FAIL failed to send DHCPv4 packet: %1
+% DHCP4_PACKET_SEND_FAIL failed to send DHCPv4 packet: %1
 This error is output if IPv6 DHCP server fails to send assembled DHCP
 message to a client. The reason for the error is included in the message.
 

diff --git a/src/bin/dhcp4/dhcp4_srv.cc b/src/bin/dhcp4/dhcp4_srv.cc
index c9db82f51f5420205a989575e48d226e5123ba05..67943c5e566d4a8df562a9f5fd69e19e6821da7b 100644 (file)
--- a/src/bin/dhcp4/dhcp4_srv.cc
+++ b/src/bin/dhcp4/dhcp4_srv.cc
@@ -149,8 +149,8 @@ Dhcpv4Srv::run() {
                 if (rsp->pack()) {
                     try {
                         IfaceMgr::instance().send(rsp);
-                    } catch (const std::exception& ex) {
-                        LOG_ERROR(dhcp4_logger, DHCP4_PACKET_SEND_FAIL).arg(ex.what());
+                    } catch (const std::exception& e) {
+                        LOG_ERROR(dhcp4_logger, DHCP4_PACKET_SEND_FAIL).arg(e.what());
                     }
                 } else {
                     LOG_ERROR(dhcp4_logger, DHCP4_PACK_FAIL);

diff --git a/src/bin/dhcp6/dhcp6_messages.mes b/src/bin/dhcp6/dhcp6_messages.mes
index 8dc0fbf8f5b4447ea0554b42045dd7e3c94d4417..424e2532416adee15da3c9ee1073baa338a145e5 100644 (file)
--- a/src/bin/dhcp6/dhcp6_messages.mes
+++ b/src/bin/dhcp6/dhcp6_messages.mes
@@ -56,7 +56,7 @@ of packet.  Note that a packet marked as UNKNOWN may well be a valid
 DHCP packet, just a type not expected by the server (e.g. it will report
 a received OFFER packet as UNKNOWN).
 
-% DHCPV6_PACKET_SEND_FAIL failed to send DHCPv6 packet: %1
+% DHCP6_PACKET_SEND_FAIL failed to send DHCPv6 packet: %1
 This error is output if IPv6 DHCP server fails to send assembled DHCP
 message to a client. The reason fo the error is included in the message.
 

diff --git a/src/bin/dhcp6/dhcp6_srv.cc b/src/bin/dhcp6/dhcp6_srv.cc
index 120e82ba05d3dff8328f7b3e3e04330149fd8f12..54fa2b522c046ece555338ce734a804dd906744a 100644 (file)
--- a/src/bin/dhcp6/dhcp6_srv.cc
+++ b/src/bin/dhcp6/dhcp6_srv.cc
@@ -89,7 +89,7 @@ bool Dhcpv6Srv::run() {
 
         try {
             query = IfaceMgr::instance().receive6(timeout);
-        } catch (const std::exception& ex) {
+        } catch (const std::exception& e) {
             LOG_ERROR(dhcp6_logger, DHCP6_PACKET_RECEIVE_FAIL).arg(e.what());
         }
 
@@ -162,8 +162,8 @@ bool Dhcpv6Srv::run() {
                 if (rsp->pack()) {
                     try {
                         IfaceMgr::instance().send(rsp);
-                    } catch (const std::exception& ex) {
-                        LOG_ERROR(dhcp6_logger, DHCP6_PACKET_SEND_FAIL).arg(ex.what());
+                    } catch (const std::exception& e) {
+                        LOG_ERROR(dhcp6_logger, DHCP6_PACKET_SEND_FAIL).arg(e.what());
                     }
                 } else {
                     LOG_ERROR(dhcp6_logger, DHCP6_PACK_FAIL);