From 57a2ddcad8e466a67ad53511d90bfd00d2584cd6 Mon Sep 17 00:00:00 2001
From: Mukund Sivaraman <muks@isc.org>
Date: Thu, 9 Jan 2014 08:43:40 +0530
Subject: [PATCH] [1839] Ensure that BasicRRset's methods are actually called
 (cleanup duplication)

---
 src/lib/dns/rrset.cc | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/src/lib/dns/rrset.cc b/src/lib/dns/rrset.cc
index cc5153fa5c..839c7b7d54 100644
--- a/src/lib/dns/rrset.cc
+++ b/src/lib/dns/rrset.cc
@@ -315,15 +315,13 @@ RRset::getRRsigDataCount() const {
 
 unsigned int
 RRset::toWire(OutputBuffer& buffer) const {
-    unsigned int rrs_written;
-
-    rrs_written = rrsetToWire<OutputBuffer>(*this, buffer, 0);
+    unsigned int rrs_written = BasicRRset::toWire(buffer);
     if (getRdataCount() > rrs_written) {
         return (rrs_written);
     }
 
     if (rrsig_) {
-        rrs_written += rrsetToWire<OutputBuffer>(*(rrsig_.get()), buffer, 0);
+        rrs_written += rrsig_->toWire(buffer);
     }
 
     return (rrs_written);
@@ -331,24 +329,17 @@ RRset::toWire(OutputBuffer& buffer) const {
 
 unsigned int
 RRset::toWire(AbstractMessageRenderer& renderer) const {
-    unsigned int rrs_written;
-
-    rrs_written =
-        rrsetToWire<AbstractMessageRenderer>(*this, renderer,
-                                             renderer.getLengthLimit());
+    unsigned int rrs_written = BasicRRset::toWire(renderer);
     if (getRdataCount() > rrs_written) {
-        renderer.setTruncated();
         return (rrs_written);
     }
 
     if (rrsig_) {
-        rrs_written +=
-            rrsetToWire<AbstractMessageRenderer>(*(rrsig_.get()), renderer,
-                                                 renderer.getLengthLimit());
-    }
+        rrs_written += rrsig_->toWire(renderer);
 
-    if (getRdataCount() + getRRsigDataCount() > rrs_written) {
-        renderer.setTruncated();
+        if (getRdataCount() + getRRsigDataCount() > rrs_written) {
+            renderer.setTruncated();
+        }
     }
 
     return (rrs_written);