diff --git a/src/message.rs b/src/message.rs index 0c75a686..fdd63848 100644 --- a/src/message.rs +++ b/src/message.rs @@ -161,12 +161,12 @@ impl WriteMessage for W { try!(buf.write_cstr(portal)); try!(buf.write_cstr(statement)); - try!(buf.write_i16::(formats.len() as i16)); + try!(buf.write_u16::(formats.len() as u16)); for &format in formats { try!(buf.write_i16::(format)); } - try!(buf.write_i16::(values.len() as i16)); + try!(buf.write_u16::(values.len() as u16)); for value in values { match *value { None => try!(buf.write_i32::(-1)), @@ -177,7 +177,7 @@ impl WriteMessage for W { } } - try!(buf.write_i16::(result_formats.len() as i16)); + try!(buf.write_u16::(result_formats.len() as u16)); for &format in result_formats { try!(buf.write_i16::(format)); } @@ -215,7 +215,7 @@ impl WriteMessage for W { ident = Some(b'P'); try!(buf.write_cstr(name)); try!(buf.write_cstr(query)); - try!(buf.write_i16::(param_types.len() as i16)); + try!(buf.write_u16::(param_types.len() as u16)); for &ty in param_types { try!(buf.write_u32::(ty)); } @@ -246,7 +246,7 @@ impl WriteMessage for W { } // add size of length value - try!(self.write_i32::((buf.len() + mem::size_of::()) as i32)); + try!(self.write_u32::((buf.len() + mem::size_of::()) as u32)); try!(self.write_all(&*buf)); Ok(()) @@ -277,7 +277,7 @@ impl ReadMessage for R { let ident = try!(self.read_u8()); // subtract size of length value - let len = try!(self.read_u32::()) as usize - mem::size_of::(); + let len = try!(self.read_u32::()) - mem::size_of::() as u32; let mut rdr = self.by_ref().take(len as u64); let ret = match ident { @@ -380,7 +380,7 @@ fn read_auth_message(buf: &mut R) -> io::Result { } fn read_parameter_description(buf: &mut R) -> io::Result { - let len = try!(buf.read_i16::()) as usize; + let len = try!(buf.read_u16::()) as usize; let mut types = Vec::with_capacity(len); for _ in 0..len { @@ -391,7 +391,7 @@ fn read_parameter_description(buf: &mut R) -> io::Result(buf: &mut R) -> io::Result { - let len = try!(buf.read_i16::()) as usize; + let len = try!(buf.read_u16::()) as usize; let mut types = Vec::with_capacity(len); for _ in 0..len {