From 33509dbeb0acd7abbbb9e8c434d0c3f0ce8a3230 Mon Sep 17 00:00:00 2001 From: Andrew Gallant Date: Sat, 28 Dec 2013 10:02:18 -0500 Subject: It appears that the "Str" type (which is built into the core X protocol) doesn't specify any padding. So it has to be treated as a special case. Close #12. --- nexgb/dri2/dri2.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'nexgb/dri2') diff --git a/nexgb/dri2/dri2.go b/nexgb/dri2/dri2.go index df13661..6cec3d0 100644 --- a/nexgb/dri2/dri2.go +++ b/nexgb/dri2/dri2.go @@ -562,7 +562,7 @@ func connectReply(buf []byte) *ConnectReply { byteString := make([]byte, v.DriverNameLength) copy(byteString[:v.DriverNameLength], buf[b:]) v.DriverName = string(byteString) - b += xgb.Pad(int(v.DriverNameLength)) + b += int(v.DriverNameLength) } v.AlignmentPad = make([]byte, (((int(v.DriverNameLength) + 3) & -4) - int(v.DriverNameLength))) @@ -573,7 +573,7 @@ func connectReply(buf []byte) *ConnectReply { byteString := make([]byte, v.DeviceNameLength) copy(byteString[:v.DeviceNameLength], buf[b:]) v.DeviceName = string(byteString) - b += xgb.Pad(int(v.DeviceNameLength)) + b += int(v.DeviceNameLength) } return v -- cgit v1.2.3