[2086] Cleanups

diff --git a/src/lib/dns/labelsequence.cc b/src/lib/dns/labelsequence.cc
index 351d86b45a1bc2c4338fbec6a5d03ce7a3acac88..6e778f42ae27f92688145e6f404f55f9c42ae167 100644 (file)
--- a/src/lib/dns/labelsequence.cc
+++ b/src/lib/dns/labelsequence.cc
@@ -82,11 +82,6 @@ LabelSequence::compare(const LabelSequence& other,
     // 'this' and 'other', and also determine the hierarchical relationship
     // of the names.
 
-    if ((first_label_ > last_label_) ||
-        (other.first_label_ > other.last_label_)) {
-        isc_throw(BadValue, "Bad label index ranges were passed");
-    }
-
     unsigned int nlabels = 0;
     int l1 = last_label_ - first_label_;
     int l2 = other.last_label_ - other.first_label_;
@@ -117,7 +112,8 @@ LabelSequence::compare(const LabelSequence& other,
             if (case_sensitive) {
                 chdiff = (int)label1 - (int)label2;
             } else {
-                chdiff = (int)isc::dns::name::internal::maptolower[label1] - (int)isc::dns::name::internal::maptolower[label2];
+                chdiff = (int)isc::dns::name::internal::maptolower[label1] -
+                         (int)isc::dns::name::internal::maptolower[label2];
             }
 
             if (chdiff != 0) {

diff --git a/src/lib/dns/labelsequence.h b/src/lib/dns/labelsequence.h
index f2b3c112ef21ae1d9420b211cf5d349c6407391d..c2149f0ce8b0e2ff386b0ecadd9e17977a763b8c 100644 (file)
--- a/src/lib/dns/labelsequence.h
+++ b/src/lib/dns/labelsequence.h
@@ -53,7 +53,7 @@ public:
     /// to the labels in the Name object).
     ///
     /// \param name The Name to construct a LabelSequence for
-    explicit LabelSequence(const Name& name): /*name_(name),*/
+    explicit LabelSequence(const Name& name):
                                      data_(&name.ndata_[0]),
                                      offsets_(&name.offsets_[0]),
                                      offsets_size_(name.offsets_.size()),

diff --git a/src/lib/dns/name.h b/src/lib/dns/name.h
index 92c9c5fd59c813dd4e092a3187e190def720c010..27186d7c7a91cc846cd0686e89360e13bfce0f28 100644 (file)
--- a/src/lib/dns/name.h
+++ b/src/lib/dns/name.h
@@ -405,37 +405,6 @@ public:
     /// comparison result.
     NameComparisonResult compare(const Name& other) const;
 
-private:
-    /// \brief Partially compare two <code>Name</code>s.
-    ///
-    /// This method performs a partial comparison of the
-    /// <code>Name</code> and <code>other</code> and returns the result
-    /// in the form of a <code>NameComparisonResult</code> object.
-    ///
-    /// This method can throw the BadValue exception if bad label
-    /// indices are passed.
-    ///
-    /// \param other the right-hand operand to compare against.
-    /// \param first_label the left-most label of <code>Name</code> to
-    /// begin comparing from.
-    /// \param first_label_other the left-most label of
-    /// <code>other</code> to begin comparing from.
-    /// \param last_label the right-most label of <code>Name</code> to
-    /// end comparing at.
-    /// \param last_label_other the right-most label of
-    /// <code>other</code> to end comparing at.
-    /// \param case_sensitive If true, comparison is case-insensitive
-    /// \return a <code>NameComparisonResult</code> object representing the
-    /// comparison result.
-/*
-    NameComparisonResult compare(const Name& other,
-                                 unsigned int first_label,
-                                 unsigned int first_label_other,
-                                 unsigned int last_label,
-                                 unsigned int last_label_other,
-                                 bool case_sensitive = false) const;
-*/
-
 public:
     /// \brief Return true iff two names are equal.
     ///