[#730,!7-p] Addressed review comments

    Minor cleanup
ChangeLog
src/bin/dhcp4/dhcp4_messages.mes
src/bin/dhcp4/dhcp4_srv.cc
src/lib/dns/tests/name_unittest.cc

diff --git a/src/bin/dhcp4/dhcp4_messages.mes b/src/bin/dhcp4/dhcp4_messages.mes
index 5713652354780f3b3ea860734ebcb8c72db0ebb6..67f12cdd9364ced3479708b2b79a81b5c109ed95 100644 (file)
--- a/src/bin/dhcp4/dhcp4_messages.mes
+++ b/src/bin/dhcp4/dhcp4_messages.mes
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2018 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2012-2019 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
@@ -102,8 +102,7 @@ client.
 This debug message is issued when the DHCP server was unable to process the
 the hostname option sent by the client because the content is malformed.
 The first argument includes the client and transaction identification
-information. The second argument should contain a description of the data
-error.
+information. The second argument contains a description of the data error.
 
 % DHCP4_CLIENT_HOSTNAME_PROCESS %1: processing client's Hostname option
 This debug message is issued when the server starts processing the Hostname

diff --git a/src/bin/dhcp4/dhcp4_srv.cc b/src/bin/dhcp4/dhcp4_srv.cc
index 488c0bf12e483d245aca7a7cc5969397accb826c..13cacc83baadc5c9bc3ad85a7ff2a2194a281e55 100644 (file)
--- a/src/bin/dhcp4/dhcp4_srv.cc
+++ b/src/bin/dhcp4/dhcp4_srv.cc
@@ -1781,7 +1781,7 @@ Dhcpv4Srv::processHostnameOption(Dhcpv4Exchange& ex) {
         // going to explicitly catch that here.
         label_count = OptionDataTypeUtil::getLabelCount(hostname);
     } catch (const std::exception& exc) {
-        LOG_DEBUG(ddns4_logger, DBG_DHCP4_DETAIL_DATA, DHCP4_CLIENT_HOSTNAME_MALFORMED)
+        LOG_DEBUG(ddns4_logger, DBG_DHCP4_DETAIL, DHCP4_CLIENT_HOSTNAME_MALFORMED)
             .arg(ex.getQuery()->getLabel())
             .arg(exc.what());
         return;
@@ -1792,7 +1792,7 @@ Dhcpv4Srv::processHostnameOption(Dhcpv4Exchange& ex) {
     /// @todo It would be more liberal to accept this and let it fall into
     /// the case  of replace or less than two below.
     if (label_count == 0) {
-        LOG_DEBUG(ddns4_logger, DBG_DHCP4_DETAIL_DATA, DHCP4_EMPTY_HOSTNAME)
+        LOG_DEBUG(ddns4_logger, DBG_DHCP4_DETAIL, DHCP4_EMPTY_HOSTNAME)
             .arg(ex.getQuery()->getLabel());
         return;
     }

diff --git a/src/lib/dns/tests/name_unittest.cc b/src/lib/dns/tests/name_unittest.cc
index 8cfa623d6763416e2751dbca0a8a66e2ae1f2d5c..9335a80f3e20106b0b5e223814a6020493c9b756 100644 (file)
--- a/src/lib/dns/tests/name_unittest.cc
+++ b/src/lib/dns/tests/name_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2009-2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2009-2019 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
@@ -290,7 +290,7 @@ TEST_F(NameTest, fromText) {
 }
 
 // The following test uses a name data that was produced by
-// fuz testing and causes an unexpected condition in stringParser.
+// fuzz testing and causes an unexpected condition in stringParser.
 // Formerly this condition was trapped by an assert, but for
 // robustness it has been replaced by a throw.
 TEST_F(NameTest, unexpectedParseError) {