lib/libssh2
1
0
Fork 0
mirror of https://github.com/libssh2/libssh2.git synced 2025-07-29 13:01:14 +03:00
Code Activity

example, tests: address compiler warnings

Browse Source 
Fix or silence all C compiler warnings discovered with (or without)
`PICKY_COMPILER=ON` (in CMake). This means all warnings showing up in
CI (gcc, clang, MSVS 2013/2015), in local tests on macOS (clang 14) and
Windows cross-builds using gcc (12) and llvm/clang (14/15).

Also fix the expression `nread -= nread` in `sftp_RW_nonblock.c`.

Cherry-picked from: #846
Closes #861
This commit is contained in:
Viktor Szakats
2023-03-20 15:46:12 +00:00
parent ec0a51db1f
commit b13936bd6a
47 changed files with 343 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
example/ssh2_echo.c
View File

@ -72,7 +72,7 @@ static int waitsocket(libssh2_socket_t socket_fd, LIBSSH2_SESSION *session)
if(dir & LIBSSH2_SESSION_BLOCK_OUTBOUND)
writefd = &fd;
rc = select(socket_fd + 1, readfd, writefd, NULL, &timeout);
rc = select((int)(socket_fd + 1), readfd, writefd, NULL, &timeout);
return rc;
}
@ -85,7 +85,7 @@ int main(int argc, char *argv[])
const char *commandline = "cat";
const char *username = "user";
const char *password = "password";
unsigned long hostaddr;
uint32_t hostaddr;
libssh2_socket_t sock;
struct sockaddr_in sin;
const char *fingerprint;
@ -232,11 +232,11 @@ int main(int argc, char *argv[])
else {
LIBSSH2_POLLFD *fds = NULL;
int running = 1;
int bufsize = BUFSIZE;
ssize_t bufsize = BUFSIZE;
char buffer[BUFSIZE];
int totsize = 1500000;
int totwritten = 0;
int totread = 0;
ssize_t totsize = 1500000;
ssize_t totwritten = 0;
ssize_t totread = 0;
int rereads = 0;
int rewrites = 0;
int i;
@ -262,7 +262,8 @@ int main(int argc, char *argv[])
continue;
if(fds[0].revents & LIBSSH2_POLLFD_POLLIN) {
int n = libssh2_channel_read(channel, buffer, sizeof(buffer));
ssize_t n = libssh2_channel_read(channel,
buffer, sizeof(buffer));
act++;
if(n == LIBSSH2_ERROR_EAGAIN) {
@ -276,7 +277,7 @@ int main(int argc, char *argv[])
else {
totread += n;
fprintf(stderr, "read %d bytes (%d in total)\n",
n, totread);
(int)n, (int)totread);
}
}
@ -285,9 +286,10 @@ int main(int argc, char *argv[])
if(totwritten < totsize) {
/* we have not written all data yet */
int left = totsize - totwritten;
int size = (left < bufsize) ? left : bufsize;
int n = libssh2_channel_write_ex(channel, 0, buffer, size);
ssize_t left = totsize - totwritten;
ssize_t size = (left < bufsize) ? left : bufsize;
ssize_t n = libssh2_channel_write_ex(channel, 0,
buffer, size);
if(n == LIBSSH2_ERROR_EAGAIN) {
rewrites++;
@ -300,7 +302,7 @@ int main(int argc, char *argv[])
else {
totwritten += n;
fprintf(stderr, "wrote %d bytes (%d in total)",
n, totwritten);
(int)n, (int)totwritten);
if(left >= bufsize && n != bufsize) {
fprintf(stderr, " PARTIAL");
}
@ -349,11 +351,11 @@ int main(int argc, char *argv[])
channel = NULL;
fprintf(stderr, "\nrereads: %d rewrites: %d totwritten %d\n",
rereads, rewrites, totwritten);
rereads, rewrites, (int)totwritten);
if(totwritten != totread) {
fprintf(stderr, "\n*** FAIL bytes written: %d bytes "
"read: %d ***\n", totwritten, totread);
"read: %d ***\n", (int)totwritten, (int)totread);
exit(1);
}
}