summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Schneider <mail@cynapses.org>2009-04-05 10:43:59 +0000
committerAndreas Schneider <mail@cynapses.org>2009-04-05 10:43:59 +0000
commit8253e2170e39da83d57207f57e5997feb7ffa230 (patch)
tree62cc74125d0afdeb287751debd9b7d383c8a995f
parent2aeeb5a518ed88c97c43bad1ccc3a44efdc19950 (diff)
downloadlibssh-8253e2170e39da83d57207f57e5997feb7ffa230.tar.gz
libssh-8253e2170e39da83d57207f57e5997feb7ffa230.tar.xz
libssh-8253e2170e39da83d57207f57e5997feb7ffa230.zip
Fix build warnings found with printf checking of ssh_set_error().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@405 7dcaeef0-15fb-0310-b436-a5af3365683c
-rw-r--r--libssh/auth.c4
-rw-r--r--libssh/packet.c3
-rw-r--r--libssh/sftp.c6
3 files changed, 9 insertions, 4 deletions
diff --git a/libssh/auth.c b/libssh/auth.c
index 398dec38..23c6345c 100644
--- a/libssh/auth.c
+++ b/libssh/auth.c
@@ -838,7 +838,9 @@ static int kbdauth_info_get(SSH_SESSION *session){
free(instruction);
nprompts=ntohl(nprompts);
if(nprompts>KBDINT_MAX_PROMPT){
- ssh_set_error(session,SSH_FATAL,"Too much prompt asked from server: %lu(0x%.8lx)",nprompts,nprompts);
+ ssh_set_error(session, SSH_FATAL,
+ "Too much prompt asked from server: %u (0x%.4x)",
+ nprompts, nprompts);
leave_function();
return SSH_AUTH_ERROR;
}
diff --git a/libssh/packet.c b/libssh/packet.c
index b70887cd..6cb5f405 100644
--- a/libssh/packet.c
+++ b/libssh/packet.c
@@ -79,7 +79,8 @@ static int packet_read2(SSH_SESSION *session){
len=packet_decrypt_len(session,buffer);
buffer_add_data(session->in_buffer,buffer,blocksize);
if(len> MAX_PACKET_LEN){
- ssh_set_error(session,SSH_FATAL,"read_packet(): Packet len too high(%uld %.8lx)",len,len);
+ ssh_set_error(session, SSH_FATAL,
+ "read_packet(): Packet len too high(%u %.4x)", len, len);
leave_function();
return SSH_ERROR;
}
diff --git a/libssh/sftp.c b/libssh/sftp.c
index f20acb64..05a6ea7f 100644
--- a/libssh/sftp.c
+++ b/libssh/sftp.c
@@ -1677,7 +1677,8 @@ static SFTP_ATTRIBUTES *sftp_xstat(SFTP_SESSION *sftp, const char *path, int par
status_msg_free(status);
return NULL;
}
- ssh_set_error(sftp->session,SSH_FATAL,"Received mesg %d during stat(),mesg->packet_type");
+ ssh_set_error(sftp->session, SSH_FATAL,
+ "Received mesg %d during stat()", msg->packet_type);
sftp_message_free(msg);
return NULL;
}
@@ -1718,7 +1719,8 @@ SFTP_ATTRIBUTES *sftp_fstat(SFTP_FILE *file) {
status_msg_free(status);
return NULL;
}
- ssh_set_error(file->sftp->session,SSH_FATAL,"Received mesg %d during fstat(),mesg->packet_type");
+ ssh_set_error(file->sftp->session, SSH_FATAL,
+ "Received msg %d during fstat()", msg->packet_type);
sftp_message_free(msg);
return NULL;
}