From 08e24088962025483b7cfdabb1c574624e730e7f Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Sat, 14 Mar 2009 15:14:18 +0000 Subject: Fix build warnings. git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@273 7dcaeef0-15fb-0310-b436-a5af3365683c --- libssh/channels.c | 6 +++--- libssh/crypt.c | 5 ++++- libssh/kex.c | 9 ++++++--- libssh/packet.c | 2 +- libssh/sftp.c | 5 +++-- 5 files changed, 17 insertions(+), 10 deletions(-) (limited to 'libssh') diff --git a/libssh/channels.c b/libssh/channels.c index 09df81d..57c8dc8 100644 --- a/libssh/channels.c +++ b/libssh/channels.c @@ -113,9 +113,9 @@ static int channel_open(CHANNEL *channel,char *type_c,int window, channel->local_channel, channel->remote_channel); ssh_log(session, SSH_LOG_PROTOCOL, - "Remote window : %ld, maxpacket : %ld", - channel->remote_window, - channel->remote_maxpacket); + "Remote window : %lu, maxpacket : %lu", + (long unsigned int) channel->remote_window, + (long unsigned int) channel->remote_maxpacket); channel->open=1; leave_function(); return 0; diff --git a/libssh/crypt.c b/libssh/crypt.c index 3e5bb5a..902ace2 100644 --- a/libssh/crypt.c +++ b/libssh/crypt.c @@ -39,7 +39,10 @@ u32 packet_decrypt_len(SSH_SESSION *session, char *crypted){ if(session->current_crypto) packet_decrypt(session,crypted,session->current_crypto->in_cipher->blocksize); memcpy(&decrypted,crypted,sizeof(decrypted)); - ssh_log(session,SSH_LOG_PACKET,"packet size decrypted : %d (0x%lx)",ntohl(decrypted),ntohl(decrypted)); + ssh_log(session, SSH_LOG_PACKET, + "Packet size decrypted: %lu (0x%lx)", + (long unsigned int) ntohl(decrypted), + (long unsigned int) ntohl(decrypted)); return ntohl(decrypted); } diff --git a/libssh/kex.c b/libssh/kex.c index 3e20b6a..a2d9340 100644 --- a/libssh/kex.c +++ b/libssh/kex.c @@ -455,9 +455,12 @@ int ssh_get_kex1(SSH_SESSION *session){ supported_ciphers_mask=ntohl(supported_ciphers_mask); supported_authentications_mask=ntohl(supported_authentications_mask); ssh_log(session,SSH_LOG_PROTOCOL,"server bits: %d ; host bits: %d Protocol flags : %.8lx ; " - "cipher mask : %.8lx ; auth mask: %.8lx",server_bits, - host_bits,protocol_flags,supported_ciphers_mask, - supported_authentications_mask); + "cipher mask : %.8lx ; auth mask: %.8lx", + server_bits, + host_bits, + (unsigned long int) protocol_flags, + (unsigned long int) supported_ciphers_mask, + (unsigned long int) supported_authentications_mask); serverkey=make_rsa1_string(server_exp,server_mod); hostkey=make_rsa1_string(host_exp,host_mod); build_session_id1(session,server_mod,host_mod); diff --git a/libssh/packet.c b/libssh/packet.c index edf0c2d..aca1255 100644 --- a/libssh/packet.c +++ b/libssh/packet.c @@ -325,7 +325,7 @@ static int packet_send2(SSH_SESSION *session){ unsigned int blocksize=(session->current_crypto?session->current_crypto->out_cipher->blocksize:8); enter_function(); ssh_log(session, SSH_LOG_RARE, - "Writing on the wire a packet having %ld bytes before", currentlen); + "Writing on the wire a packet having %u bytes before", currentlen); #ifdef HAVE_LIBZ if(session->current_crypto && session->current_crypto->do_compress_out){ ssh_log(session, SSH_LOG_RARE, "Compressing in_buffer ..."); diff --git a/libssh/sftp.c b/libssh/sftp.c index 28ce4eb..9a38482 100644 --- a/libssh/sftp.c +++ b/libssh/sftp.c @@ -642,12 +642,13 @@ static SFTP_ATTRIBUTES *sftp_parse_attr_3(SFTP_SESSION *sftp, BUFFER *buf, break; flags=ntohl(flags); attr->flags=flags; - ssh_log(sftp->session, SSH_LOG_RARE, "Flags: %.8lx\n", flags); + ssh_log(sftp->session, SSH_LOG_RARE, + "Flags: %.8lx\n", (long unsigned int) flags); if(flags & SSH_FILEXFER_ATTR_SIZE){ if(buffer_get_u64(buf,&attr->size)!=sizeof(u64)) break; attr->size=ntohll(attr->size); - ssh_log(sftp->session, SSH_LOG_RARE, "Size: %lld\n", attr->size); + ssh_log(sftp->session, SSH_LOG_RARE, "Size: %lu\n", attr->size); } if(flags & SSH_FILEXFER_ATTR_UIDGID){ if(buffer_get_u32(buf,&attr->uid)!=sizeof(u32)) -- cgit v1.2.3