From 1614b58c420f7875f92a5469c77fd7aeccc7a106 Mon Sep 17 00:00:00 2001
From: Andrew Gallant <jamslam@gmail.com>
Date: Tue, 29 Mar 2016 16:23:18 -0400
Subject: fix structs with field name of 'Bytes'

(it conflict with a method of the same name that is generated for
all such structs)
---
 nexgb/auth.go         |  3 ++-
 nexgb/res/res.go      | 10 +++++-----
 nexgb/xgb.go          |  2 +-
 nexgb/xgbgen/field.go |  3 +++
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/nexgb/auth.go b/nexgb/auth.go
index 62a9b35..ec51d10 100644
--- a/nexgb/auth.go
+++ b/nexgb/auth.go
@@ -76,7 +76,8 @@ func readAuthority(hostname, display string) (
 			return "", nil, err
 		}
 
-		addrmatch := (family == familyWild) || (family == familyLocal && addr == hostname)
+		addrmatch := (family == familyWild) ||
+			(family == familyLocal && addr == hostname)
 		dispmatch := (disp == "") || (disp == display)
 
 		if addrmatch && dispmatch {
diff --git a/nexgb/res/res.go b/nexgb/res/res.go
index e3d7b02..0ad0389 100644
--- a/nexgb/res/res.go
+++ b/nexgb/res/res.go
@@ -283,7 +283,7 @@ func ResourceIdSpecListBytes(buf []byte, list []ResourceIdSpec) int {
 
 type ResourceSizeSpec struct {
 	Spec     ResourceIdSpec
-	Bytes    uint32
+	Bytes_   uint32
 	RefCount uint32
 	UseCount uint32
 }
@@ -295,7 +295,7 @@ func ResourceSizeSpecRead(buf []byte, v *ResourceSizeSpec) int {
 	v.Spec = ResourceIdSpec{}
 	b += ResourceIdSpecRead(buf[b:], &v.Spec)
 
-	v.Bytes = xgb.Get32(buf[b:])
+	v.Bytes_ = xgb.Get32(buf[b:])
 	b += 4
 
 	v.RefCount = xgb.Get32(buf[b:])
@@ -328,7 +328,7 @@ func (v ResourceSizeSpec) Bytes() []byte {
 		b += len(structBytes)
 	}
 
-	xgb.Put32(buf[b:], v.Bytes)
+	xgb.Put32(buf[b:], v.Bytes_)
 	b += 4
 
 	xgb.Put32(buf[b:], v.RefCount)
@@ -641,7 +641,7 @@ type QueryClientPixmapBytesReply struct {
 	Sequence uint16 // sequence number of the request for this reply
 	Length   uint32 // number of bytes in this reply
 	// padding: 1 bytes
-	Bytes         uint32
+	Bytes_        uint32
 	BytesOverflow uint32
 }
 
@@ -670,7 +670,7 @@ func queryClientPixmapBytesReply(buf []byte) *QueryClientPixmapBytesReply {
 	v.Length = xgb.Get32(buf[b:]) // 4-byte units
 	b += 4
 
-	v.Bytes = xgb.Get32(buf[b:])
+	v.Bytes_ = xgb.Get32(buf[b:])
 	b += 4
 
 	v.BytesOverflow = xgb.Get32(buf[b:])
diff --git a/nexgb/xgb.go b/nexgb/xgb.go
index f49d19b..3d2c61f 100644
--- a/nexgb/xgb.go
+++ b/nexgb/xgb.go
@@ -61,7 +61,7 @@ type Conn struct {
 	seqChan    chan uint16
 	reqChan    chan *request
 	closing    chan chan struct{}
-	
+
 	// ExtLock is a lock used whenever new extensions are initialized.
 	// It should not be used. It is exported for use in the extension
 	// sub-packages.
diff --git a/nexgb/xgbgen/field.go b/nexgb/xgbgen/field.go
index bf3b3be..2522a06 100644
--- a/nexgb/xgbgen/field.go
+++ b/nexgb/xgbgen/field.go
@@ -87,6 +87,9 @@ func (f *SingleField) Initialize(p *Protocol) {
 }
 
 func (f *SingleField) SrcName() string {
+	if f.srcName == "Bytes" {
+		return "Bytes_"
+	}
 	return f.srcName
 }
 
-- 
cgit v1.2.3-70-g09d2