From 52647ae7a7d150abe1810eb2ee9f251a97c0d59e Mon Sep 17 00:00:00 2001
From: Roland Shoemaker <rolandshoemaker@gmail.com>
Date: Thu, 18 Jun 2015 19:17:02 -0700
Subject: [PATCH] Address miekg's comments

---
 msg.go      | 4 ++--
 zscan_rr.go | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/msg.go b/msg.go
index e26ce9c9..dc989557 100644
--- a/msg.go
+++ b/msg.go
@@ -921,8 +921,8 @@ func packStructValue(val reflect.Value, msg []byte, off int, compression map[str
 				copy(msg[off:off+len(s)], s)
 				off += len(s)
 			case `dns:"octet"`:
-				var varstrTmp []byte
-				off, err = packOctetString(fv.String(), msg, off, varstrTmp)
+				bytesTmp := make([]byte, 0)
+				off, err = packOctetString(fv.String(), msg, off, bytesTmp)
 				if err != nil {
 					return lenmsg, err
 				}
diff --git a/zscan_rr.go b/zscan_rr.go
index 34efa6c0..3763d3f4 100644
--- a/zscan_rr.go
+++ b/zscan_rr.go
@@ -2197,8 +2197,6 @@ func setCAA(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
 	}
 	if len(s) > 1 {
 		return nil, &ParseError{f, "bad CAA Value", l}, ""
-	} else if len(s) == 0 {
-		rr.Value = ""
 	} else {
 		rr.Value = s[0]
 	}