[#2831] addressed review comments

diff --git a/src/bin/perfdhcp/command_options.cc b/src/bin/perfdhcp/command_options.cc
index 66e557814cd23d822bd8f1eeb1ab1489b44bd16d..fa6772e60db352a4c688d2fa6986e0b2c851c1c5 100644 (file)
--- a/src/bin/perfdhcp/command_options.cc
+++ b/src/bin/perfdhcp/command_options.cc
@@ -602,7 +602,7 @@ CommandOptions::initialize(int argc, char** argv, bool print_cmd_line) {
             } else if (optarg_text == "avalanche") {
                 scenario_ = Scenario::AVALANCHE;
             } else {
-                isc_throw(InvalidParameter, "scenario value '" << optarg << "' is wrong - should be 'basic' or 'avalanche'");
+                isc_throw(InvalidParameter, "scenario value '" << optarg_text << "' is wrong - should be 'basic' or 'avalanche'");
             }
             break;
         }

diff --git a/src/lib/dns/nsec3hash.cc b/src/lib/dns/nsec3hash.cc
index 64030ff62a7a2f9e1e5b8cef0e59606877925b07..279a2bd562e2338bb02a10be001e779e4399ca9c 100644 (file)
--- a/src/lib/dns/nsec3hash.cc
+++ b/src/lib/dns/nsec3hash.cc
@@ -62,15 +62,14 @@ public:
                      const uint8_t* salt_data, size_t salt_length) :
         algorithm_(algorithm), iterations_(iterations),
         salt_data_(NULL), salt_length_(salt_length),
-        digest_(DEFAULT_DIGEST_LENGTH), obuf_(Name::MAX_WIRE)
-    {
+        digest_(DEFAULT_DIGEST_LENGTH), obuf_(Name::MAX_WIRE) {
         if (algorithm_ != NSEC3_HASH_SHA1) {
             isc_throw(UnknownNSEC3HashAlgorithm, "Unknown NSEC3 algorithm: " <<
                       static_cast<unsigned int>(algorithm_));
         }
 
         if (salt_data == NULL) {
-            isc_throw(BadValue, "salt data is NULL");
+            isc_throw(isc::BadValue, "salt data is NULL");
         }
 
         if (salt_length > 0) {