From: Marcin Siodelski <marcin@isc.org>
Date: Wed, 26 Sep 2012 10:09:25 +0000 (+0200)
Subject: [2187] Fixed typos.
X-Git-Tag: trac2351_base~37^2~3^2^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=237def8395cbe9f2d1193e804443c403294b8c6f;p=thirdparty%2Fkea.git

[2187] Fixed typos.
---

diff --git a/src/bin/dhcp4/dhcp4_messages.mes b/src/bin/dhcp4/dhcp4_messages.mes
index 8784ea92d2..2ff8f5365b 100644
--- 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 c9db82f51f..67943c5e56 100644
--- 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 8dc0fbf8f5..424e253241 100644
--- 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 120e82ba05..54fa2b522c 100644
--- 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);