From 366440d40d078c11ad3010fa6c6752731561186d Mon Sep 17 00:00:00 2001 From: Jack Christensen Date: Fri, 17 Feb 2017 07:40:06 -0600 Subject: [PATCH] Remove *msgReader.readOID --- conn.go | 6 +++--- msg_reader.go | 4 ---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/conn.go b/conn.go index 7d70b9f8..9303fb74 100644 --- a/conn.go +++ b/conn.go @@ -1157,9 +1157,9 @@ func (c *Conn) rxRowDescription(r *msgReader) (fields []FieldDescription) { for i := int16(0); i < fieldCount; i++ { f := &fields[i] f.Name = r.readCString() - f.Table = r.readOID() + f.Table = OID(r.readUint32()) f.AttributeNumber = r.readInt16() - f.DataType = r.readOID() + f.DataType = OID(r.readUint32()) f.DataTypeSize = r.readInt16() f.Modifier = r.readInt32() f.FormatCode = r.readInt16() @@ -1179,7 +1179,7 @@ func (c *Conn) rxParameterDescription(r *msgReader) (parameters []OID) { parameters = make([]OID, 0, parameterCount) for i := 0; i < parameterCount; i++ { - parameters = append(parameters, r.readOID()) + parameters = append(parameters, OID(r.readUint32())) } return } diff --git a/msg_reader.go b/msg_reader.go index 53e944bb..1858037a 100644 --- a/msg_reader.go +++ b/msg_reader.go @@ -178,10 +178,6 @@ func (r *msgReader) readInt64() int64 { return n } -func (r *msgReader) readOID() OID { - return OID(r.readInt32()) -} - // readCString reads a null terminated string func (r *msgReader) readCString() string { if r.err != nil {