[2052] Rename partial_compare() to just compare()

diff --git a/src/lib/dns/labelsequence.cc b/src/lib/dns/labelsequence.cc
index 76aee189438bb49bd168129c228499359bcf13d8..acbafe47f9a6ae14a1a2725ae0d6d4888bb83a6a 100644 (file)
--- a/src/lib/dns/labelsequence.cc
+++ b/src/lib/dns/labelsequence.cc
@@ -78,12 +78,12 @@ LabelSequence::compare(const LabelSequence& other,
         return (NameComparisonResult(0, 0, NameComparisonResult::NONE));
     }
 
-    return (name_.partial_compare(other.name_,
-                                  first_label_,
-                                  other.first_label_,
-                                  last_label_,
-                                  other.last_label_,
-                                  case_sensitive));
+    return (name_.compare(other.name_,
+                          first_label_,
+                          other.first_label_,
+                          last_label_,
+                          other.last_label_,
+                          case_sensitive));
 }
 
 void

diff --git a/src/lib/dns/name.cc b/src/lib/dns/name.cc
index 5035679e7d2e2169896260b4295def37cdcfc9e9..a28f8d33bd192da70ecc025235d36aa7f4c8554c 100644 (file)
--- a/src/lib/dns/name.cc
+++ b/src/lib/dns/name.cc
@@ -507,16 +507,16 @@ Name::toText(bool omit_final_dot) const {
 
 NameComparisonResult
 Name::compare(const Name& other) const {
-    return (partial_compare(other, 0, 0, labelcount_, other.labelcount_));
+    return (compare(other, 0, 0, labelcount_, other.labelcount_));
 }
 
 NameComparisonResult
-Name::partial_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) const {
+Name::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) const {
     // Determine the relative ordering under the DNSSEC order relation of
     // 'this' and 'other', and also determine the hierarchical relationship
     // of the names.

diff --git a/src/lib/dns/name.h b/src/lib/dns/name.h
index d6fb29493a5f90bc45413a332453894779b5d033..508921452c96e411af8d3090485791c8c8cb74fe 100644 (file)
--- a/src/lib/dns/name.h
+++ b/src/lib/dns/name.h
@@ -422,12 +422,12 @@ private:
     /// \param case_sensitive If true, comparison is case-insensitive
     /// \return a <code>NameComparisonResult</code> object representing the
     /// comparison result.
-    NameComparisonResult partial_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;
+    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.