From bfd648e1022a6ca12fede8a206dea8006131737c Mon Sep 17 00:00:00 2001
From: Tom Thorogood <me+github@tomthorogood.co.uk>
Date: Thu, 3 Jan 2019 21:03:38 +1030
Subject: [PATCH] Rename NULL's Anything field to Data (#880)

---
 types.go      | 6 +++---
 zduplicate.go | 2 +-
 zmsg.go       | 4 ++--
 ztypes.go     | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/types.go b/types.go
index 2c02ea09..cdfd2eb8 100644
--- a/types.go
+++ b/types.go
@@ -243,13 +243,13 @@ func (rr *ANY) String() string { return rr.Hdr.String() }
 
 // NULL RR. See RFC 1035.
 type NULL struct {
-	Hdr      RR_Header
-	Anything string `dns:"any"`
+	Hdr  RR_Header
+	Data string `dns:"any"`
 }
 
 func (rr *NULL) String() string {
 	// There is no presentation format; prefix string with a comment.
-	return ";" + rr.Hdr.String() + rr.Anything
+	return ";" + rr.Hdr.String() + rr.Data
 }
 
 // CNAME RR. See RFC 1034.
diff --git a/zduplicate.go b/zduplicate.go
index 87b9db2e..44b98906 100644
--- a/zduplicate.go
+++ b/zduplicate.go
@@ -619,7 +619,7 @@ func isDuplicateNSEC3PARAM(r1, r2 *NSEC3PARAM) bool {
 }
 
 func isDuplicateNULL(r1, r2 *NULL) bool {
-	if r1.Anything != r2.Anything {
+	if r1.Data != r2.Data {
 		return false
 	}
 	return true
diff --git a/zmsg.go b/zmsg.go
index 9cd4f59e..b6c30680 100644
--- a/zmsg.go
+++ b/zmsg.go
@@ -807,7 +807,7 @@ func (rr *NULL) pack(msg []byte, off int, compression compressionMap, compress b
 	if err != nil {
 		return headerEnd, off, err
 	}
-	off, err = packStringAny(rr.Anything, msg, off)
+	off, err = packStringAny(rr.Data, msg, off)
 	if err != nil {
 		return headerEnd, off, err
 	}
@@ -2571,7 +2571,7 @@ func unpackNULL(h RR_Header, msg []byte, off int) (RR, int, error) {
 	rdStart := off
 	_ = rdStart
 
-	rr.Anything, off, err = unpackStringAny(msg, off, rdStart+int(rr.Hdr.Rdlength))
+	rr.Data, off, err = unpackStringAny(msg, off, rdStart+int(rr.Hdr.Rdlength))
 	if err != nil {
 		return rr, off, err
 	}
diff --git a/ztypes.go b/ztypes.go
index f8885f11..f8ec77c2 100644
--- a/ztypes.go
+++ b/ztypes.go
@@ -477,7 +477,7 @@ func (rr *NSEC3PARAM) len(off int, compression map[string]struct{}) int {
 }
 func (rr *NULL) len(off int, compression map[string]struct{}) int {
 	l := rr.Hdr.len(off, compression)
-	l += len(rr.Anything)
+	l += len(rr.Data)
 	return l
 }
 func (rr *OPENPGPKEY) len(off int, compression map[string]struct{}) int {
@@ -791,7 +791,7 @@ func (rr *NSEC3PARAM) copy() RR {
 	return &NSEC3PARAM{rr.Hdr, rr.Hash, rr.Flags, rr.Iterations, rr.SaltLength, rr.Salt}
 }
 func (rr *NULL) copy() RR {
-	return &NULL{rr.Hdr, rr.Anything}
+	return &NULL{rr.Hdr, rr.Data}
 }
 func (rr *OPENPGPKEY) copy() RR {
 	return &OPENPGPKEY{rr.Hdr, rr.PublicKey}