lib/libssh2
1
0
Fork 0
mirror of https://github.com/libssh2/libssh2.git synced 2025-08-07 08:02:56 +03:00
Code Activity

tidy-up: bump casts from int to long for large C99 types in printfs

Browse Source 
Cast large integer types to avoid dealing with printf masks for
`size_t` and other C99 types. Some of existing code used `int`
for this, bump them to `long`.

Ref: afa6b86560 #1257

Closes #1264
This commit is contained in:
Viktor Szakats
2023-12-01 19:29:28 +00:00
parent afa6b86560
commit 2e5a8719d7
18 changed files with 62 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
example/direct_tcpip.c
View File

@@ -276,8 +276,8 @@ int main(int argc, char *argv[])
continue; continue;
} }
if(nwritten < 0) { if(nwritten < 0) {
fprintf(stderr, "libssh2_channel_write: %d\n", fprintf(stderr, "libssh2_channel_write: %ld\n",
(int)nwritten); (long)nwritten);
goto shutdown; goto shutdown;
} }
wr += nwritten; wr += nwritten;
@@ -288,7 +288,7 @@ int main(int argc, char *argv[])
if(LIBSSH2_ERROR_EAGAIN == len) if(LIBSSH2_ERROR_EAGAIN == len)
break; break;
else if(len < 0) { else if(len < 0) {
fprintf(stderr, "libssh2_channel_read: %d", (int)len); fprintf(stderr, "libssh2_channel_read: %ld", (long)len);
goto shutdown; goto shutdown;
} }
wr = 0; wr = 0;

4
example/scp.c
View File

@@ -163,8 +163,8 @@ int main(int argc, char *argv[])
write(1, mem, (size_t)nread); write(1, mem, (size_t)nread);
} }
else if(nread < 0) { else if(nread < 0) {
fprintf(stderr, "libssh2_channel_read() failed: %d\n", fprintf(stderr, "libssh2_channel_read() failed: %ld\n",
(int)nread); (long)nread);
break; break;
} }
got += nread; got += nread;

2
example/scp_write.c
View File

@@ -178,7 +178,7 @@ int main(int argc, char *argv[])
/* write the same data over and over, until error or completion */ /* write the same data over and over, until error or completion */
nwritten = libssh2_channel_write(channel, ptr, nread); nwritten = libssh2_channel_write(channel, ptr, nread);
if(nwritten < 0) { if(nwritten < 0) {
fprintf(stderr, "ERROR %d\n", (int)nwritten); fprintf(stderr, "ERROR %ld\n", (long)nwritten);
break; break;
} }
else { else {

5
example/scp_write_nonblock.c
View File

@@ -230,8 +230,9 @@ int main(int argc, char *argv[])
prev = 0; prev = 0;
} }
if(nwritten < 0) { if(nwritten < 0) {
fprintf(stderr, "ERROR %d total %ld / %d prev %d\n", fprintf(stderr, "ERROR %ld total %ld / %lu prev %lu\n",
(int)nwritten, (long)total, (int)nread, (int)prev); (long)nwritten, (long)total,
(unsigned long)nread, (unsigned long)prev);
break; break;
} }
else { else {

7
example/sftp_RW_nonblock.c
View File

@@ -227,8 +227,8 @@ int main(int argc, char *argv[])
do { do {
/* read in a loop until we block */ /* read in a loop until we block */
nread = libssh2_sftp_read(sftp_handle, mem, sizeof(mem)); nread = libssh2_sftp_read(sftp_handle, mem, sizeof(mem));
fprintf(stderr, "libssh2_sftp_read returned %d\n", fprintf(stderr, "libssh2_sftp_read returned %ld\n",
(int)nread); (long)nread);
if(nread > 0) { if(nread > 0) {
/* write to stderr */ /* write to stderr */
@@ -321,8 +321,7 @@ int main(int argc, char *argv[])
if(rc <= 0) { if(rc <= 0) {
/* negative is error /* negative is error
0 is timeout */ 0 is timeout */
fprintf(stderr, "SFTP upload timed out: %d\n", fprintf(stderr, "SFTP upload timed out: %d\n", rc);
rc);
break; break;
} }
} while(1); } while(1);

2
example/ssh2.c
View File

@@ -317,7 +317,7 @@ int main(int argc, char *argv[])
char buf[1024]; char buf[1024];
ssize_t err = libssh2_channel_read(channel, buf, sizeof(buf)); ssize_t err = libssh2_channel_read(channel, buf, sizeof(buf));
if(err < 0) if(err < 0)
fprintf(stderr, "Unable to read response: %d\n", (int)err); fprintf(stderr, "Unable to read response: %ld\n", (long)err);
else { else {
fwrite(buf, 1, (size_t)err, stdout); fwrite(buf, 1, (size_t)err, stdout);
} }

8
example/ssh2_agent_forwarding.c
View File

@@ -241,8 +241,8 @@ int main(int argc, char *argv[])
else { else {
if(nread != LIBSSH2_ERROR_EAGAIN) if(nread != LIBSSH2_ERROR_EAGAIN)
/* no need to output this for the EAGAIN case */ /* no need to output this for the EAGAIN case */
fprintf(stderr, "libssh2_channel_read returned %d\n", fprintf(stderr, "libssh2_channel_read returned %ld\n",
(int)nread); (long)nread);
} }
} }
while(nread > 0); while(nread > 0);
@@ -269,8 +269,8 @@ int main(int argc, char *argv[])
fprintf(stderr, "\nGot signal: %s\n", exitsignal); fprintf(stderr, "\nGot signal: %s\n", exitsignal);
} }
else { else {
fprintf(stderr, "\nEXIT: %d bytecount: %d\n", fprintf(stderr, "\nEXIT: %d bytecount: %ld\n",
exitcode, (int)bytecount); exitcode, (long)bytecount);
} }
libssh2_channel_free(channel); libssh2_channel_free(channel);

17
example/ssh2_echo.c
View File

@@ -263,8 +263,8 @@ int main(int argc, char *argv[])
} }
else { else {
totread += (size_t)n; totread += (size_t)n;
fprintf(stderr, "read %d bytes (%d in total)\n", fprintf(stderr, "read %ld bytes (%lu in total)\n",
(int)n, (int)totread); (long)n, (unsigned long)totread);
} }
} }
@@ -288,8 +288,8 @@ int main(int argc, char *argv[])
} }
else { else {
totwritten += (size_t)n; totwritten += (size_t)n;
fprintf(stderr, "wrote %d bytes (%d in total)", fprintf(stderr, "wrote %ld bytes (%lu in total)",
(int)n, (int)totwritten); (long)n, (unsigned long)totwritten);
if(left >= bufsize && (size_t)n != bufsize) { if(left >= bufsize && (size_t)n != bufsize) {
fprintf(stderr, " PARTIAL"); fprintf(stderr, " PARTIAL");
} }
@@ -338,12 +338,13 @@ int main(int argc, char *argv[])
libssh2_channel_free(channel); libssh2_channel_free(channel);
channel = NULL; channel = NULL;
fprintf(stderr, "\nrereads: %d rewrites: %d totwritten %d\n", fprintf(stderr, "\nrereads: %d rewrites: %d totwritten %lu\n",
rereads, rewrites, (int)totwritten); rereads, rewrites, (unsigned long)totwritten);
if(totwritten != totread) { if(totwritten != totread) {
fprintf(stderr, "\n*** FAIL bytes written: %d bytes " fprintf(stderr, "\n*** FAIL bytes written: "
"read: %d ***\n", (int)totwritten, (int)totread); "%lu bytes read: %lu ***\n",
(unsigned long)totwritten, (unsigned long)totread);
exit(1); exit(1);
} }
} }

8
example/ssh2_exec.c
View File

@@ -252,8 +252,8 @@ int main(int argc, char *argv[])
else { else {
if(nread != LIBSSH2_ERROR_EAGAIN) if(nread != LIBSSH2_ERROR_EAGAIN)
/* no need to output this for the EAGAIN case */ /* no need to output this for the EAGAIN case */
fprintf(stderr, "libssh2_channel_read returned %d\n", fprintf(stderr, "libssh2_channel_read returned %ld\n",
(int)nread); (long)nread);
} }
} }
while(nread > 0); while(nread > 0);
@@ -279,8 +279,8 @@ int main(int argc, char *argv[])
if(exitsignal) if(exitsignal)
fprintf(stderr, "\nGot signal: %s\n", exitsignal); fprintf(stderr, "\nGot signal: %s\n", exitsignal);
else else
fprintf(stderr, "\nEXIT: %d bytecount: %d\n", fprintf(stderr, "\nEXIT: %d bytecount: %ld\n",
exitcode, (int)bytecount); exitcode, (long)bytecount);
libssh2_channel_free(channel); libssh2_channel_free(channel);
channel = NULL; channel = NULL;

12
example/subsystem_netconf.c
View File

@@ -47,7 +47,7 @@ static int netconf_write(LIBSSH2_CHANNEL *channel, const char *buf, size_t len)
do { do {
i = libssh2_channel_write(channel, buf, len); i = libssh2_channel_write(channel, buf, len);
if(i < 0) { if(i < 0) {
fprintf(stderr, "libssh2_channel_write: %d\n", (int)i); fprintf(stderr, "libssh2_channel_write: %ld\n", (long)i);
return -1; return -1;
} }
wr += i; wr += i;
@@ -70,7 +70,7 @@ static ssize_t netconf_read_until(LIBSSH2_CHANNEL *channel, const char *endtag,
if(LIBSSH2_ERROR_EAGAIN == len) if(LIBSSH2_ERROR_EAGAIN == len)
continue; continue;
else if(len < 0) { else if(len < 0) {
fprintf(stderr, "libssh2_channel_read: %d\n", (int)len); fprintf(stderr, "libssh2_channel_read: %ld\n", (long)len);
return -1; return -1;
} }
rd += (size_t)len; rd += (size_t)len;
@@ -260,8 +260,8 @@ int main(int argc, char *argv[])
if(-1 == len) if(-1 == len)
goto shutdown; goto shutdown;
fprintf(stderr, "Got %d bytes:\n----------------------\n%s", fprintf(stderr, "Got %ld bytes:\n----------------------\n%s",
(int)len, buf); (long)len, buf);
fprintf(stderr, "Sending NETCONF <rpc>\n"); fprintf(stderr, "Sending NETCONF <rpc>\n");
len = snprintf(buf, sizeof(buf), len = snprintf(buf, sizeof(buf),
@@ -280,8 +280,8 @@ int main(int argc, char *argv[])
if(-1 == len) if(-1 == len)
goto shutdown; goto shutdown;
fprintf(stderr, "Got %d bytes:\n----------------------\n%s", fprintf(stderr, "Got %ld bytes:\n----------------------\n%s",
(int)len, buf); (long)len, buf);
shutdown: shutdown:

8
example/tcpip-forward.c
View File

@@ -270,8 +270,8 @@ int main(int argc, char *argv[])
do { do {
nwritten = libssh2_channel_write(channel, buf, (size_t)len); nwritten = libssh2_channel_write(channel, buf, (size_t)len);
if(nwritten < 0) { if(nwritten < 0) {
fprintf(stderr, "libssh2_channel_write: %d\n", fprintf(stderr, "libssh2_channel_write: %ld\n",
(int)nwritten); (long)nwritten);
goto shutdown; goto shutdown;
} }
wr += nwritten; wr += nwritten;
@@ -283,8 +283,8 @@ int main(int argc, char *argv[])
if(LIBSSH2_ERROR_EAGAIN == len) if(LIBSSH2_ERROR_EAGAIN == len)
break; break;
else if(len < 0) { else if(len < 0) {
fprintf(stderr, "libssh2_channel_read: %d", fprintf(stderr, "libssh2_channel_read: %ld",
(int)len); (long)len);
goto shutdown; goto shutdown;
} }
wr = 0; wr = 0;

12
src/channel.c
View File

@@ -2081,9 +2081,9 @@ ssize_t _libssh2_channel_read(LIBSSH2_CHANNEL *channel, int stream_id,
LIBSSH2_PACKET *read_next; LIBSSH2_PACKET *read_next;
_libssh2_debug((session, LIBSSH2_TRACE_CONN, _libssh2_debug((session, LIBSSH2_TRACE_CONN,
"channel_read() wants %d bytes from channel %u/%u " "channel_read() wants %ld bytes from channel %u/%u "
"stream #%d", "stream #%d",
(int) buflen, channel->local.id, channel->remote.id, (long)buflen, channel->local.id, channel->remote.id,
stream_id)); stream_id));
/* expand the receiving window first if it has become too narrow */ /* expand the receiving window first if it has become too narrow */
@@ -2356,8 +2356,8 @@ _libssh2_channel_write(LIBSSH2_CHANNEL *channel, int stream_id,
unsigned char *s = channel->write_packet; unsigned char *s = channel->write_packet;
_libssh2_debug((channel->session, LIBSSH2_TRACE_CONN, _libssh2_debug((channel->session, LIBSSH2_TRACE_CONN,
"Writing %d bytes on channel %u/%u, stream #%d", "Writing %ld bytes on channel %u/%u, stream #%d",
(int) buflen, channel->local.id, channel->remote.id, (long)buflen, channel->local.id, channel->remote.id,
stream_id)); stream_id));
if(channel->local.close) if(channel->local.close)
@@ -2425,8 +2425,8 @@ _libssh2_channel_write(LIBSSH2_CHANNEL *channel, int stream_id,
channel->write_packet_len = s - channel->write_packet; channel->write_packet_len = s - channel->write_packet;
_libssh2_debug((session, LIBSSH2_TRACE_CONN, _libssh2_debug((session, LIBSSH2_TRACE_CONN,
"Sending %d bytes on channel %u/%u, stream_id=%d", "Sending %ld bytes on channel %u/%u, stream_id=%d",
(int) channel->write_bufwrite, channel->local.id, (long)channel->write_bufwrite, channel->local.id,
channel->remote.id, stream_id)); channel->remote.id, stream_id));
channel->write_state = libssh2_NB_state_created; channel->write_state = libssh2_NB_state_created;

12
src/packet.c
View File

@@ -645,8 +645,8 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data,
switch(session->packAdd_state) { switch(session->packAdd_state) {
case libssh2_NB_state_idle: case libssh2_NB_state_idle:
_libssh2_debug((session, LIBSSH2_TRACE_TRANS, _libssh2_debug((session, LIBSSH2_TRACE_TRANS,
"Packet type %u received, length=%d", "Packet type %u received, length=%ld",
(unsigned int) msg, (int) datalen)); (unsigned int) msg, (long) datalen));
if((macstate == LIBSSH2_MAC_INVALID) && if((macstate == LIBSSH2_MAC_INVALID) &&
(!session->macerror || (!session->macerror ||
@@ -921,8 +921,8 @@ libssh2_packet_add_jump_point5:
stream_id = _libssh2_ntohu32(data + 5); stream_id = _libssh2_ntohu32(data + 5);
_libssh2_debug((session, LIBSSH2_TRACE_CONN, _libssh2_debug((session, LIBSSH2_TRACE_CONN,
"%d bytes packet_add() for %u/%u/%u", "%ld bytes packet_add() for %u/%u/%u",
(int) (datalen - data_head), (long) (datalen - data_head),
channelp->local.id, channelp->local.id,
channelp->remote.id, channelp->remote.id,
stream_id)); stream_id));
@@ -935,8 +935,8 @@ libssh2_packet_add_jump_point5:
LIBSSH2_FREE(session, data); LIBSSH2_FREE(session, data);
_libssh2_debug((session, LIBSSH2_TRACE_CONN, _libssh2_debug((session, LIBSSH2_TRACE_CONN,
"Ignoring extended data and refunding %d bytes", "Ignoring extended data and refunding %ld bytes",
(int) (datalen - 13))); (long) (datalen - 13)));
if(channelp->read_avail + datalen - data_head >= if(channelp->read_avail + datalen - data_head >=
channelp->remote.window_size) channelp->remote.window_size)
datalen = channelp->remote.window_size - datalen = channelp->remote.window_size -

4
src/session.c
View File

@@ -132,11 +132,11 @@ banner_receive(LIBSSH2_SESSION * session)
if(session->api_block_mode || (ret != -EAGAIN)) if(session->api_block_mode || (ret != -EAGAIN))
/* ignore EAGAIN when non-blocking */ /* ignore EAGAIN when non-blocking */
_libssh2_debug((session, LIBSSH2_TRACE_SOCKET, _libssh2_debug((session, LIBSSH2_TRACE_SOCKET,
"Error recving %d bytes: %d", 1, (int)-ret)); "Error recving %d bytes: %ld", 1, (long)-ret));
} }
else else
_libssh2_debug((session, LIBSSH2_TRACE_SOCKET, _libssh2_debug((session, LIBSSH2_TRACE_SOCKET,
"Recved %d bytes banner", (int)ret)); "Recved %ld bytes banner", (long)ret));
if(ret < 0) { if(ret < 0) {
if(ret == -EAGAIN) { if(ret == -EAGAIN) {

5
src/sftp.c
View File

@@ -1567,8 +1567,9 @@ static ssize_t sftp_read(LIBSSH2_SFTP_HANDLE * handle, char *buffer,
more packets */ more packets */
count -= LIBSSH2_MIN(size, count); count -= LIBSSH2_MIN(size, count);
_libssh2_debug((session, LIBSSH2_TRACE_SFTP, _libssh2_debug((session, LIBSSH2_TRACE_SFTP,
"read request id %d sent (offset: %d, size: %d)", "read request id %d sent (offset: %lu, size: %lu)",
request_id, (int)chunk->offset, (int)chunk->len)); request_id, (unsigned long)chunk->offset,
(unsigned long)chunk->len));
} }
LIBSSH2_FALLTHROUGH(); LIBSSH2_FALLTHROUGH();
case libssh2_NB_state_sent: case libssh2_NB_state_sent:

4
src/transport.c
View File

@@ -69,8 +69,8 @@ debugdump(LIBSSH2_SESSION * session,
return; return;
} }
used = snprintf(buffer, sizeof(buffer), "=> %s (%d bytes)\n", used = snprintf(buffer, sizeof(buffer), "=> %s (%lu bytes)\n",
desc, (int) size); desc, (unsigned long) size);
if(session->tracehandler) if(session->tracehandler)
(session->tracehandler)(session, session->tracehandler_context, (session->tracehandler)(session, session->tracehandler_context,
buffer, used); buffer, used);

4
tests/test_aa_warmup.c
View File

@@ -17,8 +17,8 @@ int test(LIBSSH2_SESSION *session)
(void)hostkey; (void)hostkey;
fprintf(stdout, fprintf(stdout,
"libssh2_session_hostkey returned len, type: %d, %d\n", "libssh2_session_hostkey returned len, type: %ld, %d\n",
(int)len, type); (long)len, type);
return 0; /* always return success */ return 0; /* always return success */
} }

2
tests/test_read.c
View File

@@ -96,7 +96,7 @@ int test(LIBSSH2_SESSION *session)
char buf[1024]; char buf[1024];
ssize_t err = libssh2_channel_read(channel, buf, sizeof(buf)); ssize_t err = libssh2_channel_read(channel, buf, sizeof(buf));
if(err < 0) if(err < 0)
fprintf(stderr, "Unable to read response: %d\n", (int)err); fprintf(stderr, "Unable to read response: %ld\n", (long)err);
else { else {
unsigned int i; unsigned int i;
for(i = 0; i < (unsigned long)err; ++i) { for(i = 0; i < (unsigned long)err; ++i) {