ports/libssh
ports/libssh
1
1
Форкнуть 0
Код Релизы 1 Активность

channels: Do not mix integer types

Просмотр исходного кода 
Use uint32_t when expecting 32 bits unsigned int.  Use PRIu32 macro to
print correctly independently of the architecture.

Signed-off-by: Anderson Toshiyuki Sasaki <ansasaki@redhat.com>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
Этот коммит содержится в:
Anderson Toshiyuki Sasaki 2019-06-14 11:49:59 +02:00 коммит произвёл Andreas Schneider
родитель 91960409c3
Коммит ab25ca205d
1 изменённых файлов: 9 добавлений и 9 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

18
src/channels.c
Просмотреть файл

@ -159,8 +159,8 @@ SSH_PACKET_CALLBACK(ssh_packet_channel_open_conf){
channel=ssh_channel_from_local(session,channelid); channel=ssh_channel_from_local(session,channelid);
if(channel==NULL){ if(channel==NULL){
ssh_set_error(session, SSH_FATAL, ssh_set_error(session, SSH_FATAL,
"Unknown channel id %lu", "Unknown channel id %"PRIu32,
(long unsigned int) channelid); (uint32_t) channelid);
/* TODO: Set error marking in channel object */ /* TODO: Set error marking in channel object */
return SSH_PACKET_USED; return SSH_PACKET_USED;
@ -187,9 +187,9 @@ SSH_PACKET_CALLBACK(ssh_packet_channel_open_conf){
} }
SSH_LOG(SSH_LOG_PROTOCOL, SSH_LOG(SSH_LOG_PROTOCOL,
"Remote window : %lu, maxpacket : %lu", "Remote window : %"PRIu32", maxpacket : %"PRIu32,
(long unsigned int) channel->remote_window, (uint32_t) channel->remote_window,
(long unsigned int) channel->remote_maxpacket); (uint32_t) channel->remote_maxpacket);
channel->state = SSH_CHANNEL_STATE_OPEN; channel->state = SSH_CHANNEL_STATE_OPEN;
channel->flags &= ~SSH_CHANNEL_FLAG_NOT_BOUND; channel->flags &= ~SSH_CHANNEL_FLAG_NOT_BOUND;
@ -235,9 +235,9 @@ SSH_PACKET_CALLBACK(ssh_packet_channel_open_fail){
} }
ssh_set_error(session, SSH_REQUEST_DENIED, ssh_set_error(session, SSH_REQUEST_DENIED,
"Channel opening failure: channel %u error (%lu) %s", "Channel opening failure: channel %u error (%"PRIu32") %s",
channel->local_channel, channel->local_channel,
(long unsigned int) code, (uint32_t) code,
error); error);
SAFE_FREE(error); SAFE_FREE(error);
channel->state=SSH_CHANNEL_STATE_OPEN_DENIED; channel->state=SSH_CHANNEL_STATE_OPEN_DENIED;
@ -445,8 +445,8 @@ static ssh_channel channel_from_msg(ssh_session session, ssh_buffer packet) {
channel = ssh_channel_from_local(session, chan); channel = ssh_channel_from_local(session, chan);
if (channel == NULL) { if (channel == NULL) {
ssh_set_error(session, SSH_FATAL, ssh_set_error(session, SSH_FATAL,
"Server specified invalid channel %lu", "Server specified invalid channel %"PRIu32,
(long unsigned int) chan); (uint32_t) chan);
} }
return channel; return channel;