generic-library/ssh2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

data types: convert more to use size_t and uint32_t

Browse Source
This commit is contained in:
Daniel Stenberg 2010-04-17 13:34:44 +02:00
parent 13caffa00e
commit 100059989f
5 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/comp.c
View File

@ -55,11 +55,11 @@ static int
comp_method_none_comp(LIBSSH2_SESSION * session,
int compress,
unsigned char **dest,
unsigned long *dest_len,
unsigned long payload_limit,
size_t *dest_len,
size_t payload_limit,
int *free_dest,
const unsigned char *src,
unsigned long src_len, void **abstract)
size_t src_len, void **abstract)
{
(void) session;
(void) compress;
@ -157,11 +157,11 @@ static int
comp_method_zlib_comp(LIBSSH2_SESSION * session,
int compress,
unsigned char **dest,
unsigned long *dest_len,
unsigned long payload_limit,
size_t *dest_len,
size_t payload_limit,
int *free_dest,
const unsigned char *src,
unsigned long src_len, void **abstract)
size_t src_len, void **abstract)
{
z_stream *strm = *abstract;
/* A short-term alloc of a full data chunk is better than a series of
@ -203,7 +203,7 @@ comp_method_zlib_comp(LIBSSH2_SESSION * session,
"compress/decompression failure");
}
if (strm->avail_in) {
unsigned long out_ofs = out_maxlen - strm->avail_out;
size_t out_ofs = out_maxlen - strm->avail_out;
char *newout;
out_maxlen +=

56
src/libssh2_priv.h
View File

@ -334,7 +334,7 @@ struct _LIBSSH2_PACKET
typedef struct _libssh2_channel_data
{
/* Identifier */
unsigned long id;
uint32_t id;
/* Limits and restrictions */
unsigned long window_size_initial, window_size, packet_size;
@ -365,35 +365,35 @@ struct _LIBSSH2_CHANNEL
/* State variables used in libssh2_channel_setenv_ex() */
libssh2_nonblocking_states setenv_state;
unsigned char *setenv_packet;
unsigned long setenv_packet_len;
size_t setenv_packet_len;
unsigned char setenv_local_channel[4];
packet_requirev_state_t setenv_packet_requirev_state;
/* State variables used in libssh2_channel_request_pty_ex() */
libssh2_nonblocking_states reqPTY_state;
unsigned char *reqPTY_packet;
unsigned long reqPTY_packet_len;
size_t reqPTY_packet_len;
unsigned char reqPTY_local_channel[4];
packet_requirev_state_t reqPTY_packet_requirev_state;
/* State variables used in libssh2_channel_x11_req_ex() */
libssh2_nonblocking_states reqX11_state;
unsigned char *reqX11_packet;
unsigned long reqX11_packet_len;
size_t reqX11_packet_len;
unsigned char reqX11_local_channel[4];
packet_requirev_state_t reqX11_packet_requirev_state;
/* State variables used in libssh2_channel_process_startup() */
libssh2_nonblocking_states process_state;
unsigned char *process_packet;
unsigned long process_packet_len;
size_t process_packet_len;
unsigned char process_local_channel[4];
packet_requirev_state_t process_packet_requirev_state;
/* State variables used in libssh2_channel_flush_ex() */
libssh2_nonblocking_states flush_state;
unsigned long flush_refund_bytes;
unsigned long flush_flush_bytes;
size_t flush_refund_bytes;
size_t flush_flush_bytes;
/* State variables used in libssh2_channel_receive_window_adjust() */
libssh2_nonblocking_states adjust_state;
@ -408,8 +408,8 @@ struct _LIBSSH2_CHANNEL
libssh2_nonblocking_states write_state;
unsigned char *write_packet;
unsigned char *write_s;
unsigned long write_packet_len;
unsigned long write_bufwrote;
size_t write_packet_len;
size_t write_bufwrote;
size_t write_bufwrite;
/* State variables used in libssh2_channel_close() */
@ -455,7 +455,7 @@ typedef struct _libssh2_endpoint_data
unsigned char *banner;
unsigned char *kexinit;
unsigned long kexinit_len;
size_t kexinit_len;
const LIBSSH2_CRYPT_METHOD *crypt;
void *crypt_abstract;
@ -507,9 +507,9 @@ struct transportpacket
int ototal_num; /* size of outbuf in number of bytes */
unsigned char *odata; /* original pointer to the data we stored in
outbuf */
unsigned long olen; /* original size of the data we stored in
size_t olen; /* original size of the data we stored in
outbuf */
unsigned long osent; /* number of bytes already sent */
size_t osent; /* number of bytes already sent */
};
struct _LIBSSH2_PUBLICKEY
@ -520,7 +520,7 @@ struct _LIBSSH2_PUBLICKEY
/* State variables used in libssh2_publickey_packet_receive() */
libssh2_nonblocking_states receive_state;
unsigned char *receive_packet;
unsigned long receive_packet_len;
size_t receive_packet_len;
/* State variables used in libssh2_publickey_add_ex() */
libssh2_nonblocking_states add_state;
@ -593,8 +593,8 @@ struct _LIBSSH2_SFTP
/* Holder for partial packet, use in libssh2_sftp_packet_read() */
unsigned char *partial_packet; /* The data */
unsigned long partial_len; /* Desired number of bytes */
unsigned long partial_received; /* Bytes received so far */
size_t partial_len; /* Desired number of bytes */
size_t partial_received; /* Bytes received so far */
/* Time that libssh2_sftp_packet_requirev() started reading */
time_t requirev_start;
@ -603,59 +603,59 @@ struct _LIBSSH2_SFTP
libssh2_nonblocking_states open_state;
unsigned char *open_packet;
ssize_t open_packet_len;
unsigned long open_request_id;
uint32_t open_request_id;
/* State variables used in libssh2_sftp_read() */
libssh2_nonblocking_states read_state;
unsigned char *read_packet;
unsigned long read_request_id;
uint32_t read_request_id;
size_t read_total_read;
/* State variables used in libssh2_sftp_readdir() */
libssh2_nonblocking_states readdir_state;
unsigned char *readdir_packet;
unsigned long readdir_request_id;
uint32_t readdir_request_id;
/* State variables used in libssh2_sftp_write() */
libssh2_nonblocking_states write_state;
unsigned char *write_packet;
unsigned long write_request_id;
uint32_t write_request_id;
/* State variables used in libssh2_sftp_fstat_ex() */
libssh2_nonblocking_states fstat_state;
unsigned char *fstat_packet;
unsigned long fstat_request_id;
uint32_t fstat_request_id;
/* State variables used in libssh2_sftp_unlink_ex() */
libssh2_nonblocking_states unlink_state;
unsigned char *unlink_packet;
unsigned long unlink_request_id;
uint32_t unlink_request_id;
/* State variables used in libssh2_sftp_rename_ex() */
libssh2_nonblocking_states rename_state;
unsigned char *rename_packet;
unsigned char *rename_s;
unsigned long rename_request_id;
uint32_t rename_request_id;
/* State variables used in libssh2_sftp_mkdir() */
libssh2_nonblocking_states mkdir_state;
unsigned char *mkdir_packet;
unsigned long mkdir_request_id;
uint32_t mkdir_request_id;
/* State variables used in libssh2_sftp_rmdir() */
libssh2_nonblocking_states rmdir_state;
unsigned char *rmdir_packet;
unsigned long rmdir_request_id;
uint32_t rmdir_request_id;
/* State variables used in libssh2_sftp_stat() */
libssh2_nonblocking_states stat_state;
unsigned char *stat_packet;
unsigned long stat_request_id;
uint32_t stat_request_id;
/* State variables used in libssh2_sftp_symlink() */
libssh2_nonblocking_states symlink_state;
unsigned char *symlink_packet;
unsigned long symlink_request_id;
uint32_t symlink_request_id;
};
#define LIBSSH2_SCP_RESPONSE_BUFLEN 256
@ -1000,9 +1000,9 @@ struct _LIBSSH2_COMP_METHOD
int (*init) (LIBSSH2_SESSION * session, int compress, void **abstract);
int (*comp) (LIBSSH2_SESSION * session, int compress, unsigned char **dest,
unsigned long *dest_len, unsigned long payload_limit,
size_t *dest_len, size_t payload_limit,
int *free_dest, const unsigned char *src,
unsigned long src_len, void **abstract);
size_t src_len, void **abstract);
int (*dtor) (LIBSSH2_SESSION * session, int compress, void **abstract);
};

2
src/sftp.c
View File

@ -92,7 +92,7 @@ static int sftp_close_handle(LIBSSH2_SFTP_HANDLE *handle);
*/
static void _libssh2_store_u64(unsigned char **ptr, libssh2_uint64_t value)
{
unsigned long msl = (unsigned long)(value >> 32);
uint32_t msl = (uint32_t)(value >> 32);
unsigned char *buf = *ptr;
buf[0] = (unsigned char)((msl >> 24) & 0xFF);

10
src/transport.c
View File

@ -54,7 +54,7 @@
#define UNPRINTABLE_CHAR '.'
static void
debugdump(LIBSSH2_SESSION * session,
const char *desc, unsigned char *ptr, unsigned long size)
const char *desc, unsigned char *ptr, size_t size)
{
size_t i;
size_t c;
@ -198,7 +198,7 @@ fullpacket(LIBSSH2_SESSION * session, int encrypted /* 1 or 0 */ )
if (session->remote.comp &&
strcmp(session->remote.comp->name, "none")) {
unsigned char *data;
unsigned long data_len;
size_t data_len;
int free_payload = 1;
if (session->remote.comp->comp(session, 0,
@ -618,7 +618,7 @@ void _libssh2_transport_drain(LIBSSH2_SESSION * session)
static int
send_existing(LIBSSH2_SESSION * session, unsigned char *data,
unsigned long data_len, ssize_t * ret)
size_t data_len, ssize_t * ret)
{
ssize_t rc;
ssize_t length;
@ -699,7 +699,7 @@ send_existing(LIBSSH2_SESSION * session, unsigned char *data,
*/
int
_libssh2_transport_write(LIBSSH2_SESSION * session, unsigned char *data,
unsigned long data_len)
size_t data_len)
{
int blocksize =
(session->state & LIBSSH2_STATE_NEWKEYS) ? session->local.crypt->
@ -718,7 +718,7 @@ _libssh2_transport_write(LIBSSH2_SESSION * session, unsigned char *data,
ssize_t ret;
int rc;
unsigned char *orgdata = data;
unsigned long orgdata_len = data_len;
size_t orgdata_len = data_len;
debugdump(session, "libssh2_transport_write plain", data, data_len);

2
src/transport.h
View File

@ -60,7 +60,7 @@
* (RFC4253 section 6.1)
*/
int _libssh2_transport_write(LIBSSH2_SESSION * session, unsigned char *data,
unsigned long data_len);
size_t data_len);
/*
* _libssh2_transport_read
*