From: Francis Dupont <fdupont@isc.org>
Date: Sat, 27 Jun 2015 11:08:39 +0000 (+0200)
Subject: [master] Finished merge of trac3839 (removed unused exception variables)
X-Git-Tag: trac3911_base
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=346b2a2879814bca50cf8836deb4dc9cc312fc7a;p=thirdparty%2Fkea.git

[master] Finished merge of trac3839 (removed unused exception variables)
---

346b2a2879814bca50cf8836deb4dc9cc312fc7a
diff --cc src/lib/dhcp/option6_client_fqdn.cc
index 002875e625,de2b18b31e..597a97f84c
--- a/src/lib/dhcp/option6_client_fqdn.cc
+++ b/src/lib/dhcp/option6_client_fqdn.cc
@@@ -249,8 -249,8 +249,8 @@@ Option6ClientFqdnImpl::parseWireData(Op
              isc::util::InputBuffer name_buf(&buf[0], buf.size());
              try {
                  domain_name_.reset(new isc::dns::Name(name_buf, true));
-             } catch (const Exception& ex) {
+             } catch (const Exception&) {
 -                isc_throw(InvalidOption6FqdnDomainName, "failed to parse"
 +                isc_throw(InvalidOption6FqdnDomainName, "failed to parse "
                            "partial domain-name from wire format");
              }
              // Terminating zero was missing, so set the domain-name type
@@@ -264,8 -264,8 +264,8 @@@
                                              std::distance(first, last));
              try {
                  domain_name_.reset(new isc::dns::Name(name_buf, true));
-             } catch (const Exception& ex) {
+             } catch (const Exception&) {
 -                isc_throw(InvalidOption6FqdnDomainName, "failed to parse"
 +                isc_throw(InvalidOption6FqdnDomainName, "failed to parse "
                            "fully qualified domain-name from wire format");
              }
              // Set the domain-type to fully qualified domain name.