Fix some compiler warnings on windows.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@764 7dcaeef0-15fb-0310-b436-a5af3365683c
Этот коммит содержится в:
родитель
2e0b2e2e91
Коммит
439d995fed
@ -163,8 +163,8 @@ static int channel_open(CHANNEL *channel, const char *type_c, int window,
|
|||||||
|
|
||||||
if (channel->local_channel != ntohl(tmp)) {
|
if (channel->local_channel != ntohl(tmp)) {
|
||||||
ssh_set_error(session, SSH_FATAL,
|
ssh_set_error(session, SSH_FATAL,
|
||||||
"Server answered with sender channel number %d instead of given %d",
|
"Server answered with sender channel number %lu instead of given %u",
|
||||||
ntohl(tmp),
|
(long unsigned int) ntohl(tmp),
|
||||||
channel->local_channel);
|
channel->local_channel);
|
||||||
leave_function();
|
leave_function();
|
||||||
return -1;
|
return -1;
|
||||||
@ -208,9 +208,9 @@ static int channel_open(CHANNEL *channel, const char *type_c, int window,
|
|||||||
}
|
}
|
||||||
|
|
||||||
ssh_set_error(session, SSH_REQUEST_DENIED,
|
ssh_set_error(session, SSH_REQUEST_DENIED,
|
||||||
"Channel opening failure: channel %d error (%d) %s",
|
"Channel opening failure: channel %u error (%lu) %s",
|
||||||
channel->local_channel,
|
channel->local_channel,
|
||||||
ntohl(code),
|
(long unsigned int) ntohl(code),
|
||||||
error);
|
error);
|
||||||
SAFE_FREE(error);
|
SAFE_FREE(error);
|
||||||
|
|
||||||
@ -295,7 +295,8 @@ static CHANNEL *channel_from_msg(SSH_SESSION *session) {
|
|||||||
channel = ssh_channel_from_local(session, ntohl(chan));
|
channel = ssh_channel_from_local(session, ntohl(chan));
|
||||||
if (channel == NULL) {
|
if (channel == NULL) {
|
||||||
ssh_set_error(session, SSH_FATAL,
|
ssh_set_error(session, SSH_FATAL,
|
||||||
"Server specified invalid channel %d", ntohl(chan));
|
"Server specified invalid channel %lu",
|
||||||
|
(long unsigned int) ntohl(chan));
|
||||||
}
|
}
|
||||||
|
|
||||||
return channel;
|
return channel;
|
||||||
|
@ -466,8 +466,8 @@ static int packet_send2(SSH_SESSION *session) {
|
|||||||
|
|
||||||
finallen = htonl(currentlen + padding + 1);
|
finallen = htonl(currentlen + padding + 1);
|
||||||
ssh_log(session, SSH_LOG_RARE,
|
ssh_log(session, SSH_LOG_RARE,
|
||||||
"%d bytes after comp + %d padding bytes = %d bytes packet",
|
"%d bytes after comp + %d padding bytes = %lu bytes packet",
|
||||||
currentlen, padding, (ntohl(finallen)));
|
currentlen, padding, (long unsigned int) ntohl(finallen));
|
||||||
|
|
||||||
if (buffer_prepend_data(session->out_buffer, &padding, sizeof(u8)) < 0) {
|
if (buffer_prepend_data(session->out_buffer, &padding, sizeof(u8)) < 0) {
|
||||||
goto error;
|
goto error;
|
||||||
|
Загрузка…
Ссылка в новой задаче
Block a user