1 files changed, 34 insertions, 34 deletions

diff --git a/rrdformat/rrdbinary/decode.go b/rrdformat/rrdbinary/decode.go
index cdaf49e..08c9141 100644
--- a/rrdformat/rrdbinary/decode.go
+++ b/rrdformat/rrdbinary/decode.go
@@ -153,9 +153,9 @@ func (obj *String) unmarshalRRD(d *Decoder, tag string) error {
 	return nil
 }
 
-func (obj *Float) unmarshalRRD(d *Decoder, tag string) error {
-	if d.arch.FloatWidth != 8 {
-		return archErrorf("rrdbinary does not support FloatWidth=%d; only supports 8", d.arch.FloatWidth)
+func (obj *Double) unmarshalRRD(d *Decoder, tag string) error {
+	if d.arch.DoubleWidth != 8 {
+		return archErrorf("rrdbinary does not support DoubleWidth=%d; only supports 8", d.arch.DoubleWidth)
 	}
 	if tag != "" {
 		return typeErrorf("invalid rrdbinary struct tag for float: %q", tag)
@@ -164,26 +164,26 @@ func (obj *Float) unmarshalRRD(d *Decoder, tag string) error {
 	data := d.data[d.pos:]
 
 	padding := 0
-	if d.pos%d.arch.FloatAlign != 0 {
-		padding = d.arch.FloatAlign - (d.pos % d.arch.FloatAlign)
+	if d.pos%d.arch.DoubleAlign != 0 {
+		padding = d.arch.DoubleAlign - (d.pos % d.arch.DoubleAlign)
 	}
 	if len(data) < padding {
-		return d.binErrorf(padding+d.arch.FloatWidth, "unexpected end-of-file in %d-byte padding-before-float", padding)
+		return d.binErrorf(padding+d.arch.DoubleWidth, "unexpected end-of-file in %d-byte padding-before-float", padding)
 	}
 	data = data[padding:]
 
-	if len(data) < d.arch.FloatWidth {
-		return d.binErrorf(d.arch.FloatWidth, "unexpected end-of-file in %d-byte float", d.arch.FloatWidth)
+	if len(data) < d.arch.DoubleWidth {
+		return d.binErrorf(d.arch.DoubleWidth, "unexpected end-of-file in %d-byte float", d.arch.DoubleWidth)
 	}
 
-	*obj = Float(math.Float64frombits(d.arch.ByteOrder.Uint64(data)))
-	d.pos += padding + d.arch.FloatWidth
+	*obj = Double(math.Float64frombits(d.arch.ByteOrder.Uint64(data)))
+	d.pos += padding + d.arch.DoubleWidth
 	return nil
 }
 
-func (obj *Uint) unmarshalRRD(d *Decoder, tag string) error {
-	if d.arch.IntWidth != 4 && d.arch.IntWidth != 8 {
-		return archErrorf("rrdbinary does not support IntWidth=%d; only supports 4 or 8", d.arch.IntWidth)
+func (obj *ULong) unmarshalRRD(d *Decoder, tag string) error {
+	if d.arch.LongWidth != 4 && d.arch.LongWidth != 8 {
+		return archErrorf("rrdbinary does not support LongWidth=%d; only supports 4 or 8", d.arch.LongWidth)
 	}
 	if tag != "" {
 		return typeErrorf("invalid rrdbinary struct tag for uint: %q", tag)
@@ -192,31 +192,31 @@ func (obj *Uint) unmarshalRRD(d *Decoder, tag string) error {
 	data := d.data[d.pos:]
 
 	padding := 0
-	if d.pos%d.arch.IntAlign != 0 {
-		padding = d.arch.IntAlign - (d.pos % d.arch.IntAlign)
+	if d.pos%d.arch.LongAlign != 0 {
+		padding = d.arch.LongAlign - (d.pos % d.arch.LongAlign)
 	}
 	if len(data) < padding {
-		return d.binErrorf(padding+d.arch.IntWidth, "unexpected end-of-file in %d-byte padding-before-uint", padding)
+		return d.binErrorf(padding+d.arch.LongWidth, "unexpected end-of-file in %d-byte padding-before-uint", padding)
 	}
 	data = data[padding:]
 
-	if len(data) < d.arch.IntWidth {
-		return d.binErrorf(d.arch.IntWidth, "unexpected end-of-file in %d-byte uint", d.arch.IntWidth)
+	if len(data) < d.arch.LongWidth {
+		return d.binErrorf(d.arch.LongWidth, "unexpected end-of-file in %d-byte uint", d.arch.LongWidth)
 	}
 
-	switch d.arch.IntWidth {
+	switch d.arch.LongWidth {
 	case 4:
-		*obj = Uint(d.arch.ByteOrder.Uint32(data))
+		*obj = ULong(d.arch.ByteOrder.Uint32(data))
 	case 8:
-		*obj = Uint(d.arch.ByteOrder.Uint64(data))
+		*obj = ULong(d.arch.ByteOrder.Uint64(data))
 	}
-	d.pos += padding + d.arch.IntWidth
+	d.pos += padding + d.arch.LongWidth
 	return nil
 }
 
-func (obj *Int) unmarshalRRD(d *Decoder, tag string) error {
-	if d.arch.IntWidth != 4 && d.arch.IntWidth != 8 {
-		return archErrorf("rrdbinary does not support IntWidth=%d; only supports 4 or 8", d.arch.IntWidth)
+func (obj *Long) unmarshalRRD(d *Decoder, tag string) error {
+	if d.arch.LongWidth != 4 && d.arch.LongWidth != 8 {
+		return archErrorf("rrdbinary does not support LongWidth=%d; only supports 4 or 8", d.arch.LongWidth)
 	}
 	if tag != "" {
 		return typeErrorf("invalid rrdbinary struct tag for int: %q", tag)
@@ -225,25 +225,25 @@ func (obj *Int) unmarshalRRD(d *Decoder, tag string) error {
 	data := d.data[d.pos:]
 
 	padding := 0
-	if d.pos%d.arch.IntAlign != 0 {
-		padding = d.arch.IntAlign - (d.pos % d.arch.IntAlign)
+	if d.pos%d.arch.LongAlign != 0 {
+		padding = d.arch.LongAlign - (d.pos % d.arch.LongAlign)
 	}
 	if len(data) < padding {
-		return d.binErrorf(padding+d.arch.IntWidth, "unexpected end-of-file in %d-byte padding-before-int", padding)
+		return d.binErrorf(padding+d.arch.LongWidth, "unexpected end-of-file in %d-byte padding-before-int", padding)
 	}
 	data = data[padding:]
 
-	if len(data) < d.arch.IntWidth {
-		return d.binErrorf(d.arch.IntWidth, "unexpected end-of-file in %d-byte int", d.arch.IntWidth)
+	if len(data) < d.arch.LongWidth {
+		return d.binErrorf(d.arch.LongWidth, "unexpected end-of-file in %d-byte int", d.arch.LongWidth)
 	}
 
-	switch d.arch.IntWidth {
+	switch d.arch.LongWidth {
 	case 4:
-		*obj = Int(int32(d.arch.ByteOrder.Uint32(data)))
+		*obj = Long(int32(d.arch.ByteOrder.Uint32(data)))
 	case 8:
-		*obj = Int(d.arch.ByteOrder.Uint64(data))
+		*obj = Long(d.arch.ByteOrder.Uint64(data))
 	}
-	d.pos += padding + d.arch.IntWidth
+	d.pos += padding + d.arch.LongWidth
 	return nil
 }