From 28ef62be209584d6b9d35009f1ccdad610e1ba6b Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Tue, 20 Apr 2010 22:49:32 +0200
Subject: [PATCH] two variable types changes, made lines less than 80 columns
The two variable type changes are only to match type variable
fields actually read from the binary protocol.
---
src/libssh2_priv.h | 56 +++++++++++++++++++++++-----------------------
1 file changed, 28 insertions(+), 28 deletions(-)
diff --git a/src/libssh2_priv.h b/src/libssh2_priv.h
index 93a2f69..3d7ba6d 100644
--- a/src/libssh2_priv.h
+++ b/src/libssh2_priv.h
@@ -480,36 +480,36 @@ struct transportpacket
{
/* ------------- for incoming data --------------- */
unsigned char buf[PACKETBUFSIZE];
- unsigned char init[5]; /* first 5 bytes of the incoming data stream,
- still encrypted */
- int writeidx; /* at what array index we do the next write into
- the buffer */
- int readidx; /* at what array index we do the next read from
- the buffer */
- int packet_length; /* the most recent packet_length as read from the
- network data */
- int padding_length; /* the most recent padding_length as read from the
- network data */
- int data_num; /* How much of the total package that has been read
- so far. */
- int total_num; /* How much a total package is supposed to be, in
- number of bytes. A full package is
- packet_length + padding_length + 4 +
- mac_length. */
- unsigned char *payload; /* this is a pointer to a LIBSSH2_ALLOC()
- area to which we write decrypted data */
- unsigned char *wptr; /* write pointer into the payload to where we
- are currently writing decrypted data */
+ unsigned char init[5]; /* first 5 bytes of the incoming data stream,
+ still encrypted */
+ int writeidx; /* at what array index we do the next write into
+ the buffer */
+ int readidx; /* at what array index we do the next read from
+ the buffer */
+ uint32_t packet_length; /* the most recent packet_length as read from the
+ network data */
+ uint8_t padding_length; /* the most recent padding_length as read from the
+ network data */
+ int data_num; /* How much of the total package that has been read
+ so far. */
+ int total_num; /* How much a total package is supposed to be, in
+ number of bytes. A full package is
+ packet_length + padding_length + 4 +
+ mac_length. */
+ unsigned char *payload; /* this is a pointer to a LIBSSH2_ALLOC()
+ area to which we write decrypted data */
+ unsigned char *wptr; /* write pointer into the payload to where we
+ are currently writing decrypted data */
/* ------------- for outgoing data --------------- */
- unsigned char *outbuf; /* pointer to a LIBSSH2_ALLOC() area for the
- outgoing data */
- int ototal_num; /* size of outbuf in number of bytes */
- unsigned char *odata; /* original pointer to the data we stored in
- outbuf */
- size_t olen; /* original size of the data we stored in
- outbuf */
- size_t osent; /* number of bytes already sent */
+ unsigned char *outbuf; /* pointer to a LIBSSH2_ALLOC() area for the
+ outgoing data */
+ int ototal_num; /* size of outbuf in number of bytes */
+ unsigned char *odata; /* original pointer to the data we stored in
+ outbuf */
+ size_t olen; /* original size of the data we stored in
+ outbuf */
+ size_t osent; /* number of bytes already sent */
};
struct _LIBSSH2_PUBLICKEY